unknown 5 лет назад
Родитель
Сommit
d603c0fda0

+ 1 - 1
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>

+ 2 - 1
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",

+ 2 - 2
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",

+ 3 - 0
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",

+ 25 - 13
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");