Merge branch 'cherry-pick-23e666fe' into 'master'

修复vue开发版本和生产版本冲突，导致表单加载出错的问题

See merge request o2oa/o2oa!1156

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"){

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 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();