From 8021c521508f54b1d66a337b0621dde37b0d6cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= <caixiangyi@zoneland.net>
Date: Fri, 10 Sep 2021 10:28:12 +0000
Subject: [PATCH] Merge branch 'fix/Process_form_view_remove_range' into 'wrdp'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge of fix/Process_form_view_remove_range 允许api的confirm方法正文使用html，删除表单中视图组件的范围选项  to wrdp

See merge request o2oa/o2oa!5357

(cherry picked from commit 8cab2b79506f84f0119bc988fc685f731d95eec6)

35e14c08 允许api的confirm方法正文使用html，删除表单中视图组件的范围选项
---
 .../Module/View/view.html                          |  2 +-
 .../Module/View/view.html                          |  2 +-
 .../Module/ViewSelector/ViewSelector.html          |  2 +-
 o2web/source/x_component_process_Xform/Form.js     | 14 +++++++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
index 176cfc9af1..1ac9fa0640 100644
--- a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
+++ b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
@@ -143,7 +143,7 @@
 							<option value="lessThanOrEqualTo">{{$.lp.lessThanOrEqualTo}}(<=)</option>
 							<option value="like">{{$.lp.like}}(like)</option>
 							<option value="notLike">{{$.lp.notLike}}(not-like)</option>
-							<option value="range">{{$.lp.range}}(range)</option>
+<!--							<option value="range">{{$.lp.range}}(range)</option>-->
 							<option value="in">{{$.lp.in}}(in)</option>
 						</select></td>
 					</tr>
diff --git a/o2web/source/x_component_process_FormDesigner/Module/View/view.html b/o2web/source/x_component_process_FormDesigner/Module/View/view.html
index 176cfc9af1..1ac9fa0640 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/View/view.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/View/view.html
@@ -143,7 +143,7 @@
 							<option value="lessThanOrEqualTo">{{$.lp.lessThanOrEqualTo}}(<=)</option>
 							<option value="like">{{$.lp.like}}(like)</option>
 							<option value="notLike">{{$.lp.notLike}}(not-like)</option>
-							<option value="range">{{$.lp.range}}(range)</option>
+<!--							<option value="range">{{$.lp.range}}(range)</option>-->
 							<option value="in">{{$.lp.in}}(in)</option>
 						</select></td>
 					</tr>
diff --git a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
index e694b5afc5..80ee748703 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
@@ -148,7 +148,7 @@
                             <option value="lessThanOrEqualTo">{{$.lp.lessThanOrEqualTo}}(<=)</option>
                             <option value="like">{{$.lp.like}}(like)</option>
                             <option value="notLike">{{$.lp.notLike}}(not-like)</option>
-                            <option value="range">{{$.lp.range}}(range)</option>
+<!--                            <option value="range">{{$.lp.range}}(range)</option>-->
                             <option value="in">{{$.lp.in}}(in)</option>
                         </select></td>
                     </tr>
diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js
index d8cc64168e..72dbe71c56 100644
--- a/o2web/source/x_component_process_Xform/Form.js
+++ b/o2web/source/x_component_process_Xform/Form.js
@@ -2645,7 +2645,9 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
             if (!layout.mobile) { // pc上鼠标位置偏移20
                 x = x - 20
             }
-            var dlg = new MWF.xDesktop.Dialog({
+
+
+            var opt = {
                 "title": title,
                 "style": style || "o2",
                 "top": y,
@@ -2654,7 +2656,6 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
                 "fromLeft": (Browser.name === "firefox") ? e.event.clientX - 20 : e.event.x - 20,
                 "width": width,
                 "height": height,
-                "text": text,
                 "container": this.app.content,
                 "maskNode": mask || this.app.content,
                 "buttonList": [
@@ -2669,7 +2670,14 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
                         "action": cancel
                     }
                 ]
-            });
+            };
+            if( /<\/?[a-z][\s\S]*>/i.test(text||"")){
+                opt.html = text;
+            }else{
+                opt.text = text
+            }
+
+            var dlg = new MWF.xDesktop.Dialog(opt);
 
             switch (type.toLowerCase()) {
                 case "success":
-- 
GitLab