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

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

See merge request o2oa/o2oa!697

o2web/source/x_component_Selector/MultipleSelector.js

@@ -570,8 +570,12 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
                         })
                     }
                 }else{
-                    if( this.contentWidth )options.width = this.contentWidth;
-                    if( this.contentHeight )options.height = this.contentHeight;
+                    // if( this.contentWidth )options.width = this.contentWidth;
+                    // if( this.contentHeight )options.height = this.contentHeight;
+
+                    if( this.contentWidth )this.selectors[t].options.width = this.contentWidth;
+                    if( this.contentHeight )this.selectors[t].options.height = this.contentHeight;
+
                     this.selectors[t].loadContent( pageNode );
                     this.selectors[t].setSize();
 

o2web/source/x_component_process_Xform/$Input.js

@@ -75,7 +75,9 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
                 var w = size.x-3;
-                if (COMMON.Browser.safari) w = w-20;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ){
+                    if (COMMON.Browser.safari) w = w-20;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Opinion.js

@@ -429,7 +429,10 @@ MWF.xApplication.process.Xform.Opinion = MWF.APPOpinion =  new Class({
         if (!v){
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
-                var w = size.x-23;
+                var w = size.x - 3
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ) {
+                    w = size.x - 23;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Org.js

@@ -34,7 +34,9 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
                 var w = size.x-3;
-                if (COMMON.Browser.safari) w = w-20;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ) {
+                    if (COMMON.Browser.safari) w = w - 20;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Orgfield.js

@@ -11,7 +11,9 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
                 var w = size.x-3;
-                if (COMMON.Browser.safari) w = w-20;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ) {
+                    if (COMMON.Browser.safari) w = w - 20;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Personfield.js

@@ -34,7 +34,9 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
                 var w = size.x-3;
-                if (COMMON.Browser.safari) w = w-20;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ) {
+                    if (COMMON.Browser.safari) w = w - 20;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Textarea.js

@@ -75,7 +75,10 @@ MWF.xApplication.process.Xform.Textarea = MWF.APPTextarea =  new Class({
         if (!v){
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
-                var w = size.x-23;
+                var w = size.x-3;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ){
+                    w = size.x-23;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",

o2web/source/x_component_process_Xform/Textfield.js

@@ -26,7 +26,9 @@ MWF.xApplication.process.Xform.Textfield = MWF.APPTextfield =  new Class({
             if (this.json.description){
                 var size = this.node.getFirst().getSize();
                 var w = size.x-3;
-                if (COMMON.Browser.safari) w = w-20;
+                if( this.json.showIcon!='no' && !this.form.json.hideModuleIcon ){
+                    if (COMMON.Browser.safari) w = w-20;
+                }
                 this.descriptionNode = new Element("div", {"styles": this.form.css.descriptionNode, "text": this.json.description}).inject(this.node);
                 this.descriptionNode.setStyles({
                     "width": ""+w+"px",