Merge branch 'fix/mobile_blue_flat' into 'develop'

Merge of fix/[流程管理]蓝白扁平表单样式修改 to develop

See merge request o2oa/o2oa!632

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>

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

o2web/source/x_component_Template/$MSelector/mobile_blue_flat/css.wcss

@@ -3,8 +3,8 @@
 
   },
   "selectNode":{
-    "height":"40px",
-    "line-height":"40px",
+    "height":"36px",
+    "line-height":"36px",
     "border":"1px solid #979797",
     "border-radius":"4px",
     "background-color" : "#fff",
@@ -12,8 +12,8 @@
     "cursor":"pointer"
   },
   "selectNode_over":{
-    "height":"40px",
-    "line-height":"40px",
+    "height":"36px",
+    "line-height":"36px",
     "border":"1px solid #979797",
     "border-radius":"4px",
     "background-color" : "#fff",
@@ -22,8 +22,8 @@
   },
 
   "selectValueNode":{
-    "height":"40px",
-    "line-height":"40px",
+    "height":"36px",
+    "line-height":"36px",
     "padding-left" : "10px",
     "margin-left":"2px",
     "float":"left",
@@ -35,17 +35,17 @@
   },
   "selectArrowNode":{
     "width":"25px",
-    "height":"40px",
+    "height":"36px",
     "float":"right",
     "background":"url(../x_component_Template/$MSelector/mobile_blue_flat/icon/arrow_down@2x.png) no-repeat left center",
     "background-size" : "12px 7px"
   },
   "selectArrowNode_up":{
-    "width":"23px",
-    "height":"40px",
+    "width":"25px",
+    "height":"36px",
     "float":"right",
-    "background":"url(../x_component_Template/$MSelector/mobile_blue_flat/icon/close@2x.png) no-repeat left center",
-    "background-size" : "10px 10px"
+    "background":"url(../x_component_Template/$MSelector/mobile_blue_flat/icon/arrow_down@2x.png) no-repeat left center",
+    "background-size" : "12px 7px"
   },
   "tooltipNode":{
     "font-size" : "15px",
@@ -60,12 +60,12 @@
     "-webkit-user-select": "text",
     "-moz-user-select": "text",
     "border":"0px solid #979797",
-    "box-shadow" : "-5px 5px 10px -4px #333,5px 5px 10px -4px #333",
+    "box-shadow" : "0 3px 0 #eee",
     "list-style-type":"none",
     "overflow":"hidden"
   },
   "tooltipNode_up" : {
-    "box-shadow" : "-5px -5px 10px  -4px #333,5px -5px 10px -4px #333"
+    "box-shadow" : "0 3px 0 #eee"
   },
   "listContentNode":{
     "background-color":"#fff",
@@ -84,10 +84,10 @@
     "background-color" : "#fff",
     "color" : "#000",
     "text-align" : "center",
-    "border-bottom" : "1px solid #979797",
-    "border-left" : "1px solid #979797",
-    "border-right" : "1px solid #979797",
-    "font-weight" : "600"
+    "border-bottom" : "1px solid #CFD9DF",
+    "border-left" : "1px solid #CFD9DF",
+    "border-right" : "1px solid #CFD9DF",
+    "font-weight" : "normal"
   },
   "listItemNode_over" : {
     "cursor" : "pointer",
@@ -98,10 +98,10 @@
     "background-color" : "#fff",
     "color" : "#000",
     "text-align" : "center",
-    "border-bottom" : "1px solid #979797",
-    "border-left" : "1px solid #979797",
-    "border-right" : "1px solid #979797",
-    "font-weight" : "600"
+    "border-bottom" : "1px solid #CFD9DF",
+    "border-left" : "1px solid #CFD9DF",
+    "border-right" : "1px solid #CFD9DF",
+    "font-weight" : "normal"
   },
   "listItemNode_current" : {
     "cursor" : "pointer",
@@ -112,9 +112,9 @@
     "background-color" : "#fff",
     "color" : "#32AAFF",
     "text-align" : "center",
-    "border-bottom" : "1px solid #979797",
-    "border-left" : "1px solid #979797",
-    "border-right" : "1px solid #979797",
-    "font-weight" : "600"
+    "border-bottom" : "1px solid #CFD9DF",
+    "border-left" : "1px solid #CFD9DF",
+    "border-right" : "1px solid #CFD9DF",
+    "font-weight" : "normal"
   }
 }

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

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json

@@ -53,6 +53,15 @@
         "margin-left": "0px"
       }
     },
+    "errorStyle" : {
+      "node" : {
+        "height": "20px",
+        "line-height": "20px",
+        "margin-left": "20px",
+        "color": "red",
+        "word-break": "keep-all"
+      }
+    },
     "selectorStyle" : {
       "style" : "blue_flat_mobile",
       "width" : "700",

o2web/source/x_component_process_Xform/$Input.js

@@ -259,19 +259,30 @@ 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 () {
+                            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");