Эх сурвалжийг харах

Merge branch 'fix/xform_datagrid' into 'develop'

Merge of fix/xform_datagrid to develop 提交时,自动保存数据网格时,在数据网格事件中如果修改了data数据,这个数据不会被保存下来。现在修复了这个问题

See merge request o2oa/o2oa!221
胡起 5 жил өмнө
parent
commit
5c8d16389b

+ 2 - 2
o2web/source/x_component_process_Xform/Form.js

@@ -858,7 +858,8 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
         return data;
     },
     getData: function (issubmit) {
-        var data = Object.clone(this.businessData.data);
+        //var data = Object.clone(this.businessData.data);
+        var data = this.businessData.data;
         Object.each(this.forms, function (module, id) {
             if (module.json.type === "Opinion") {
                 debugger;
@@ -882,7 +883,6 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
             }
         }.bind(this));
 
-
         this.businessData.data = data;
         this.Macro.environment.setData(this.businessData.data);
         return data;