ecinc-cloud-moabase 9.7.2 → 9.7.4

package/lib/ecmoabase.common.js

@@ -1131,7 +1131,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".clendar_out[data-v-41fad3a2]{width:10
 
 /***/ }),
 
-/***/ 2731:
+/***/ 3581:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1145,7 +1145,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".applet-wrap[data-v-9bb86398]{width:100%;height:100%}[data-v-9bb86398] .el-table--border:after,[data-v-9bb86398] .el-table:before{background-color:#fff;border:none!important}[data-v-9bb86398] .el-table--border{background-color:#fff!important;border-color:#fff!important}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".applet-wrap[data-v-fe319652]{width:100%;height:100%}[data-v-fe319652] .el-table--border:after,[data-v-fe319652] .el-table:before{background-color:#fff;border:none!important}[data-v-fe319652] .el-table--border{background-color:#fff!important;border-color:#fff!important}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -1341,7 +1341,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-09be0001] .wflow-attach .van-c
 
 /***/ }),
 
-/***/ 7924:
+/***/ 4424:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1355,7 +1355,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-7b2dc384]{position:absolute;top:0;pointer-events:none}.waterList[data-v-7b2dc384]{position:relative;width:100vw;height:100vh}.Watermark[data-v-7b2dc384],.waterList[data-v-7b2dc384]{pointer-events:none;overflow:hidden}.Watermark[data-v-7b2dc384]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-338fab4c]{position:absolute;top:0;pointer-events:none}.waterList[data-v-338fab4c]{position:relative;width:100vw;height:100vh}.Watermark[data-v-338fab4c],.waterList[data-v-338fab4c]{pointer-events:none;overflow:hidden}.Watermark[data-v-338fab4c]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -25940,19 +25940,19 @@ var update = add("e40d2a08", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2077:
+/***/ 4991:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2731);
+var content = __webpack_require__(3581);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("f8dd5fa4", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("664ab56c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -26100,19 +26100,19 @@ var update = add("35e8d780", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2201:
+/***/ 4074:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(7924);
+var content = __webpack_require__(4424);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("19b21da8", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("bdcadcbe", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -134612,8 +134612,8 @@ var AppListPage_component = normalizeComponent(
 )
 
 /* harmony default export */ var AppListPage = (AppListPage_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=template&id=7b2dc384&scoped=true
-var Watermarkvue_type_template_id_7b2dc384_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=template&id=338fab4c&scoped=true
+var Watermarkvue_type_template_id_338fab4c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.show ? _c('div', {
@@ -134641,7 +134641,7 @@ var Watermarkvue_type_template_id_7b2dc384_scoped_true_render = function render(
     }), 0);
   }), 0)]) : _vm._e();
 };
