Merge branch 'cherry-pick-95af433a' into 'develop'

修复ELSelect的id设置为type时组件加载报错的问题

See merge request o2oa/o2oa!1196

o2web/source/x_component_process_FormDesigner/Module/Elinput.js

@@ -25,7 +25,7 @@ MWF.xApplication.process.FormDesigner.Module.Elinput = MWF.FCElinput = new Class
 		// if (this.json.size && this.json.size!=="default") html += " size=\""+this.json.size+"\"";
 		// html += " rows=\""+(this.json.textareaRows || "2")+"\"";
 
-		html += " :placeholder=\"description\"";
+		html += " :placeholder=\"id\"";
 		html += " :type=\"inputType\"";
 		html += " :maxlength=\"maxlength\"";
 		html += " :show-word-limit=\"showWordLimit\"";

o2web/source/x_component_process_FormDesigner/Module/Elselect.js

@@ -32,7 +32,7 @@ MWF.xApplication.process.FormDesigner.Module.Elselect = MWF.FCElselect = new Cla
 		// html += " :fetch-suggestions=\"$fetchSuggestions\"";
 
 		// html += " v-model=\"id\"";
-		html += " :placeholder=\"description\"";
+		// html += " :placeholder=\"description\"";
 		html += " :size=\"size\"";
 		html += " :clearable=\"clearable\"";
 		html += " :popper-class=\"popperClass\"";
@@ -48,7 +48,8 @@ MWF.xApplication.process.FormDesigner.Module.Elselect = MWF.FCElselect = new Cla
 
 		html += " :style=\"elStyles\"";
 
-		html += " :value=\"id\">";
+		html += " value=\"\"";
+		html += " :placeholder=\"id\">";
 		//html += ">";
 		html += "<el-option label=\"\" value=\"\"></el-option>";
 		if (this.json.vueSlot) html += this.json.vueSlot;
@@ -58,7 +59,7 @@ MWF.xApplication.process.FormDesigner.Module.Elselect = MWF.FCElselect = new Cla
 	_createVueData: function(){
 		//var data = this.json;
 		return function(){
-			this.json[this.json.id] = "";
+			// this.json[this.json.id] = "";
 			return Object.assign(this.json, this.tmpVueData||{});
 		}.bind(this)
 	},

o2web/source/x_component_process_Xform/Form.js

@@ -1259,6 +1259,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
         if( callback )callback( moduleNodes, jsons, modules )
     },
     _loadModule: function (json, node, beforeLoad, replace) {
+        if( !json )return null;
         //console.log( json.id );
         if (json.type === "Subform" || json.moduleName === "subform") this.subformCount++;
         //if( json.type === "Subform" || json.moduleName === "subform" ){