From 5c417fe35b31742a1af85ac12c7136e3513f6c45 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Mon, 10 Aug 2020 14:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E5=90=8E=E7=AB=8B=E5=88=BB=E5=85=B3=E9=97=AD=E9=87=8D?=
 =?UTF-8?q?=E5=AE=9A=E5=90=91=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/x_component_process_Xform/Form.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js
index ae849f9d5f..df721c30e4 100644
--- a/o2web/source/x_component_process_Xform/Form.js
+++ b/o2web/source/x_component_process_Xform/Form.js
@@ -1575,7 +1575,15 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
             "buttonList": [
                 {
                     "text": this.app.lp.closePage,
-                    "action": function () { dlg.close(); this.app.close(); }.bind(this)
+                    "action": function () {
+                        dlg.close();
+                        if (this.json.afterProcessAction=="redirect" && this.json.afterProcessRedirectScript && this.json.afterProcessRedirectScript.code){
+                            var url = this.Macro.exec(this.json.afterProcessRedirectScript.code, this);
+                            (new URI(url)).go();
+                        }else{
+                            this.app.close();
+                        }
+                    }.bind(this)
                 }
             ]
         };
-- 
GitLab