Browse Source

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

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

See merge request o2oa/o2oa!454
蔡祥熠 5 years ago
parent
commit
dda01cc6f2

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

+ 1 - 1
o2web/source/x_component_process_Xform/$Input.js

@@ -158,7 +158,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
     _loadStyles: function(){
         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();
             //if (!size.y){
             //    var y1 = this.node.getStyle("height");

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

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