eoss 0.1.0-alpha.38 → 0.1.0-alpha.39

package/lib/main.js

@@ -5284,6 +5284,12 @@ module.exports = require("eoss/lib/message-box");
 
 /***/ }),
 /* 9 */
+/***/ (function(module, exports) {
+
+module.exports = require("eoss/lib/message");
+
+/***/ }),
+/* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5312,7 +5318,7 @@ module.exports = require("eoss/lib/message-box");
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(6);
 /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(8);
 /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(10);
+/* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(9);
 /* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(31);
 /* harmony import */ var eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_retrial_auth__WEBPACK_IMPORTED_MODULE_10__);
@@ -6463,12 +6469,6 @@ var getTableData = function getTableData(_ref9) {
   });
 };
 
-/***/ }),
-/* 10 */
-/***/ (function(module, exports) {
-
-module.exports = require("eoss/lib/message");
-
 /***/ }),
 /* 11 */,
 /* 12 */
@@ -8331,7 +8331,7 @@ var util = __webpack_require__(1);
 var storage = __webpack_require__(0);
 
 // EXTERNAL MODULE: ./src/utils/ajax.js
-var ajax = __webpack_require__(9);
+var ajax = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./src/utils/sm.js
 var sm = __webpack_require__(20);
@@ -10533,7 +10533,7 @@ appsvue_type_template_id_4c1ec65b_scoped_true_render._withStripped = true
 // CONCATENATED MODULE: ./packages/main/src/components/apps.vue?vue&type=template&id=4c1ec65b&scoped=true&
 
 // EXTERNAL MODULE: ./src/utils/ajax.js
-var utils_ajax = __webpack_require__(9);
+var utils_ajax = __webpack_require__(10);
 
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(24);
@@ -13411,8 +13411,8 @@ var sub_menu_component = Object(componentNormalizer["a" /* default */])(
 // EXTERNAL MODULE: ./packages/main/src/components/user.vue + 9 modules
 var user = __webpack_require__(153);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/message.vue?vue&type=template&id=40c299ed&
-var messagevue_type_template_id_40c299ed_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/message.vue?vue&type=template&id=0f856ca2&
+var messagevue_type_template_id_0f856ca2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13578,11 +13578,11 @@ var messagevue_type_template_id_40c299ed_render = function () {
     1
   )
 }
-var messagevue_type_template_id_40c299ed_staticRenderFns = []
-messagevue_type_template_id_40c299ed_render._withStripped = true
+var messagevue_type_template_id_0f856ca2_staticRenderFns = []
+messagevue_type_template_id_0f856ca2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/components/message.vue?vue&type=template&id=40c299ed&
+// CONCATENATED MODULE: ./packages/main/src/components/message.vue?vue&type=template&id=0f856ca2&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(1);
@@ -13591,6 +13591,10 @@ var util = __webpack_require__(1);
 var dialog_ = __webpack_require__(37);
 var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
 
+// EXTERNAL MODULE: external "eoss/lib/message"
+var message_ = __webpack_require__(9);
+var message_default = /*#__PURE__*/__webpack_require__.n(message_);
+
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/message.vue?vue&type=script&lang=js&
 var messagevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -13679,6 +13683,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 
 
+
 /* harmony default export */ var messagevue_type_script_lang_js_ = ({
   name: 'Message',
   provide: function provide() {
@@ -13807,7 +13812,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         } else {
           _this.loading = false;
           var msg = res.msg || '系统错误，请联系管理员！';
-          Object(util["m" /* error */])(msg);
+          message_default.a.error(msg);
         }
       }).catch(function () {
         _this.loading = false;
@@ -13835,7 +13840,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           _this2.msgs.splice(index, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          Object(util["m" /* error */])(msg);
+          message_default.a.error(msg);
         }
       });
     },
@@ -13920,7 +13925,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       var safeUrl = this.validateUrl(timestampUrl);
 
       if (!safeUrl) {
-        Object(util["m" /* error */])('无效的URL地址');
+        message_default.a.error('无效的URL地址');
         return;
       }
 
