Merge branch 'fix/Process.blue_mobile_flat' into 'develop'

Merge of fix/[流程管理]手机蓝白样式 to develop

See merge request o2oa/o2oa!1074

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

@@ -3,7 +3,6 @@
   "form": {
     "styles":{
       "background-color": "#ffffff",
-      "zoom" : "100%",
       "font-size" : "16px"
     }
   },
@@ -422,17 +421,19 @@
   },
   "personfield": {
     "styles": {
-      "border": "1px solid #979797",
+      "border": "0px",
       "border-radius": "0px",
       "color": "#000",
-      "min-height": "40px",
-      "line-height": "normal"
+      "min-height": "30px",
+      "padding" : "0px",
+      "line-height": "30px"
     },
     "inputStyles": {
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "min-height": "40px",
+      "min-height": "30px",
+      "margin" : "5px 0px",
       "height" : "auto",
       "color": "#000",
       "font-size": "15px",
@@ -442,17 +443,19 @@
   },
   "orgfield": {
     "styles": {
-      "border": "1px solid #979797",
+      "border": "0px",
       "border-radius": "0px",
       "color": "#000",
-      "min-height": "40px",
-      "line-height": "normal"
+      "min-height": "30px",
+      "padding" : "0px",
+      "line-height": "30px"
     },
     "inputStyles": {
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "min-height": "40px",
+      "min-height": "30px",
+      "margin" : "5px 0px",
       "height" : "auto",
       "color": "#000",
       "font-size": "15px",
@@ -462,7 +465,7 @@
   },
   "org": {
     "styles": {
-      "border": "1px solid #979797",
+      "border": "0px",
       "border-radius": "0px",
       "color": "#000",
       "min-height": "30px",

o2web/source/x_component_process_Xform/Orgfield.js

@@ -468,7 +468,8 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 
 	},
 	loadOrgWidget: function(value, node){
-		var options = {"style": "xform", "canRemove":false , "onRemove" : this.removeItem};
+        var disableInfor = layout.mobile ? true : false;
+		var options = {"style": "xform", "canRemove":false , "onRemove" : this.removeItem,"disableInfor" : disableInfor};
 		value.each(function(data){
 			if( data.distinguishedName ){
 				var flag = data.distinguishedName.substr(data.distinguishedName.length-2, 2);

o2web/source/x_component_process_Xform/Personfield.js

@@ -869,6 +869,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
         return (this.json.selectType==="unit") ? "getUnit" : "getIdentity";
     },
     loadOrgWidget: function(value, node){
+        var disableInfor = layout.mobile ? true : false;
         var height = node.getStyle("height").toInt();
         if (node.getStyle("overflow")==="visible" && !height) node.setStyle("overflow", "hidden");
         if (value && value.length){
@@ -877,19 +878,19 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
                 var copyData = Object.clone(data);
                 switch (flag.toLowerCase()){
                     case "@i":
-                        new MWF.widget.O2Identity(copyData, node, {"style": "xform"});
+                        new MWF.widget.O2Identity(copyData, node, {"style": "xform","lazy":true,"disableInfor" : disableInfor});
                         break;
                     case "@p":
-                        new MWF.widget.O2Person(copyData, node, {"style": "xform"});
+                        new MWF.widget.O2Person(copyData, node, {"style": "xform","lazy":true,"disableInfor" : disableInfor});
                         break;
                     case "@u":
-                        new MWF.widget.O2Unit(copyData, node, {"style": "xform"});
+                        new MWF.widget.O2Unit(copyData, node, {"style": "xform","lazy":true,"disableInfor" : disableInfor});
                         break;
                     case "@g":
-                        new MWF.widget.O2Group(copyData, node, {"style": "xform"});
+                        new MWF.widget.O2Group(copyData, node, {"style": "xform","lazy":true,"disableInfor" : disableInfor});
                         break;
                     default:
-                        new MWF.widget.O2Other(copyData, node, {"style": "xform"});
+                        new MWF.widget.O2Other(copyData, node, {"style": "xform","lazy":true,"disableInfor" : disableInfor});
                 }
             }.bind(this));
         }