Merge branch 'cherry-pick-56e6c096' into 'release'

修复表单预览错误

See merge request o2oa/o2oa!5335

o2web/source/x_component_process_FormDesigner/$Main/bottom/tools-element.json

@@ -9,6 +9,11 @@
     "text": MWF.xApplication.process.FormDesigner.LP.modules.el_input,
     "className": "Elinput"
   },
+  "elautocomplete": {
+    "fontIcon": "el-icon-finished",
+    "text": MWF.xApplication.process.FormDesigner.LP.modules.el_autocomplete,
+    "className": "Elautocomplete"
+  },
   "elnumber": {
     "fontIcon": "el-icon-edit-outline",
     "text": MWF.xApplication.process.FormDesigner.LP.modules.el_number,
@@ -40,7 +45,7 @@
     "className": "Elselect"
   },
   "elcascader": {
-    "fontIcon": "el-icon-caret-bottom",
+    "fontIcon": "el-icon-d-arrow-right",
     "text": MWF.xApplication.process.FormDesigner.LP.modules.el_cascader,
     "className": "Elcascader"
   },
@@ -54,5 +59,9 @@
     "text": MWF.xApplication.process.FormDesigner.LP.modules.el_slider,
     "className": "Elslider"
   },
-
+  "elcommon": {
+    "fontIcon": "el-icon-full-screen",
+    "text": MWF.xApplication.process.FormDesigner.LP.modules.el_common,
+    "className": "Elcommon"
+  }
 }

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -82,7 +82,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
         this.propertyMultiTd = null;
 
         if (this.autoSaveTimerID) window.clearInterval(this.autoSaveTimerID);
-        this.load(data);
+        this.load(data||this.data);
         this.selected();
     },
 

o2web/source/x_component_process_FormDesigner/Preview.js

@@ -21,8 +21,11 @@ MWF.xApplication.process.FormDesigner.Preview = MWF.FCPreview = new Class({
         this._loadCss();
 
         this.form = form;
-		this.data = Object.clone((form._getFormData) ? form._getFormData() : form._getPageData());
+		//this.data = Object.clone((form._getFormData) ? form._getFormData() : form._getPageData());
 
+        this.data = this.form.data;
+        //this.data = Object.clone((form._getFormData) ? form._getFormData() : form._getPageData());
+        //this.form.reload();
         //this.data = Object.clone(data);
 	},
 
@@ -170,4 +173,4 @@ MWF.xApplication.process.FormDesigner.Preview = MWF.FCPreview = new Class({
             }.bind(this));
         }.bind(this));
     }
-});
\ No newline at end of file
+});