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

Merge of fix/Process.raido_preview_error to develop [内容管理]修复单选按钮预览出错的问题

See merge request o2oa/o2oa!453

o2web/package.json

@@ -34,10 +34,10 @@
     "gulp-if": "^2.0.2",
     "gulp-rename": "^1.4.0",
     "gulp-sftp": "^0.1.5",
+    "gulp-sftp-up4": "^0.1.8",
     "gulp-tm-asset-rev": "0.0.16",
     "gulp-tm-uglify": "3.0.1",
     "merge-stream": "^1.0.1",
-    "minimist": "^1.2.0",
-    "gulp-sftp-up4": "^0.1.8"
+    "minimist": "^1.2.0"
   }
 }

o2web/source/o2_core/o2/xAction/services/x_attendance_assemble_control.json

@@ -50,7 +50,7 @@
   "getImportStatusAll" : {"uri":"/jaxrs/fileimport/getStatus/all"},
   "getImportStatusDetail" : {"uri":"/jaxrs/fileimport/getStatus/{file_id}/detail"},
 
-  "exportAbnormalAttachment" : {"uri":"/jaxrs/file/export/abnormaldetails/year/{year}/month/{month}", "method": "GET"},
+  "exportAbnormalAttachment" : {"uri":"/jaxrs/file/export/abnormaldetails/year/{year}/month/{month}/stream/false", "method": "GET"},
 
   "listDetail" : {"uri":"/jaxrs/attendancedetail/list/all"},
   "getDetail" : {"uri":"/jaxrs/attendancedetail/{id}"},

o2web/source/x_component_cms_Xform/ModuleImplements.js

@@ -30,7 +30,7 @@ if( !MWF.CMS$Input_Process ){
                 }
             }
             if (this.json.inputStyles) if (this.node.getFirst()) this.node.getFirst().setStyles(this.json.inputStyles);
-            if (this.iconNode && this.iconNode.offsetParent !== null ){
+            if (this.iconNode && this.iconNode.offsetParent !== null  ){
                 var size = this.node.getSize();
                 this.iconNode.setStyle("height", ""+size.y+"px");
             }

o2web/source/x_component_cms_Xform/Readerfield.js

@@ -602,7 +602,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
         }else{
             if (this.json.styles) this.node.setStyles(this.json.styles);
             if (this.json.inputStyles) if (this.node.getFirst()) this.node.getFirst().setStyles(this.json.inputStyles);
-            if (this.iconNode  && this.iconNode.offsetParent !== null ){
+            if (this.iconNode && this.iconNode.offsetParent !== null){
                 var size = this.node.getSize();
                 this.iconNode.setStyle("height", ""+size.y+"px");
             }

o2web/source/x_component_process_Xform/Checkbox.js

@@ -1,4 +1,5 @@
 MWF.xDesktop.requireApp("process.Xform", "$Input", null, false);
+MWF.require("MWF.widget.UUID", null, false);
 MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
 	Implements: [Events],
 	Extends: MWF.APP$Input,

o2web/source/x_component_process_Xform/Org.js

@@ -923,7 +923,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
         }else{
             if (this.json.styles) this.node.setStyles(this.json.styles);
             if (this.json.inputStyles) if (this.node.getFirst()) this.node.getFirst().setStyles(this.json.inputStyles);
-            if (this.iconNode && this.iconNode.offsetParent !== null){
+            if (this.iconNode && this.iconNode.offsetParent !== null ){
                 var size = this.node.getSize();
                 this.iconNode.setStyle("height", ""+size.y+"px");
             }

o2web/source/x_component_process_Xform/Orgfield.js

@@ -581,7 +581,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
         }else{
             if (this.json.styles) this.node.setStyles(this.json.styles);
             if (this.json.inputStyles) if (this.node.getFirst()) this.node.getFirst().setStyles(this.json.inputStyles);
-            if (this.iconNode && this.iconNode.offsetParent !== null){
+            if (this.iconNode && this.iconNode.offsetParent !== null ){
                 var size = this.node.getSize();
                 this.iconNode.setStyle("height", ""+size.y+"px");
             }

o2web/source/x_component_process_Xform/Personfield.js

@@ -887,7 +887,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
         }else{
             if (this.json.styles) this.node.setStyles(this.json.styles);
             if (this.json.inputStyles) if (this.node.getFirst()) this.node.getFirst().setStyles(this.json.inputStyles);
-            if (this.iconNode && this.iconNode.offsetParent !== null){
+            if (this.iconNode && this.iconNode.offsetParent !== null ){
                 var size = this.node.getSize();
                 this.iconNode.setStyle("height", ""+size.y+"px");
             }

o2web/source/x_component_process_Xform/Radio.js

@@ -1,4 +1,5 @@
 MWF.xDesktop.requireApp("process.Xform", "$Input", null, false);
+MWF.require("MWF.widget.UUID", null, false);
 MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
 	Implements: [Events],
 	Extends: MWF.APP$Input,