Merge branch 'fix/elementUi' into 'develop'

修复ElementUI的date组件bug

See merge request o2oa/o2oa!231

o2web/source/x_component_process_FormDesigner/Module/Elinput/template.json

@@ -3,14 +3,14 @@
 	"name": "",
 	"type": "Elinput",
 	"description": "",
-	isReadonly : false,
-	inputType : "text",
-	showWordLimit : false,
-	clearable : false,
-	showPassword : false,
-	size : "default",
-	autosize : false,
-	resize : "none",
+	"isReadonly" : false,
+	"inputType" : "text",
+	"showWordLimit" : false,
+	"clearable" : false,
+	"showPassword" : false,
+	"size" : "default",
+	"autosize" : false,
+	"resize" : "none",
 	"vueData": {},
 	"vueMethods": {},
 	"vueCss": {},

o2web/source/x_component_process_Xform/Elinput.js

@@ -62,6 +62,9 @@ MWF.xApplication.process.Xform.Elinput = MWF.APPElinput =  new Class(
         if (!this.json.readonly) this.json.readonly = false;
         if (!this.json.resize) this.json.resize = "none";
         if (!this.json.description) this.json.description = "";
+        if (this.json.minRows && this.json.maxRows){
+            this.json.autosize = {minRows: this.json.minRows.toInt(), maxRows: this.json.maxRows.toInt()}
+        }
     },
     // appendVueExtend: function(app){
     //     if (!app.methods) app.methods = {};