diff --git a/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js b/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js index e4e0546e7c9828855a2f6af1a5fd947c42625114..70c020d484412c92b7cddaee5fa11a9a72aba7f2 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js +++ b/o2web/source/x_component_process_FormDesigner/Module/$ElElement.js @@ -72,7 +72,7 @@ MWF.xApplication.process.FormDesigner.Module.$ElElement = MWF.FC$ElElement = new this.json.isSaved = true; }, _loadVue: function(callback){ - if (!window.Vue){ + if (!window.Vue || window.Vue.name!=='Vue'){ o2.load(["vue_develop", "elementui"], { "sequence": true }, function(){ window.Vue.config.errorHandler = function (err, vm, info) { if (vm.$o2module && info=="nextTick"){ diff --git a/o2web/source/x_component_process_Xform/$ElModule.js b/o2web/source/x_component_process_Xform/$ElModule.js index 3229773e59364068649b1ca5e54fd8f2d56f5bcc..a278e53515a328caf74aeb5d971f6a8564ec3ef6 100644 --- a/o2web/source/x_component_process_Xform/$ElModule.js +++ b/o2web/source/x_component_process_Xform/$ElModule.js @@ -82,8 +82,9 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule = new Class( }, _loadVue: function(callback){ - if (!window.Vue){ - var vue = (o2.session.isDebugger) ? "vue_develop" : "vue"; + var vue = (o2.session.isDebugger) ? "vue_develop" : "vue"; + var vueName = (o2.session.isDebugger) ? "Vue" : "Cn"; + if (!window.Vue || window.Vue.name!==vueName){ o2.loadAll({"css": "../o2_lib/vue/element/index.css", "js": [vue, "elementui"]}, { "sequence": true }, callback); }else{ if (callback) callback();