Skip to content

o2oa
o2oa

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

通知 338
Star 10
Fork 6
o2oa
o2oa

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

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

Merge branch 'fix/vue_pro' into 'wrdp' 

修复ElementUI组件的一些小bug

See merge request o2oa/o2oa!5402

(cherry picked from commit 389fbfeb)

b6da413c 修复ElementUI组件的一些小bug
d063b8de 修复ElementUI组件的一些小bug
上级 0a9d8090
显示空白变更内容
内联 并排
Showing with 305 addition and 47 deletion
o2web/source/x_component_process_FormDesigner/Module/$ElComponent.js
浏览文件 @ 1657da98
...@@ -87,7 +87,17 @@ MWF.xApplication.process.FormDesigner.Module.$ElComponent = MWF.FC$ElComponent = ...@@ -87,7 +87,17 @@ MWF.xApplication.process.FormDesigner.Module.$ElComponent = MWF.FC$ElComponent =
}, },
_mountVueApp: function(){ _mountVueApp: function(){
if (!this.vueApp) this.vueApp = this._createVueExtend(); if (!this.vueApp) this.vueApp = this._createVueExtend();
this.vm = new Vue(this.vueApp).$mount(this.node); try{
this.vm = new Vue(this.vueApp);
this.vm.$o2module = this;
this.vm.$o2callback = callback;
this.vm.$mount(this.node);
}catch(e){
this.node.store("module", this);
this._loadVueCss();
if (callback) callback();
}
}, },
_createVueData: function(){ _createVueData: function(){
return {}; return {};
......
o2web/source/x_component_process_FormDesigner/Module/$ElElement.js
浏览文件 @ 1657da98
...@@ -74,7 +74,18 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new ...@@ -74,7 +74,18 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new
}, },
_loadVue: function(callback){ _loadVue: function(callback){
if (!window.Vue){ if (!window.Vue){
o2.load(["vue_develop", "elementui"], { "sequence": true }, callback); o2.load(["vue_develop", "elementui"], { "sequence": true }, function(){
window.Vue.config.errorHandler = function (err, vm, info) {
if (vm.$o2module && info=="nextTick"){
vm.$o2module._createVueAppNode();
vm.$o2module.node.setStyles(vm.$o2module.css.moduleNodeError);
vm.$el.parentNode.replaceChild(vm.$o2module.node, vm.$el);
vm.$el = vm.$o2module.node;
if (vm.$o2callback) vm.$o2module._afterMounted(vm.$o2module.node, vm.$o2callback);
}
}
if (callback) callback();
});
}else{ }else{
if (callback) callback(); if (callback) callback();
} }
...@@ -134,17 +145,9 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new ...@@ -134,17 +145,9 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new
this.vueApp = this._createVueExtend(callback); this.vueApp = this._createVueExtend(callback);
try{ try{
this.vm = new Vue(this.vueApp); this.vm = new Vue(this.vueApp);
// var p = { this.vm.$o2module = this;
// "$options": { this.vm.$o2callback = callback;
// "errorCaptured": function(err, vm, info){
// alert("p: errorCaptured:"+info);
// }
// }
// }
// this.vm.$parent = p;
// this.vm.config.errorHandler = function (err, vm, info) {
// alert("errorHandler: "+info)
// }
this.vm.$mount(this.node); this.vm.$mount(this.node);
}catch(e){ }catch(e){
this.node.store("module", this); this.node.store("module", this);
...@@ -170,7 +173,7 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new ...@@ -170,7 +173,7 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new
}, },
errorCaptured: function(err, vm, info){ errorCaptured: function(err, vm, info){
alert("errorCaptured:"+info); alert("errorCaptured:"+info);
// return false; return false;
} }
}; };
}, },
......
o2web/source/x_component_process_FormDesigner/Module/Elautocomplete/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,29 @@ ...@@ -31,10 +31,29 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
......
o2web/source/x_component_process_FormDesigner/Module/Elbutton/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
...@@ -46,6 +46,26 @@ ...@@ -46,6 +46,26 @@
"opacity": 1, "opacity": 1,
"display": "inline-block" "display": "inline-block"
}, },
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"buttonIcon": { "buttonIcon": {
"height": "26px", "height": "26px",
"cursor": "pointer", "cursor": "pointer",
......
o2web/source/x_component_process_FormDesigner/Module/Elcascader/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
...@@ -46,6 +46,26 @@ ...@@ -46,6 +46,26 @@
"opacity": 1, "opacity": 1,
"display": "inline-block" "display": "inline-block"
}, },
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"buttonIcon": { "buttonIcon": {
"height": "26px", "height": "26px",
"cursor": "pointer", "cursor": "pointer",
......
o2web/source/x_component_process_FormDesigner/Module/Elcheckbox/default/css.wcss
浏览文件 @ 1657da98
...@@ -42,6 +42,21 @@ ...@@ -42,6 +42,21 @@
"opacity": 1, "opacity": 1,
"padding": "0 3px", "padding": "0 3px",
"display": "inline-block" "display": "inline-block"
},
"moduleNodeError": {
"border": "1px dashed #999",
"cursor": "pointer",
"overflow": "hidden",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"padding": "0 3px",
"display": "inline-block",
"height": "40px",
"width": "100px"
} }
} }
o2web/source/x_component_process_FormDesigner/Module/Elcommon/default/css.wcss
浏览文件 @ 1657da98
...@@ -47,6 +47,25 @@ ...@@ -47,6 +47,25 @@
"display": "block", "display": "block",
"min-width": "60px" "min-width": "60px"
}, },
"moduleNodeError": {
"border": "1px dashed #333",
"min-height": "60px",
"cursor": "pointer",
"line-height": "normal",
"width": "auto",
"background": "transparent",
"overflow": "hidden",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "block",
"min-width": "60px"
},
"iconNode": { "iconNode": {
"width": "70px", "width": "70px",
"height": "24px", "height": "24px",
......
o2web/source/x_component_process_FormDesigner/Module/Elcontainer.js
浏览文件 @ 1657da98
...@@ -247,7 +247,17 @@ MWF.xApplication.process.FormDesigner.Module.Elcontainer = MWF.FCElcontainer = n ...@@ -247,7 +247,17 @@ MWF.xApplication.process.FormDesigner.Module.Elcontainer = MWF.FCElcontainer = n
}, },
_mountVueApp: function(callback){ _mountVueApp: function(callback){
if (!this.vueApp) this.vueApp = this._createVueExtend(callback); if (!this.vueApp) this.vueApp = this._createVueExtend(callback);
this.vm = new Vue(this.vueApp).$mount(this.node); try{
this.vm = new Vue(this.vueApp);
this.vm.$o2module = this;
this.vm.$o2callback = callback;
this.vm.$mount(this.node);
}catch(e){
this.node.store("module", this);
this._loadVueCss();
if (callback) callback();
}
}, },
_createVueExtend: function(callback){ _createVueExtend: function(callback){
var _self = this; var _self = this;
......
o2web/source/x_component_process_FormDesigner/Module/Elcontainer/default/css.wcss
浏览文件 @ 1657da98
...@@ -38,6 +38,15 @@ ...@@ -38,6 +38,15 @@
"-webkit-user-select": "none", "-webkit-user-select": "none",
"-moz-user-select": "none", "-moz-user-select": "none",
"opacity": 1 "opacity": 1
},
"moduleNodeError": {
"border": "1px dashed #333",
"min-height": "30px",
"cursor": "pointer",
"margin": "3px 3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"opacity": 1
} }
} }
o2web/source/x_component_process_FormDesigner/Module/Elicon/default/css.wcss
浏览文件 @ 1657da98
...@@ -43,6 +43,22 @@ ...@@ -43,6 +43,22 @@
"opacity": 1, "opacity": 1,
"font-size": "16px", "font-size": "16px",
"display": "inline-block" "display": "inline-block"
},
"moduleNodeError": {
"border": "1px dashed #333",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"font-size": "16px",
"display": "inline-block",
"width": "40px",
"height": "40px"
} }
} }
o2web/source/x_component_process_FormDesigner/Module/Elinput/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,29 @@ ...@@ -31,10 +31,29 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
......
o2web/source/x_component_process_FormDesigner/Module/Elnumber/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,29 @@ ...@@ -31,10 +31,29 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
......
o2web/source/x_component_process_FormDesigner/Module/Elradio/default/css.wcss
浏览文件 @ 1657da98
...@@ -42,6 +42,22 @@ ...@@ -42,6 +42,22 @@
"opacity": 1, "opacity": 1,
"padding": "0 3px", "padding": "0 3px",
"display": "inline-block" "display": "inline-block"
},
"moduleNodeError": {
"border": "1px dashed #999",
"cursor": "pointer",
"overflow": "hidden",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"padding": "0 3px",
"display": "inline-block",
"height": "40px",
"width": "100px"
} }
} }
o2web/source/x_component_process_FormDesigner/Module/Elselect/default/css.wcss
浏览文件 @ 1657da98
...@@ -44,6 +44,27 @@ ...@@ -44,6 +44,27 @@
"top": "auto", "top": "auto",
"left": "auto", "left": "auto",
"opacity": 1, "opacity": 1,
"height": "auto",
"width": "auto",
"display": "inline-block"
},
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "200px",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block" "display": "inline-block"
}, },
"buttonIcon": { "buttonIcon": {
......
o2web/source/x_component_process_FormDesigner/Module/Elslider/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
"border-radius": "5px", "border-radius": "5px",
"border-top": "1px dashed #999", "border-top": "1px dashed #999",
"border-left": "1px dashed #999", "border-left": "1px dashed #999",
"border-right": "1px dashed #333", "border-right": "1px dashed #999",
"border-bottom": "1px dashed #333", "border-bottom": "1px dashed #999",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
...@@ -43,6 +43,23 @@ ...@@ -43,6 +43,23 @@
"left": "auto", "left": "auto",
"opacity": 1, "opacity": 1,
}, },
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"height": "40px"
},
"buttonIcon": { "buttonIcon": {
"height": "26px", "height": "26px",
"cursor": "pointer", "cursor": "pointer",
......
o2web/source/x_component_process_FormDesigner/Module/Elswitch/default/css.wcss
浏览文件 @ 1657da98
...@@ -31,10 +31,29 @@ ...@@ -31,10 +31,29 @@
}, },
"moduleNode": { "moduleNode": {
"border-radius": "100px", "border-radius": "100px",
"border-top": "1px solid #999", "border-top": "1px dashed #999",
"border-left": "1px solid #999", "border-left": "1px dashed #999",
"border-right": "1px solid #333", "border-right": "1px dashed #999",
"border-bottom": "1px solid #333", "border-bottom": "1px dashed #999",
"overflow": "hidden",
"cursor": "pointer",
"margin": "3px",
"-webkit-user-select": "none",
"-moz-user-select": "none",
"position": "static",
"top": "auto",
"left": "auto",
"opacity": 1,
"display": "inline-block"
},
"moduleNodeError": {
"border-radius": "5px",
"border-top": "1px dashed #999",
"border-left": "1px dashed #999",
"border-right": "1px dashed #999",
"border-bottom": "1px dashed #999",
"height": "40px",
"width": "80px",
"overflow": "hidden", "overflow": "hidden",
"cursor": "pointer", "cursor": "pointer",
"margin": "3px", "margin": "3px",
......
o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
浏览文件 @ 1657da98
...@@ -1065,7 +1065,7 @@ MWF.xApplication.process.FormDesigner.LP = { ...@@ -1065,7 +1065,7 @@ MWF.xApplication.process.FormDesigner.LP = {
"noDataText": "无数据文本", "noDataText": "无数据文本",
"loadingText": "加载中文本", "loadingText": "加载中文本",
"remoteMethod": "远程搜索方法", "remoteMethod": "远程搜索方法",
"multipleLimit": "最多可以数", "multipleLimit": "最多可选数",
"max": "最大值", "max": "最大值",
"min": "最小值", "min": "最小值",
......
o2web/source/x_component_process_Xform/Elautocomplete.js
浏览文件 @ 1657da98
...@@ -68,7 +68,9 @@ MWF.xApplication.process.Xform.Elautocomplete = MWF.APPElautocomplete = new Cla ...@@ -68,7 +68,9 @@ MWF.xApplication.process.Xform.Elautocomplete = MWF.APPElautocomplete = new Cla
if (this.json.itemScript && this.json.itemScript.code){ if (this.json.itemScript && this.json.itemScript.code){
var fetchSuggestions = this.form.Macro.exec(this.json.itemScript.code, this); var fetchSuggestions = this.form.Macro.exec(this.json.itemScript.code, this);
if (o2.typeOf(fetchSuggestions)==="function"){ if (o2.typeOf(fetchSuggestions)==="function"){
app.methods.$fetchSuggestions = fetchSuggestions; app.methods.$fetchSuggestions = function(){
fetchSuggestions.apply(this, arguments);
}.bind(this);
} }
} }
......
o2web/source/x_component_process_Xform/Elcascader.js
浏览文件 @ 1657da98
...@@ -56,19 +56,19 @@ MWF.xApplication.process.Xform.Elcascader = MWF.APPElcascader = new Class( ...@@ -56,19 +56,19 @@ MWF.xApplication.process.Xform.Elcascader = MWF.APPElcascader = new Class(
var fn = this.form.Macro.exec(this.json.filterMethod.code, this); var fn = this.form.Macro.exec(this.json.filterMethod.code, this);
methods.$filterMethod = function(){ methods.$filterMethod = function(){
fn.apply(this, arguments); fn.apply(this, arguments);
}.bind(this) }.bind(this);
} }
if (this.json.lazyLoadScript && this.json.lazyLoadScript.code){ if (this.json.lazyLoadScript && this.json.lazyLoadScript.code){
var fn = this.form.Macro.exec(this.json.lazyLoadScript.code, this); var fn = this.form.Macro.exec(this.json.lazyLoadScript.code, this);
this.json.props.lazyLoad = function(){ this.json.props.lazyLoad = function(){
fn.apply(this, arguments); fn.apply(this, arguments);
}.bind(this) }.bind(this);
} }
if (this.json.beforeFilter && this.json.beforeFilter.code){ if (this.json.beforeFilter && this.json.beforeFilter.code){
var fn = this.form.Macro.exec(this.json.beforeFilter.code, this); var fn = this.form.Macro.exec(this.json.beforeFilter.code, this);
methods.$beforeFilter = function(){ methods.$beforeFilter = function(){
fn.apply(this, arguments); fn.apply(this, arguments);
}.bind(this) }.bind(this);
} }
}, },
...@@ -78,10 +78,12 @@ MWF.xApplication.process.Xform.Elcascader = MWF.APPElcascader = new Class( ...@@ -78,10 +78,12 @@ MWF.xApplication.process.Xform.Elcascader = MWF.APPElcascader = new Class(
v.then(function(o){ v.then(function(o){
if (o2.typeOf(o)==="array"){ if (o2.typeOf(o)==="array"){
this.json.options = o; this.json.options = o;
this.json.$options = o;
} }
}.bind(this)); }.bind(this));
}else if (o2.typeOf(v)==="array"){ }else if (o2.typeOf(v)==="array"){
this.json.options = v; this.json.options = v;
this.json.$options = v;
} }
}, },
_loadOptions: function(){ _loadOptions: function(){
......
o2web/source/x_component_process_Xform/Elselect.js
浏览文件 @ 1657da98
...@@ -70,10 +70,12 @@ MWF.xApplication.process.Xform.Elselect = MWF.APPElselect = new Class( ...@@ -70,10 +70,12 @@ MWF.xApplication.process.Xform.Elselect = MWF.APPElselect = new Class(
v.then(function(o){ v.then(function(o){
if (o2.typeOf(o)==="array"){ if (o2.typeOf(o)==="array"){
this.json.options = o; this.json.options = o;
this.json.$options = o;
} }
}.bind(this)); }.bind(this));
}else if (o2.typeOf(v)==="array"){ }else if (o2.typeOf(v)==="array"){
this.json.options = v; this.json.options = v;
this.json.$options = v;
} }
}, },
_loadOptions: function(){ _loadOptions: function(){
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或