-var Watermarkvue_type_template_id_7b2dc384_scoped_true_staticRenderFns = [];
+var Watermarkvue_type_template_id_338fab4c_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/vuex/dist/vuex.esm.js
 /*!
@@ -135823,36 +135823,35 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
       content: {},
       countX: 12,
       countY: 12,
-      isOne: true,
       show: false,
       waterTimer: '',
       personId: ''
     };
   },
   computed: Watermarkvue_type_script_lang_js_objectSpread({}, mapGetters(['loginUser'])),
-  watch: {
-    loginUser: {
-      handler: function handler(val) {
-        var _this = this;
-        if (!val) {
-          this.show = false;
-        } else if (!this.show && this.loginUser.personId != this.personId && this.isOne) {
-          this.isOne = false;
-          this.personId = this.loginUser.personId;
+  created: function created() {
+    var _this = this;
+    this.$bus.on('getWaterMarkConfig', this.getWaterMarkConfig);
+    this._unwatchStore = this.$store.subscribe(function (mutation) {
+      if (mutation.type === 'user/SET_AVATAR') {
+        if (!_this.loginUser) {
+          _this.show = false;
+        } else if (!_this.show && _this.loginUser.personId !== _this.personId) {
+          _this.personId = _this.loginUser.personId;
           setTimeout(function () {
             _this.getWaterMarkConfig();
           }, 100);
         }
-      },
-      deep: true
-    }
-  },
-  created: function created() {
-    this.$bus.on('getWaterMarkConfig', this.getWaterMarkConfig);
+      }
+    });
   },
   beforeDestroy: function beforeDestroy() {
     this.$bus.off('getWaterMarkConfig', this.getWaterMarkConfig);
     window.removeEventListener('resize', this.getMoreWater);
+    if (this._unwatchStore) {
+      this._unwatchStore();
+      this._unwatchStore = null;
+    }
   },
   mounted: function mounted() {
     window.addEventListener('resize', this.getMoreWater);
@@ -135898,9 +135897,9 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_Watermarkvue_type_script_lang_js = (Watermarkvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=7b2dc384&prod&scoped=true&lang=scss
-var Watermarkvue_type_style_index_0_id_7b2dc384_prod_scoped_true_lang_scss = __webpack_require__(2201);
-;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=7b2dc384&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=338fab4c&prod&scoped=true&lang=scss
+var Watermarkvue_type_style_index_0_id_338fab4c_prod_scoped_true_lang_scss = __webpack_require__(4074);
+;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=338fab4c&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/Watermark/index.vue
 
@@ -135913,11 +135912,11 @@ var Watermarkvue_type_style_index_0_id_7b2dc384_prod_scoped_true_lang_scss = __w
 
 var Watermark_component = normalizeComponent(
   components_Watermarkvue_type_script_lang_js,
-  Watermarkvue_type_template_id_7b2dc384_scoped_true_render,
-  Watermarkvue_type_template_id_7b2dc384_scoped_true_staticRenderFns,
+  Watermarkvue_type_template_id_338fab4c_scoped_true_render,
+  Watermarkvue_type_template_id_338fab4c_scoped_true_staticRenderFns,
   false,
   null,
-  "7b2dc384",
+  "338fab4c",
   null
   
 )
@@ -136888,22 +136887,29 @@ var DragAppletvue_type_template_id_cd089ff2_scoped_true_render = function render
 };
 var DragAppletvue_type_template_id_cd089ff2_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=template&id=9bb86398&scoped=true
-var Appletvue_type_template_id_9bb86398_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=template&id=fe319652&scoped=true
+var Appletvue_type_template_id_fe319652_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
     staticClass: "applet-wrap el-table"
-  }, [_c(_vm.applet, {
-    tag: "components",
+  }, [_vm.componentName ? _c(_vm.componentName, {
+    tag: "component",
     attrs: {
       "applet-data": _vm.appletData
     }
-  })], 1);
+  }) : _vm._e()], 1);
 };
-var Appletvue_type_template_id_9bb86398_scoped_true_staticRenderFns = [];
+var Appletvue_type_template_id_fe319652_scoped_true_staticRenderFns = [];
 
+;// CONCATENATED MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
+var external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject = require("vue");
+var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=script&lang=js
+
+
+// 计数器，确保同一组件名多次注册时不冲突
+var asyncCounter = 0;
 /* harmony default export */ var Appletvue_type_script_lang_js = ({
   name: 'Applet',
   components: {},
@@ -136914,47 +136920,76 @@ var Appletvue_type_template_id_9bb86398_scoped_true_staticRenderFns = [];
       default: function _default() {
         return {};
       }
-    },
-    allcomps: {
-      type: Object,
-      required: true,
-      default: function _default() {
-        return {};
-      }
     }
   },
   data: function data() {
     return {
-      applet: null
+      // 使用字符串组件名引用，而非直接赋值组件对象/工厂函数
+      // 这是 Vue 2 异步组件能正确解析的关键：
+      //   <component :is="factoryFn">  → Vue 把 factoryFn 当函数式组件处理（错误）
+      //   <component :is="'CompName'"> → Vue 从 components 注册表查找，正确识别异步工厂
+      componentName: null
     };
   },
-  computed: {},
-  watch: {},
   created: function created() {
     this.initPortalApplet();
   },