@@ -13952,7 +13957,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       var safeUrl = this.validateUrl(item.timestampUrl);
 
       if (!safeUrl) {
-        Object(util["m" /* error */])('无效的URL地址');
+        message_default.a.error('无效的URL地址');
         return;
       }
 
@@ -13976,8 +13981,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             this.windowIntervals.push(timer);
           }
         } catch (e) {
-          console.error('窗口打开失败:', e);
-          Object(util["m" /* error */])('窗口打开失败');
+          message_default.a.error('窗口打开失败');
         }
       } else {
         this.dialog = {
@@ -14084,8 +14088,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 var message_component = Object(componentNormalizer["a" /* default */])(
   components_messagevue_type_script_lang_js_,
-  messagevue_type_template_id_40c299ed_render,
-  messagevue_type_template_id_40c299ed_staticRenderFns,
+  messagevue_type_template_id_0f856ca2_render,
+  messagevue_type_template_id_0f856ca2_staticRenderFns,
   false,
   null,
   null,
@@ -14094,8 +14098,8 @@ var message_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var message = (message_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/notice.vue?vue&type=template&id=6f87fd2f&
-var noticevue_type_template_id_6f87fd2f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/notice.vue?vue&type=template&id=186169dd&
+var noticevue_type_template_id_186169dd_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14234,11 +14238,11 @@ var noticevue_type_template_id_6f87fd2f_render = function () {
     ]
   )
 }
-var noticevue_type_template_id_6f87fd2f_staticRenderFns = []
-noticevue_type_template_id_6f87fd2f_render._withStripped = true
+var noticevue_type_template_id_186169dd_staticRenderFns = []
+noticevue_type_template_id_186169dd_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/components/notice.vue?vue&type=template&id=6f87fd2f&
+// CONCATENATED MODULE: ./packages/main/src/components/notice.vue?vue&type=template&id=186169dd&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/notice.vue?vue&type=script&lang=js&
 var noticevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -14312,6 +14316,7 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 
 
+
 /* harmony default export */ var noticevue_type_script_lang_js_ = ({
   name: 'Notice',
   provide: function provide() {
@@ -14385,7 +14390,7 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
           _this.msgs.splice(i, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          Object(util["m" /* error */])(msg);
+          message_default.a.error(msg);
         }
       });
     },
@@ -14479,8 +14484,8 @@ var noticevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var notice_component = Object(componentNormalizer["a" /* default */])(
   components_noticevue_type_script_lang_js_,
-  noticevue_type_template_id_6f87fd2f_render,
-  noticevue_type_template_id_6f87fd2f_staticRenderFns,
+  noticevue_type_template_id_186169dd_render,
+  noticevue_type_template_id_186169dd_staticRenderFns,
   false,
   null,
   null,
@@ -14489,8 +14494,8 @@ var notice_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var notice = (notice_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=0340e2fa&scoped=true&
-var pagesvue_type_template_id_0340e2fa_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/pages.vue?vue&type=template&id=2c5ae8c0&scoped=true&
+var pagesvue_type_template_id_2c5ae8c0_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14670,10 +14675,11 @@ var pagesvue_type_template_id_0340e2fa_scoped_true_render = function () {
                       : item.method === "wujie"
                       ? _c("wujie", {
                           attrs: {
-                            name: item.appCode || item.code || item.id,
+                            name: _vm.wujieName(item),
                             host: _vm.host,
                             url: item.url,
                             keys: item.keys,
+                            alive: "",
                           },
                           on: {
                             "load-error": function ($event) {
@@ -14720,14 +14726,14 @@ var pagesvue_type_template_id_0340e2fa_scoped_true_render = function () {
     1
   )
 }
-var pagesvue_type_template_id_0340e2fa_scoped_true_staticRenderFns = []
-pagesvue_type_template_id_0340e2fa_scoped_true_render._withStripped = true
+var pagesvue_type_template_id_2c5ae8c0_scoped_true_staticRenderFns = []
+pagesvue_type_template_id_2c5ae8c0_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=0340e2fa&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/components/pages.vue?vue&type=template&id=2c5ae8c0&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=template&id=bcc739f0&
-var router_pagevue_type_template_id_bcc739f0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=template&id=e8ad868a&
+var router_pagevue_type_template_id_e8ad868a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14742,11 +14748,11 @@ var router_pagevue_type_template_id_bcc739f0_render = function () {
     1
   )
 }
-var router_pagevue_type_template_id_bcc739f0_staticRenderFns = []
-router_pagevue_type_template_id_bcc739f0_render._withStripped = true
+var router_pagevue_type_template_id_e8ad868a_staticRenderFns = []
+router_pagevue_type_template_id_e8ad868a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/components/router-page.vue?vue&type=template&id=bcc739f0&
+// CONCATENATED MODULE: ./packages/main/src/components/router-page.vue?vue&type=template&id=e8ad868a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/components/router-page.vue?vue&type=script&lang=js&
 var router_pagevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -14807,8 +14813,13 @@ var router_pagevue_type_script_lang_js_extends = Object.assign || function (targ
 
 
   computed: {
+    /**
+     * 组件 key 只由 appCode/path + refreshTrigger 组成，不包含 keys：
+     * keys 变化已由 watcher 走 doRefresh() 重建一次，
+     * 若再拼进 key 会导致同一次 keys 变化重建两次（页面加载两次）
+     */
     componentKey: function componentKey() {
-      return (this.keys || this.appCode) + (this.refreshTrigger ? '_r' : '');
+      return (this.appCode || this.path) + (this.refreshTrigger ? '_r' : '');
     }
   },
 
@@ -14909,8 +14920,8 @@ var router_pagevue_type_script_lang_js_extends = Object.assign || function (targ
 
 var router_page_component = Object(componentNormalizer["a" /* default */])(
   components_router_pagevue_type_script_lang_js_,
-  router_pagevue_type_template_id_bcc739f0_render,
-  router_pagevue_type_template_id_bcc739f0_staticRenderFns,
+  router_pagevue_type_template_id_e8ad868a_render,
+  router_pagevue_type_template_id_e8ad868a_staticRenderFns,
   false,
   null,
   null,
@@ -15063,6 +15074,7 @@ var pagesvue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
 
 
 
@@ -15234,6 +15246,15 @@ var base64 = function base64(val) {
       });
       return url;
     },
+
+
+    /**
+     * @desc:wujie 沙箱名按页签唯一，避免同一子应用多个菜单共用 name 时
+     * 互相 destroy/recreate 沙箱导致子应用重复启动
+     **/
+    wujieName: function wujieName(item) {
+      return (item.appCode || item.code || item.id) + '__' + item.id;
+    },
     handleSelect: function handleSelect(res, index) {
       var node = res.node;
 
@@ -15246,7 +15267,15 @@ var base64 = function base64(val) {
       }
 
       var updatedTabs = [].concat(this.newTabs);
-      updatedTabs[index].url = node.url;
+      var tab = updatedTabs[index];
+      if (tab.method === 'iframe') {
+        // iframe 走 url 变化刷新：加时间戳保证重复点击同一菜单也会重载
+        tab.url = Object(util["T" /* timestampUrl */])(node.url);
+      } else {
+        // router/wujie 走 keys 变化刷新（url 单独变化不触发重建）
+        tab.url = node.url;
+        this.$set(tab, 'keys', Object(util["Y" /* uuid */])());
+      }
       this.$main.tabs = updatedTabs;
     },
 
@@ -15349,10 +15378,21 @@ var base64 = function base64(val) {
 
     /**
      * @desc:wujie 加载失败，降级为 iframe 加载（重定向/登录跳转等服务端页面无法被 wujie 的 fetch 加载）
+     * 降级结果必须写回 $main.tabs 源页签对象：isFourthTabs 下 newTabs 是副本，
+     * 只改副本会在下次 tabs 同步时回滚成 wujie，造成 wujie/iframe 反复重建（页面加载两次）
      **/
     handleWujieLoadError: function handleWujieLoadError(item) {
+      if (item.method === 'iframe') {
+        return;
+      }
       this.$set(item, 'loading', true);
       this.$set(item, 'method', 'iframe');
+      var source = (this.$main.tabs || []).find(function (t) {
+        return t.id === item.id;
+      });
+      if (source && source !== item) {
+        this.$set(source, 'method', 'iframe');
+      }
     },
 
     /**
@@ -15477,11 +15517,11 @@ var base64 = function base64(val) {
 
 var pages_component = Object(componentNormalizer["a" /* default */])(
   components_pagesvue_type_script_lang_js_,
-  pagesvue_type_template_id_0340e2fa_scoped_true_render,
-  pagesvue_type_template_id_0340e2fa_scoped_true_staticRenderFns,
+  pagesvue_type_template_id_2c5ae8c0_scoped_true_render,
+  pagesvue_type_template_id_2c5ae8c0_scoped_true_staticRenderFns,
   false,
   null,
-  "0340e2fa",
+  "2c5ae8c0",
   null
   
 )
@@ -18771,13 +18811,13 @@ var appid = Object(util["s" /* getParams */])('applicationId');
             _this10.setTips(_this10.business);
             _this10.setTips(_this10.systems);
           } else {
-            _this10.$message.error('未分配应用菜单权限，请联系管理员！');
+            message.error('未分配应用菜单权限，请联系管理员！');
           }
           _this10.getMenus(loadingInstance);
         } else {
           loadingInstance.close();
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this10.$message.error(msg);
+          message.error(msg);
         }
       }).catch(function () {
         loadingInstance.close();
@@ -18804,11 +18844,11 @@ var appid = Object(util["s" /* getParams */])('applicationId');
             _this11.menus = res.results;
             _this11.renderMenus(_this11.menus);
           } else {
-            _this11.$message.error('未分配菜单权限，请联系管理员！');
+            message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this11.$message.error(msg);
+          message.error(msg);
         }
       }).catch(function () {
         loadingInstance.close();
@@ -18866,10 +18906,10 @@ var appid = Object(util["s" /* getParams */])('applicationId');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this12.$message.error(msg);
+          message.error(msg);
         }
       }).catch(function () {
-        _this12.$message.error('系统错误，请联系管理员！');
+        message.error('系统错误，请联系管理员！');
       });
     },
 
@@ -18970,7 +19010,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
           } else {
             this.subMenus = null;
             this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
+            message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var _subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
@@ -18992,7 +19032,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
           } else {
             this.subMenus = null;
             this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
+            message.error('未分配菜单权限，请联系管理员！');
           }
         }
       } else if (this.initApplication && this.initApplication.length && !this.indexUrl) {
@@ -19645,7 +19685,8 @@ var appid = Object(util["s" /* getParams */])('applicationId');
         if (tabs[i].method === 'iframe') {
           this.$set(this.tabs[i], 'url', Object(util["T" /* timestampUrl */])(this.tabs[i].url));
         }
-        if (this.tabs[i].method === 'router') {
+        // router/wujie 统一走 keys 变化触发刷新（点菜单=刷新一次）
+        if (this.tabs[i].method === 'router' || this.tabs[i].method === 'wujie') {
           this.$set(this.tabs[i], 'keys', Object(util["Y" /* uuid */])());
         }
         this.activeName = res.id;
@@ -20032,7 +20073,7 @@ var appid = Object(util["s" /* getParams */])('applicationId');
           }
         }
       } else {
-        this.$message.error('没有此菜单！');
+        message.error('没有此菜单！');
       }
     },