Merge remote-tracking branch 'origin/6101SaveAndClose' into F6100UrlForwardAuto

javascript/src/QfqForm.js

@@ -988,13 +988,18 @@ var QfqNS = QfqNS || {};
                     return;
                 }
 
+                if (data.redirect === "close") {
+                    this.goBack();
+                    return;
+                }
+
                 break;
             case 'close':
                 if (!data.redirect || data.redirect === "no") {
                     return;
                 }
 
-                if (data.redirect === "client") {
+                if (data.redirect === "client" || data.redirect === "close") {
                     this.goBack();
                     return;
                 }