-  mounted: function mounted() {},
   methods: {
     initPortalApplet: function initPortalApplet() {
-      if (!this.appletData.url || this.appletData.url.indexOf('@/') !== 0) {
-        this.applet = this.allcomps[this.appletData.code];
-      } else {
-        var url = this.appletData.url;
-        var index = url.lastIndexOf('/?');
-        var appPath = null;
-        if (index !== -1) {
-          var str = url.substring(index + 1, url.length);
-          var searchIndex = str.indexOf('&');
-          if (searchIndex === -1) {
-            this.searchType = url.substring(index + 1, url.length).replace('?type=', '');
-          } else {
-            this.searchType = this.getQueryVariable(str.replace('?', ''), 'type');
-          }
-          appPath = url.substring(0, index);
+      var url = this.appletData.url || '';
+      var code = this.appletData.code || '';
+
+      // ========== 路径1: 无 URL 或非 @/、#/ 开头 → 按 code 从全局组件查找 ==========
+      if (!url || url.indexOf('@/') !== 0 && url.indexOf('#/') !== 0) {
+        if (code && (external_commonjs_vue_commonjs2_vue_root_Vue_default()).options.components[code]) {
+          this.componentName = code;
+        }
+        return;
+      }
+
+      // ========== 路径2: 解析 URL，提取路径和查询参数 ==========
+      var appPath = url;
+      var queryIndex = url.lastIndexOf('/?');
+      if (queryIndex !== -1) {
+        var str = url.substring(queryIndex + 1);
+        var searchIndex = str.indexOf('&');
+        if (searchIndex === -1) {
+          this.searchType = url.substring(queryIndex + 1).replace('?type=', '');
         } else {
-          appPath = url;
+          this.searchType = this.getQueryVariable(str.replace('?', ''), 'type');
+        }
+        appPath = url.substring(0, queryIndex);
+      }
+
+      // ========== 路径3: @/ 开头 → 优先全局组件，否则异步加载 ==========
+      if (url.indexOf('@/') === 0) {
+        // 从路径提取组件名（如 @/mapp/desktop/workTodo → workTodo）
+        var baseName = appPath.substring(appPath.lastIndexOf('/') + 1).split('.')[0].split('?')[0];
+
+        // 3a. 已全局注册（含同步/异步），直接用字符串名引用
+        if ((external_commonjs_vue_commonjs2_vue_root_Vue_default()).options.components[baseName]) {
+          this.componentName = baseName;
+          return;
+        }
+
+        // 3b. 未全局注册 → 通过 $loadComponent 获取工厂，注册为本地异步组件
+        var factory = this.$loadComponent(appPath);
+        if (factory) {
+          var localName = 'AsyncApplet_' + baseName + '_' + ++asyncCounter;
+          this.$options.components[localName] = factory;
+          this.componentName = localName;
+        }
+        return;
+      }
+
+      // ========== 路径4: #/dcontent/ 开头 → HTTP 远程组件 ==========
+      if (url.indexOf('#/') === 0) {
+        var _factory = this.$loadComponent(appPath);
+        if (_factory) {
+          var _localName = 'HttpApplet_' + ++asyncCounter;
+          this.$options.components[_localName] = _factory;
+          this.componentName = _localName;
         }
-        this.applet = this.$loadComponent(appPath);
       }
     },
     getQueryVariable: function getQueryVariable(query, variable) {
@@ -136971,9 +137006,9 @@ var Appletvue_type_template_id_9bb86398_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=script&lang=js
  /* harmony default export */ var DragApplet_Appletvue_type_script_lang_js = (Appletvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=style&index=0&id=9bb86398&prod&scoped=true&lang=scss
-var Appletvue_type_style_index_0_id_9bb86398_prod_scoped_true_lang_scss = __webpack_require__(2077);
-;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=style&index=0&id=9bb86398&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=style&index=0&id=fe319652&prod&scoped=true&lang=scss
+var Appletvue_type_style_index_0_id_fe319652_prod_scoped_true_lang_scss = __webpack_require__(4991);
+;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue?vue&type=style&index=0&id=fe319652&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmoa/moabase/src/common/components/DragApplet/Applet.vue
 
@@ -136986,11 +137021,11 @@ var Appletvue_type_style_index_0_id_9bb86398_prod_scoped_true_lang_scss = __webp
 
 var Applet_component = normalizeComponent(
   DragApplet_Appletvue_type_script_lang_js,
-  Appletvue_type_template_id_9bb86398_scoped_true_render,
-  Appletvue_type_template_id_9bb86398_scoped_true_staticRenderFns,
+  Appletvue_type_template_id_fe319652_scoped_true_render,
+  Appletvue_type_template_id_fe319652_scoped_true_staticRenderFns,
   false,
   null,
-  "9bb86398",
+  "fe319652",
   null
   
 )