Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 165558c3 编写于 作者: NoSubject's avatar NoSubject
浏览文件
操作

Merge branch 'cherry-pick-13946470' into 'release' 

Merge branch 'fix/vue_pro' into 'wrdp'

See merge request o2oa/o2oa!5363
上级 0edf1990 984a7172
隐藏空白更改
内联 并排
Showing with 182 addition and 147 deletion
o2web/source/x_component_process_FormDesigner/$Main/bottom/tools-element.json
浏览文件 @ 165558c3
......@@ -19,16 +19,6 @@
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_number,
"className": "Elnumber"
},
"elicon": {
"fontIcon": "el-icon-picture-outline-round",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_icon,
"className": "Elicon"
},
"elbutton": {
"fontIcon": "el-icon-thumb",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_button,
"className": "Elbutton"
},
"elradio": {
"fontIcon": "el-icon-success",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_radio,
......@@ -59,6 +49,16 @@
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_slider,
"className": "Elslider"
},
"elbutton": {
"fontIcon": "el-icon-thumb",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_button,
"className": "Elbutton"
},
"elicon": {
"fontIcon": "el-icon-picture-outline-round",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_icon,
"className": "Elicon"
},
"elcommon": {
"fontIcon": "el-icon-full-screen",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_common,
......
o2web/source/x_component_process_FormDesigner/$Main/default/tools-element.json
浏览文件 @ 165558c3
......@@ -19,16 +19,6 @@
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_number,
"className": "Elnumber"
},
"elicon": {
"fontIcon": "el-icon-picture-outline-round",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_icon,
"className": "Elicon"
},
"elbutton": {
"fontIcon": "el-icon-thumb",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_button,
"className": "Elbutton"
},
"elradio": {
"fontIcon": "el-icon-success",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_radio,
......@@ -59,6 +49,16 @@
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_slider,
"className": "Elslider"
},
"elbutton": {
"fontIcon": "el-icon-thumb",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_button,
"className": "Elbutton"
},
"elicon": {
"fontIcon": "el-icon-picture-outline-round",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_icon,
"className": "Elicon"
},
"elcommon": {
"fontIcon": "el-icon-full-screen",
"text": MWF.xApplication.process.FormDesigner.LP.modules.el_common,
......
o2web/source/x_component_process_FormDesigner/Module/$ElElement.js
浏览文件 @ 165558c3
......@@ -202,6 +202,7 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new
case "name": this.setPropertyName(); break;
case "id": this.setPropertyId(); break;
case "buttonRadio":
case "vueSlot":
if (this.isPropertyLoaded) if (this.vm) this.resetElement(); break;
default: ;
}
......
o2web/source/x_component_process_Xform/$ElModule.js
浏览文件 @ 165558c3
......@@ -47,6 +47,21 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class(
this._loadUserInterface();
}
},
_checkVmodel: function(text){
if (text){
this.vModels = [];
var reg = /(?:v-model)(?:.lazy|.number|.trim)?(?:\s*=\s*)(?:["'])?([^"']*)/g;
var arr;
while ((arr = reg.exec(text)) !== null) {
if (arr.length>1 && arr[1]){
var modelId = this.json.id.substring(0, this.json.id.lastIndexOf(".."));
modelId = (modelId) ? modelId+".."+arr[1] : arr[1];
this.json[arr[1]] = this.getBusinessDataById(null, modelId);
this.vModels.push(arr[1]);
}
}
}
},
_loadUserInterface: function(){
this.node.appendHTML(this._createElementHtml(), "before");
......@@ -62,6 +77,7 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class(
this._createVueApp();
},
_createVueApp: function(){
if (this.json.vueSlot) this._checkVmodel(this.json.vueSlot);
if (!this.vm) this._loadVue(this._mountVueApp.bind(this));
},
......@@ -95,14 +111,27 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class(
};
app.methods = this._createVueMethods(app);
this.appendVueExtend(app);
this.appendVueWatch(app);
return app;
},
appendVueWatch: function(app){
if (this.vModels && this.vModels.length){
app.watch = app.watch || {};
this.vModels.forEach(function(m){
app.watch[m] = function(val, oldVal){
var modelId = this.json.id.substring(0, this.json.id.lastIndexOf(".."));
modelId = (modelId) ? modelId+".."+m : m;
this.setBusinessDataById(val, modelId);
}.bind(this);
}.bind(this));
}
},
appendVueMethods: function(methods){},
appendVueExtend: function(app){
if (!app.methods) app.methods = {};
this.options.elEvents.forEach(function(k){
this._createEventFunction(app, k);
}.bind(this));
// if (!app.methods) app.methods = {};
// this.options.elEvents.forEach(function(k){
// this._createEventFunction(app, k);
// }.bind(this));
},
appendVueEvents: function(methods){
this.options.elEvents.forEach(function(k){
......@@ -112,7 +141,7 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class(
_createEventFunction: function(methods, k){
methods["$loadElEvent_"+k.camelCase()] = function(){
this.validationMode();
//if (k==="change") this._setBusinessData(this.getInputData());
if (k==="change") this._setBusinessData(this.getInputData());
if (this.json.events && this.json.events[k] && this.json.events[k].code){
this.form.Macro.fire(this.json.events[k].code, this, arguments);
}
......@@ -128,10 +157,17 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class(
return methods || {};
},
_createVueData: function(){
if (this.vModels && this.vModels.length){
this.vModels.forEach(function(m){
if (!this.json.hasOwnProperty(m)) this.json[m] = "";
}.bind(this));
}
if (this.json.vueData && this.json.vueData.code){
var d = this.form.Macro.exec(this.json.vueData.code, this);
this.json = Object.merge(d, this.json);
}
if (this.json.$id===this.json.id) this.form.Macro.environment.data.check(this.json.$id);
this.json[this.json.$id] = this._getBusinessData();
this._appendVueData();
return this.json;
},
......
o2web/source/x_component_process_Xform/$Elinput.js
浏览文件 @ 165558c3
......@@ -11,24 +11,35 @@ Object.assign(o2.APP$Elinput.prototype, {
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
if (this.readonly || this.json.isReadonly) this.node.set("text", value);
this.json[this.json.$id] = value;
this.__setReadonly(value);
this.fieldModuleLoaded = true;
return value;
},
__setData: function(data){
var old = this.getInputData();
this._setBusinessData(data);
this.json[this.json.id] = data;
if (this.readonly || this.json.isReadonly) this.node.set("text", value);
this.json[this.json.$id] = data;
this.__setReadonly(data);
if (old!==data) this.fireEvent("change");
this.moduleValueAG = null;
this.validationMode();
},
__setReadonly: function(data){
if (this.readonly || this.json.isReadonly) this.node.set("text", data);
},
getInputData: function(){
return this.json[this.json.id];
return this.json[this.json.$id];
},
// _getVueModelBindId: function(){
// if (this.json.id.indexOf("..")!==-1){
// this.json["$id"] ="__"+this.json.id.replace(/\.\./g, "_")
// }else{
// this.json["$id"] = this.json.id;
// }
// },
_loadNodeEdit: function(){
this.json["$id"] = (this.json.id.indexOf("..")!==-1) ? this.json.id.replace(/\.\./g, "_") : this.json.id;
this.node.appendHTML(this._createElementHtml(), "before");
var input = this.node.getPrevious();
......
o2web/source/x_component_process_Xform/$Module.js
浏览文件 @ 165558c3
......@@ -12,6 +12,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
/**
* 组件加载前触发。当前组件的queryLoad事件运行时还没有在form里注册，通过this.form.get("fieldId")不能获取到当前组件，需要用this.target获取。
* @event MWF.xApplication.process.Xform.$Module#queryLoad
* @event MWF.xApplication.process.Xform.$Module#queryLoad
* @see {@link https://www.yuque.com/o2oa/ixsnyt/hm5uft#i0zTS|组件事件说明}
*/
/**
......@@ -449,18 +450,16 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
if (evdata) evdata.check(key, v);
}
},
getBusinessDataById: function(d){
getBusinessDataById: function(d, id){
var data = d || this.form.businessData.data;
//var evdata = this.form.Macro.environment.data;
var thisId = id || this.json.id;
//对id类似于 xx..0..xx 的字段进行拆分
if(this.json.id.indexOf("..") < 1){
//if (!data.hasOwnProperty(this.json.id)) evdata.add(this.json.id, data[this.json.id]||"");
return data[this.json.id];
if(thisId.indexOf("..") < 1){
return data[thisId];
}else{
var idList = this.json.id.split("..");
var idList = thisId.split("..");
idList = idList.map( function(d){ return d.test(/^\d+$/) ? d.toInt() : d; });
//var data = this.form.businessData.data;
var lastIndex = idList.length - 1;
for(var i=0; i<=lastIndex; i++){
......@@ -468,11 +467,8 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
if( !id && id !== 0 )return null;
if( ["object","array"].contains(o2.typeOf(data)) ){
if( i === lastIndex ){
//if (!data.hasOwnProperty(id)) evdata.add(id, data[id]||"");
return data[id];
}else{
//if (!data.hasOwnProperty(id)) evdata.add(id, {});
//evdata = evdata[id];
data = data[id];
}
}else{
......@@ -490,17 +486,18 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
evdata.check(id, v);
}
},
setBusinessDataById: function(v){
setBusinessDataById: function(v, id){
debugger;
//对id类似于 xx..0..xx 的字段进行拆分
var evdata = this.form.Macro.environment.data;
var data = this.form.businessData.data;
if(this.json.id.indexOf("..") < 1){
data[this.json.id] = v;
this._checkEvdata(evdata, this.json.id, v);
var thisId = id || this.json.id;
if(thisId.indexOf("..") < 1){
data[thisId] = v;
this._checkEvdata(evdata, thisId, v);
//this.form.businessData.data[this.json.id] = v;
}else{
var idList = this.json.id.split("..");
var idList = thisId.split("..");
idList = idList.map( function(d){ return d.test(/^\d+$/) ? d.toInt() : d; });
//var data = this.form.businessData.data;
......
o2web/source/x_component_process_Xform/Elcascader.js
浏览文件 @ 165558c3
......@@ -139,23 +139,7 @@ MWF.xApplication.process.Xform.Elcascader = MWF.APPElcascader = new Class(
html += "</el-cascader >";
return html;
},
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
//if (this.readonly || this.json.isReadonly) this.node.set("text", value);
this.fieldModuleLoaded = true;
return value;
},
__setData: function(data){
var old = this.getInputData();
this._setBusinessData(data);
this.json[this.json.id] = data;
//if (this.readonly || this.json.isReadonly) this.node.set("text", value);
if (old!==data) this.fireEvent("change");
this.moduleValueAG = null;
this.validationMode();
},
__setReadonly: function(data){},
getCheckedNodes: function(leafOnly){
return (this.vm) ? this.vm.getCheckedNodes(leafOnly) : null;
}
......
o2web/source/x_component_process_Xform/Elcheckbox.js
浏览文件 @ 165558c3
......@@ -113,8 +113,9 @@ MWF.xApplication.process.Xform.Elcheckbox = MWF.APPElcheckbox = new Class(
_createElementHtml: function(radioValues){
debugger;
this.json["$id"] = (this.json.id.indexOf("..")!==-1) ? this.json.id.replace(/\.\./g, "_") : this.json.id;
var html = "<el-checkbox-group class='o2_vue' style='box-sizing: border-box!important'";
html += " v-model=\""+this.json.id+"\"";
html += " v-model=\""+this.json.$id+"\"";
html += " :text-color=\"textColor\"";
html += " :fill=\"fillColor\"";
html += " :size=\"size\"";
......@@ -196,11 +197,11 @@ MWF.xApplication.process.Xform.Elcheckbox = MWF.APPElcheckbox = new Class(
},
__setValue: function(value){
this._setBusinessData(value);
this.json[this.json.id] = (value) ? value : [];
this.json[this.json.$id] = (value) ? value : [];
},
__setData: function(data){
this._setBusinessData(data);
this.json[this.json.id] = data;
this.json[this.json.$id] = data;
this.validationMode();
this.fireEvent("setData");
},
......@@ -256,9 +257,9 @@ MWF.xApplication.process.Xform.Elcheckbox = MWF.APPElcheckbox = new Class(
};
},
_createVueData: function(){
this.form.Macro.environment.data.check(this.json.id);
this.json[this.json.id] = this._getBusinessData();
if (!this.json[this.json.id] || !this.json[this.json.id].length) this.json[this.json.id] = [];
if (this.json.$id===this.json.id) this.form.Macro.environment.data.check(this.json.$id);
this.json[this.json.$id] = this._getBusinessData();
if (!this.json[this.json.$id] || !this.json[this.json.$id].length) this.json[this.json.$id] = [];
if (this.json.vueData && this.json.vueData.code){
var d = this.form.Macro.exec(this.json.vueData.code, this);
......@@ -277,6 +278,7 @@ MWF.xApplication.process.Xform.Elcheckbox = MWF.APPElcheckbox = new Class(
"id": this.json.id,
"MWFType": this.json.type
});
this._loadVueCss();
this._loadDomEvents();
this._afterLoaded();
this.fireEvent("postLoad");
......@@ -284,7 +286,15 @@ MWF.xApplication.process.Xform.Elcheckbox = MWF.APPElcheckbox = new Class(
},
getInputData: function(){
return this.json[this.json.id];
return this.json[this.json.$id];
},
_loadVueCss: function(){
if (this.styleNode){
this.node.removeClass(this.styleNode.get("id"));
}
if (this.json.vueCss && this.json.vueCss.code){
this.styleNode = this.node.loadCssText(this.json.vueCss.code, {"notInject": true});
this.styleNode.inject(this.node, "before");
}
}
});
o2web/source/x_component_process_Xform/Elcommon.js
浏览文件 @ 165558c3
......@@ -77,11 +77,17 @@ o2.xApplication.process.Xform.Elcommon = o2.APPElcommon = new Class(
// },
_createVueExtend: function(){
if (this.tmpVueData){
Object.keys(this.tmpVueData).each(function(k){
this.form.Macro.environment.data.check(k, this.tmpVueData[k]);
// if (this.tmpVueData){
// Object.keys(this.tmpVueData).each(function(k){
// this.form.Macro.environment.data.check(k, this.tmpVueData[k]);
// }.bind(this));
// }
if (this.vModels && this.vModels.length){
this.vModels.forEach(function(m){
if (!this.json.hasOwnProperty(m)) this.json[m] = "";
}.bind(this));
}
var app = {};
if (this.json.vueApp && this.json.vueApp.code) app = this.form.Macro.exec(this.json.vueApp.code, this);
if (app.data){
......@@ -89,9 +95,10 @@ o2.xApplication.process.Xform.Elcommon = o2.APPElcommon = new Class(
switch (ty){
case "object":
Object.keys(app.data).each(function(k){
this.form.Macro.environment.data.add(k, app.data[k]);
if (!this.json.hasOwnProperty(k)) this.json[k] = app.data[k];
//this.form.Macro.environment.data.add(k, app.data[k]);
}.bind(this));
app.data = this.form.Macro.environment.data;
app.data = this.this.json;
// app.data = this.json;
// app.data = Object.merge(this.json, this.form.Macro.environment.data);
break;
......@@ -104,15 +111,18 @@ o2.xApplication.process.Xform.Elcommon = o2.APPElcommon = new Class(
//_self.form.Macro.environment.data.add(_self.json.id, d);
Object.keys(d).each(function(k){
_self.form.Macro.environment.data.add(k, d[k]);
if (!_self.json.hasOwnProperty(k)) _self.json[k] = d[k];
//_self.form.Macro.environment.data.add(k, d[k]);
});
//var data = Object.merge(_slef.json);
return _self.form.Macro.environment.data;
//return _self.form.Macro.environment.data;
return _self.json;
};
break;
}
}else{
app.data = this.form.Macro.environment.data;
//app.data = this.form.Macro.environment.data;
app.data = this.json;
}
var _self = this;
......@@ -121,6 +131,9 @@ o2.xApplication.process.Xform.Elcommon = o2.APPElcommon = new Class(
_self._afterMounted(this.$el);
if (mountedFun && o2.typeOf(mountedFun)=="function") return mountedFun.apply(this);
};
this.appendVueWatch(app);
return app;
},
......@@ -142,17 +155,34 @@ o2.xApplication.process.Xform.Elcommon = o2.APPElcommon = new Class(
// this.styleNode.inject(this.node, "before");
// }
// },
_filterHtml: function(html){
var tmp = new Element("div", {"html": html});
var nodes = tmp.querySelectorAll("*[v-model]");
this.tmpVueData = {};
nodes.forEach(function(node){
this.tmpVueData[node.get("v-model")] = "";
}.bind(this));
return html;
// _filterHtml: function(html){
// var tmp = new Element("div", {"html": html});
// var nodes = tmp.querySelectorAll("*[v-model]");
// this.tmpVueData = {};
// nodes.forEach(function(node){
// this.tmpVueData[node.get("v-model")] = "";
// }.bind(this));
// return html;
// },
_checkVmodel: function(text){
if (text){
this.vModels = [];
var reg = /(?:v-model)(?:.lazy|.number|.trim)?(?:\s*=\s*)(?:["'])?([^"']*)/g;
var arr;
while ((arr = reg.exec(text)) !== null) {
if (arr.length>1 && arr[1]){
var modelId = this.json.id.substring(0, this.json.id.lastIndexOf(".."));
modelId = (modelId) ? modelId+".."+arr[1] : arr[1];
this.json[arr[1]] = this.getBusinessDataById(null, modelId);
this.vModels.push(arr[1]);
}
}
}
},
_createElementHtml: function(){
var html = this.json.vueTemplate || "";
return this._filterHtml(html);
if (html) this._checkVmodel(html);
// return this._filterHtml(html);
return html;
}
});
o2web/source/x_component_process_Xform/Elinput.js
浏览文件 @ 165558c3
......@@ -21,11 +21,6 @@ MWF.xApplication.process.Xform.Elinput = MWF.APPElinput = new Class(
"elEvents": ["focus", "blur", "change", "input", "clear"]
},
_appendVueData: function(){
this.form.Macro.environment.data.check(this.json.id);
//if (!this.json[this.json.id]){
this.json[this.json.id] = this._getBusinessData();
//}
if (!this.json.maxlength) this.json.maxlength = "";
if (!this.json.minlength) this.json.minlength = "";
if (!this.json.showWordLimit) this.json.showWordLimit = false;
......@@ -52,8 +47,9 @@ MWF.xApplication.process.Xform.Elinput = MWF.APPElinput = new Class(
// }.bind(this);
// },
_createElementHtml: function(){
debugger;
var html = "<el-input";
html += " v-model=\""+this.json.id+"\"";
html += " v-model=\""+this.json.$id+"\"";
html += " :maxlength=\"maxlength\"";
html += " :minlength=\"minlength\"";
html += " :show-word-limit=\"showWordLimit\"";
......
o2web/source/x_component_process_Xform/Elradio.js
浏览文件 @ 165558c3
......@@ -98,8 +98,10 @@ MWF.xApplication.process.Xform.Elradio = MWF.APPElradio = new Class(
},
_createElementHtml: function(radioValues){
this.json["$id"] = (this.json.id.indexOf("..")!==-1) ? this.json.id.replace(/\.\./g, "_") : this.json.id;
var html = "<el-radio-group class='o2_vue' style='box-sizing: border-box!important'";
html += " v-model=\""+this.json.id+"\"";
html += " v-model=\""+this.json.$id+"\"";
html += " :text-color=\"textColor\"";
html += " :fill=\"fillColor\"";
html += " :size=\"size\"";
......@@ -157,12 +159,12 @@ MWF.xApplication.process.Xform.Elradio = MWF.APPElradio = new Class(
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
this.json[this.json.$id] = value;
},
__setData: function(data){
this.moduleValueAG = null;
this._setBusinessData(data);
this.json[this.json.id] = data;
this.json[this.json.$id] = data;
this.validationMode();
this.fireEvent("setData");
},
......@@ -219,8 +221,8 @@ MWF.xApplication.process.Xform.Elradio = MWF.APPElradio = new Class(
};
},
_createVueData: function(){
this.form.Macro.environment.data.check(this.json.id);
this.json[this.json.id] = this._getBusinessData();
if (this.json.$id===this.json.id) this.form.Macro.environment.data.check(this.json.$id);
this.json[this.json.$id] = this._getBusinessData();
// if (!this.json[this.json.id]){
// this.json[this.json.id] = this._getBusinessData();
// }
......@@ -236,12 +238,14 @@ MWF.xApplication.process.Xform.Elradio = MWF.APPElradio = new Class(
return this.json;
},
_afterMounted: function(el){
this.node = el;
this.node.set({
"id": this.json.id,
"MWFType": this.json.type
});
this._loadVueCss();
this._loadDomEvents();
this._afterLoaded();
this.fireEvent("postLoad");
......@@ -249,7 +253,15 @@ MWF.xApplication.process.Xform.Elradio = MWF.APPElradio = new Class(
},
getInputData: function(){
return this.json[this.json.id];
return this.json[this.json.$id];
},
_loadVueCss: function(){
if (this.styleNode){
this.node.removeClass(this.styleNode.get("id"));
}
if (this.json.vueCss && this.json.vueCss.code){
this.styleNode = this.node.loadCssText(this.json.vueCss.code, {"notInject": true});
this.styleNode.inject(this.node, "before");
}
}
});
o2web/source/x_component_process_Xform/Elselect.js
浏览文件 @ 165558c3
......@@ -171,21 +171,5 @@ MWF.xApplication.process.Xform.Elselect = MWF.APPElselect = new Class(
html += "</el-select>";
return html;
},
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
//if (this.readonly || this.json.isReadonly) this.node.set("text", value);
this.fieldModuleLoaded = true;
return value;
},
__setData: function(data){
var old = this.getInputData();
this._setBusinessData(data);
this.json[this.json.id] = data;
//if (this.readonly || this.json.isReadonly) this.node.set("text", value);
if (old!==data) this.fireEvent("change");
this.moduleValueAG = null;
this.validationMode();
},
__setReadonly: function(data){}
});
o2web/source/x_component_process_Xform/Elslider.js
浏览文件 @ 165558c3
......@@ -127,19 +127,5 @@ MWF.xApplication.process.Xform.Elslider = MWF.APPElslider = new Class(
html += "</el-slider>";
return html;
},
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
this.fieldModuleLoaded = true;
return value;
},
__setData: function(data){
var old = this.getInputData();
this._setBusinessData(data);
this.json[this.json.id] = data;
if (old!==data) this.fireEvent("change");
this.moduleValueAG = null;
this.validationMode();
},
__setReadonly: function(data){}
});
o2web/source/x_component_process_Xform/Elswitch.js
浏览文件 @ 165558c3
......@@ -126,19 +126,5 @@ MWF.xApplication.process.Xform.Elswitch = MWF.APPElswitch = new Class(
html += "</el-switch>";
return html;
},
__setValue: function(value){
this.moduleValueAG = null;
this._setBusinessData(value);
this.json[this.json.id] = value;
this.fieldModuleLoaded = true;
return value;
},
__setData: function(data){
var old = this.getInputData();
this._setBusinessData(data);
this.json[this.json.id] = data;
if (old!==data) this.fireEvent("change");
this.moduleValueAG = null;
this.validationMode();
},
__setReadonly: function(data){}
});
o2web/source/x_component_process_Xform/Form.js
浏览文件 @ 165558c3
......@@ -1486,9 +1486,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
pathList = pathList || [];
if (typeOf(data) === "object") {
for (var key in data) {
//if (key.substring(0,2)!=="__"){
var pList = Array.clone(pathList);
pList.push(key);
this.setModifedData(data[key], pList);
//}
}
} else if (typeOf(data) === "array") {
var od = this.getOrigianlPathData(pathList);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或