From 0b0c9eb324f5ce19825b7d1d8ee521c65f7881f8 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Thu, 4 Jun 2020 15:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=99=BD=E6=89=81=E5=B9=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../$Dialog/mobile_blue_flat/dialog.html      |  2 +-
 .../$Selector/blue_flat_mobile/css.wcss       |  3 +-
 .../Form/skin/styles_mobile-blue-flat.json    |  4 +-
 .../skin/styles_mobile-blue-flat_extend.json  |  3 ++
 .../x_component_process_Xform/$Input.js       | 38 ++++++++++++-------
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html b/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
index 4d65b9b209..fdcfa63dfc 100644
--- a/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
+++ b/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
@@ -4,7 +4,7 @@
         <div style="height: 44px; color: rgb(255, 255, 255); line-height: 44px;" class="MWF_dialod_title_text"></div>
     </div>
     <div class="MWF_dialod_content" style="text-align: left; padding: 0px; line-height:20px;background:#f5f5f5;overflow:auto;"></div>
-    <div class="MWF_dialod_button" style="height: 64px; margin: 0px 0px;background: #ffffff;">
+    <div class="MWF_dialod_button" style="height: 64px; margin: 0px 0px;background: #ffffff;border-top:1px solid #F0F0F0;">
         <input type="button" class="MWF_dialod_cancel_button" style="display: none;"/>
         <input type="button" class="MWF_dialod_ok_button" style="display: none;"/>
     </div>
diff --git a/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss b/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
index df8cb8b356..aa4ede91b1 100644
--- a/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
+++ b/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
@@ -143,7 +143,8 @@
 	},
 	"actionNode": {
 		"height": "64px",
-	  	"overflowe" : "hidden"
+	  	"overflowe" : "hidden",
+		"border-top" : "1px solid #F0F0F0"
 	},
 	"okActionNode": {
 	  "height": "44px",
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
index b7121b1d7d..88ac9ff809 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
+++ b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
@@ -273,7 +273,7 @@
     },
     "editStyles": {
       "background-color": "#ffffff",
-      "text-align": "left",
+      "text-align": "right",
       "height": "auto",
       "border-top": "0px",
       "border-left": "0px",
@@ -288,7 +288,7 @@
       "border-left": "0px",
       "border-right" : "0px",
       "border-bottom" : "1px solid #cfd9df",
-      "text-align": "left"
+      "text-align": "right"
     },
     "itemTitleStyles": {
       "height": "16px",
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
index 512ff5b397..5016d605c7 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
+++ b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
@@ -53,6 +53,9 @@
         "margin-left": "0px"
       }
     },
+    "errorStyle" : {
+      "type" : "notice"
+    },
     "selectorStyle" : {
       "style" : "blue_flat_mobile",
       "width" : "700",
diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js
index d9a6d6ab7a..9fc08547ad 100644
--- a/o2web/source/x_component_process_Xform/$Input.js
+++ b/o2web/source/x_component_process_Xform/$Input.js
@@ -259,19 +259,31 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
         //});
         var node;
         if( this.form.json.errorStyle ){
-            node = new Element("div",{
-                "styles" : this.form.json.errorStyle.node,
-                "text": text
-            });
-            if( this.form.json.errorStyle.close ){
-                var closeNode = new Element("div",{
-                    "styles" : this.form.json.errorStyle.close ,
-                    "events": {
-                        "click" : function(){
-                            this.destroy();
-                        }.bind(node)
-                    }
-                }).inject(node);
+            if( this.form.json.errorStyle.type === "notice" ){
+                if( !this.form.errorNoticing ){ //如果是弹出
+                    this.form.errorNoticing = true;
+                    this.form.notice(text, "error", this.node, null, null, {
+                        onClose : function () {
+                            alert(1);
+                            this.form.errorNoticing = false;
+                        }.bind(this)
+                    });
+                }
+            }else{
+                node = new Element("div",{
+                    "styles" : this.form.json.errorStyle.node,
+                    "text": text
+                });
+                if( this.form.json.errorStyle.close ){
+                    var closeNode = new Element("div",{
+                        "styles" : this.form.json.errorStyle.close ,
+                        "events": {
+                            "click" : function(){
+                                this.destroy();
+                            }.bind(node)
+                        }
+                    }).inject(node);
+                }
             }
         }else{
             node = new Element("div");
-- 
GitLab