eoss-ui 0.4.91 → 0.4.93

package/lib/eoss-ui.common.js

@@ -91,13 +91,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(6);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -448,11 +448,11 @@ var ajax = function ajax(_ref) {
   }
   if (method === 'post' && format) {
     data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   } else {
-    if (!header['content-type']) {
+    if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
@@ -1908,8 +1908,6 @@ var isFunction = function isFunction(obj) {
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
 var isLogined = function isLogined(_ref8) {
-  var _this = this;
-
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1928,6 +1926,17 @@ var isLogined = function isLogined(_ref8) {
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
+      if (!startWith(loginPage, ['http', '/'], true)) {
+        var pathname = win.top.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+          loginPage = pathname + '/' + loginPage.replace('./', '');
+        } else {
+          loginPage = pathname + loginPage.replace('./', '');
+        }
+      }
     }
     next();
   } else {
@@ -1940,7 +1949,7 @@ var isLogined = function isLogined(_ref8) {
             url = win.location.href;
             break;
           case 'blank':
-            url = win.location.href;
+            url = win.open(url);
             break;
           case 'parent':
             url = win.parent.location.href;
@@ -1999,31 +2008,41 @@ var isLogined = function isLogined(_ref8) {
               }
               break;
             case 4:
-              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
-                type: 'error'
-              }).then(function () {
-                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                window.location.href = delUrlParam({ key: 'code' });
-                if (loginPage) {
-                  win.top.location.replace(loginPage);
-                } else if (document.referrer) {
-                  win.top.location.replace(document.referrer);
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  next('/login');
+                type: 'error',
+                callback: function callback() {
+                  sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
                 }
-              }).catch(function (e) {});
+              });
               break;
             default:
           }
         } else {
-          if (token) {
-            next();
-          } else {
-            alert(res.msg);
-          }
+          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'error',
+            callback: function callback() {
+              if (loginPage) {
+                win.top.location.replace(loginPage);
+              } else if (document.referrer) {
+                win.top.location.replace(document.referrer);
+              } else if (win.top.location.href.indexOf('main.html') > -1) {
+                win.top.location.href = './login.html';
+              } else {
+                next('/login');
+              }
+            }
+          });
         }
       }).catch(function (e) {});
     } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3297,13 +3316,13 @@ module.exports = require("interactjs");
 /* 5 */
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("eoss-element");
 
 /***/ }),
 /* 6 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 /* 7 */
@@ -47309,8 +47328,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6641fcac&
-var mainvue_type_template_id_6641fcac_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/main.vue?vue&type=template&id=b2aea55c&
+var mainvue_type_template_id_b2aea55c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47735,11 +47754,11 @@ var mainvue_type_template_id_6641fcac_render = function () {
     1
   )
 }
-var mainvue_type_template_id_6641fcac_staticRenderFns = []
-mainvue_type_template_id_6641fcac_render._withStripped = true
+var mainvue_type_template_id_b2aea55c_staticRenderFns = []
+mainvue_type_template_id_b2aea55c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6641fcac&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=b2aea55c&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -49533,8 +49552,12 @@ var external_stompjs_ = __webpack_require__(14);
 var external_stompjs_default = /*#__PURE__*/__webpack_require__.n(external_stompjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
+
+
 var main_src_mainvue_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; };
 
+function main_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
 //
 //
 //
@@ -50146,12 +50169,9 @@ var log = utils_util["a" /* default */].getParams('console');
   created: function created() {
     this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
     this.isHeader = utils_util["a" /* default */].getParams('header');
-    this.getConfig();
-    if (this.socket) {
-      this.initWebSocket();
-    }
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && utils_util["a" /* default */].setFavicon(sysLogoIco);
+    this.isLogin();
   },
   mounted: function mounted() {
     utils_util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -50167,6 +50187,176 @@ var log = utils_util["a" /* default */].getParams('console');
   },
 
   methods: {
+    isLogin: function isLogin() {
+      var _this = this;
+
+      return main_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
+        var query, token, loginPage, pathname, url;
+        return regenerator_default.a.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                query = _this.$route.query;
+                token = utils_util["a" /* default */].getStorage('token') || utils_util["a" /* default */].getStorage('Authorization');
+                loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
+
+                if (loginPage) {
+                  if (!utils_util["a" /* default */].startWith(loginPage, ['http', '/'], true)) {
+                    pathname = utils_util["a" /* default */].win.top.location.pathname;
+
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      loginPage = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      loginPage = pathname + loginPage.replace('./', '');
+                    }
+                  }
+                }
+
+                if (!(!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
+                  _context.next = 20;
+                  break;
+                }
+
+                url = utils_util["a" /* default */].win.top.location.href;
+
+                if (!query.openType) {
+                  _context.next = 16;
+                  break;
+                }
+
+                _context.t0 = query.openType;
+                _context.next = _context.t0 === 'self' ? 10 : _context.t0 === 'blank' ? 12 : _context.t0 === 'parent' ? 14 : 16;
+                break;
+
+              case 10:
+                url = utils_util["a" /* default */].win.location.href;
+                return _context.abrupt('break', 16);
+
+              case 12:
+                url = utils_util["a" /* default */].win.open(url);
+                return _context.abrupt('break', 16);
+
+              case 14:
+                url = utils_util["a" /* default */].win.parent.location.href;
+                return _context.abrupt('break', 16);
+
+              case 16:
+                _context.next = 18;
+                return utils_util["a" /* default */].ajax({
+                  method: 'post',
+                  url: api["b" /* authCenter */],
+                  data: query
+                }).then(function (res) {
+                  if (res.rCode === 0) {
+                    _this.getConfig();
+                    if (_this.socket) {
+                      _this.initWebSocket();
+                    }
+                    var results = res.results;
+
+                    switch (results.statusCode) {
+                      case 0:
+                        var storage = getStorage('storage');
+                        setStorage({
+                          type: storage,
+                          key: {
+                            ssId: results.ssId,
+                            token: results.token,
+                            Authorization: results.token,
+                            deviceUnique: results.deviceUnique
+                          }
+                        });
+                        break;
+                      case 1:
+                        break;
+                      case 2:
+                        break;
+                      case 3:
+                        var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+                        if (query.openType) {
+                          switch (query.openType) {
+                            case 'self':
+                              utils_util["a" /* default */].win.location.href = href;
+                              break;
+                            case 'blank':
+                              utils_util["a" /* default */].win.open(href);
+                              break;
+                            case 'top':
+                              utils_util["a" /* default */].win.top.location.href = href;
+                              break;
+                            case 'parent':
+                              utils_util["a" /* default */].win.parent.location.href = href;
+                              break;
+                          }
+                        } else {
+                          if (open) {
+                            utils_util["a" /* default */].win.open(href);
+                          } else {
+                            utils_util["a" /* default */].win.top.location.href = href;
+                          }
+                        }
+                        break;
+                      case 4:
+                        _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                          confirmButtonText: '确定',
+                          type: 'error',
+                          callback: function callback() {
+                            sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                            //window.location.href = delUrlParam({ key: 'code' });
+                            if (loginPage) {
+                              utils_util["a" /* default */].win.top.location.replace(loginPage);
+                            } else if (document.referrer) {
+                              utils_util["a" /* default */].win.top.location.replace(document.referrer);
+                            } else if (utils_util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+                              utils_util["a" /* default */].win.top.location.href = './login.html';
+                            } else {
+                              _this.$router.replace('/login');
+                            }
+                          }
+                        });
+                        break;
+                      default:
+                    }
+                  } else {
+                    _this.$alert(res.msg, '提示', {
+                      confirmButtonText: '确定',
+                      type: 'error',
+                      callback: function callback() {
+                        if (loginPage) {
+                          utils_util["a" /* default */].win.top.location.replace(loginPage);
+                        } else if (document.referrer) {
+                          utils_util["a" /* default */].win.top.location.replace(document.referrer);
+                        } else if (utils_util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+                          utils_util["a" /* default */].win.top.location.href = './login.html';
+                        } else {
+                          _this.$router.replace('/login');
+                        }
+                      }
+                    });
+                  }
+                }).catch(function (e) {});
+
+              case 18:
+                _context.next = 22;
+                break;
+
+              case 20:
+                _this.getConfig();
+                if (_this.socket) {
+                  _this.initWebSocket();
+                }
+
+              case 22:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, _this);
+      }))();
+    },
     menuSuccess: function menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -50178,14 +50368,14 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //获取主题模板JSON
     getMainDetail: function getMainDetail(id) {
-      var _this = this;
+      var _this2 = this;
 
       var params = {
         url: api["cb" /* mainDetail */],
         params: { id: id }
       };
       utils_util["a" /* default */].ajax(params).then(function (res) {
-        var _that = _this;
+        var _that = _this2;
         if (!res.results) {
           _that.showDefault = true;
         }
@@ -50221,7 +50411,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
@@ -50263,32 +50453,32 @@ var log = utils_util["a" /* default */].getParams('console');
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
+        } else if (sessionStorage.getItem('jump') && this.history) {
+          var _ids = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+          if (_ids) {
+            this.defaultActive = _ids;
+            this.navIds = _ids;
+            this.setTitle(_ids[0]);
+          }
         } else if (utils_util["a" /* default */].win.location.hash) {
           var hash = utils_util["a" /* default */].win.location.hash;
           if (hash) {
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            var _ids = this.getId(this.menus, utils_util["a" /* default */].win.location.hash, true);
-            if (_ids) {
-              this.defaultActive = _ids;
-              this.navIds = _ids;
-              this.setTitle(_ids[0]);
-            }
-          } else if (sessionStorage.getItem('jump') && this.history) {
-            var _ids2 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            var _ids2 = this.getId(this.menus, utils_util["a" /* default */].win.location.hash, true);
             if (_ids2) {
               this.defaultActive = _ids2;
               this.navIds = _ids2;
               this.setTitle(_ids2[0]);
             }
-          }
-        } else if (sessionStorage.getItem('jump') && this.history) {
-          var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
-          if (_ids3) {
-            this.defaultActive = _ids3;
-            this.navIds = _ids3;
-            this.setTitle(_ids3[0]);
+          } else if (sessionStorage.getItem('jump') && this.history) {
+            var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            if (_ids3) {
+              this.defaultActive = _ids3;
+              this.navIds = _ids3;
+              this.setTitle(_ids3[0]);
+            }
           }
         }
         this.setMenu(this.menus);
@@ -50297,7 +50487,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //设置主题颜色
     setTheme: function setTheme(color) {
-      var _this2 = this;
+      var _this3 = this;
 
       if (!color) {
         return;
@@ -50308,24 +50498,24 @@ var log = utils_util["a" /* default */].getParams('console');
         data: { color: escape(color.toLowerCase()) }
       }).then(function (res) {
         if (res.rCode === 0) {
-          _this2.color = color;
+          _this3.color = color;
           localStorage.setItem('theme', color);
           var _mainConfig = JSON.parse(utils_util["a" /* default */].getStorage('mainConfig'));
-          _mainConfig.userStyle.color = _this2.color;
+          _mainConfig.userStyle.color = _this3.color;
           sessionStorage.setItem('mainConfig', JSON.stringify(_mainConfig));
-          _this2.$emit('setting', 'theme', _this2.color);
-          _this2.$message({
+          _this3.$emit('setting', 'theme', _this3.color);
+          _this3.$message({
             message: res.msg,
             type: 'success',
             duration: 2000
           });
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this2.$message.error(msg);
+          _this3.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
@@ -50403,7 +50593,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //获取用户配置及信息
     getConfig: function getConfig() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (utils_util["a" /* default */].getStorage('mainConfig')) {
         var results = JSON.parse(utils_util["a" /* default */].getStorage('mainConfig'));
@@ -50417,36 +50607,36 @@ var log = utils_util["a" /* default */].getParams('console');
       }
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
-          _this3.setConfig(res.results, 1);
-          if (_this3.remote) {
-            _this3.getMenu();
+          _this4.setConfig(res.results, 1);
+          if (_this4.remote) {
+            _this4.getMenu();
           } else {
-            _this3.renderMenu();
+            _this4.renderMenu();
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this3.$message.error(msg);
+          _this4.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
     reGetConfig: function reGetConfig() {
-      var _this4 = this;
+      var _this5 = this;
 
       utils_util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
-          _this4.setConfig(results, 1);
+          _this5.setConfig(results, 1);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this4.$message.error(msg);
+          _this5.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -50515,17 +50705,24 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //获取应用导航菜单
     getMenu: function getMenu() {
-      var _this5 = this;
+      var _this6 = this;
 
       utils_util["a" /* default */].ajax({ url: this.action, params: this.param ? this.param : {} }).then(function (res) {
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
-            _this5.menus = JSON.parse(JSON.stringify(res.results));
+            _this6.menus = JSON.parse(JSON.stringify(res.results));
             var applicationid = utils_util["a" /* default */].getParams('applicationid') || utils_util["a" /* default */].getParams('applicationId');
             if (applicationid) {
-              var ids = _this5.getId(_this5.menus, applicationid);
+              var ids = _this6.getId(_this6.menus, applicationid);
               if (ids) {
-                _this5.defaultActive = ids;
+                _this6.defaultActive = ids;
+              }
+            } else if (sessionStorage.getItem('jump') && _this6.history) {
+              var _ids4 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+              if (_ids4) {
+                _this6.defaultActive = _ids4;
+                _this6.navIds = _ids4;
+                _this6.setTitle(_ids4[0]);
               }
             } else if (utils_util["a" /* default */].win.location.hash) {
               var hash = utils_util["a" /* default */].win.location.hash;
@@ -50533,41 +50730,34 @@ var log = utils_util["a" /* default */].getParams('console');
                 hash = hash.split('?')[0];
               }
               if (hash !== '#/' && hash !== '#/main') {
-                var _ids4 = _this5.getId(_this5.menus, utils_util["a" /* default */].win.location.hash, true);
-                if (_ids4) {
-                  _this5.defaultActive = _ids4;
-                  _this5.navIds = _ids4;
-                  _this5.setTitle(_ids4[0]);
-                }
-              } else if (sessionStorage.getItem('jump') && _this5.history) {
-                var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+                var _ids5 = _this6.getId(_this6.menus, utils_util["a" /* default */].win.location.hash, true);
                 if (_ids5) {
-                  _this5.defaultActive = _ids5;
-                  _this5.navIds = _ids5;
-                  _this5.setTitle(_ids5[0]);
+                  _this6.defaultActive = _ids5;
+                  _this6.navIds = _ids5;
+                  _this6.setTitle(_ids5[0]);
+                }
+              } else if (sessionStorage.getItem('jump') && _this6.history) {
+                var _ids6 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
+                if (_ids6) {
+                  _this6.defaultActive = _ids6;
+                  _this6.navIds = _ids6;
+                  _this6.setTitle(_ids6[0]);
                 }
-              }
-            } else if (sessionStorage.getItem('jump') && _this5.history) {
-              var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-              if (_ids6) {
-                _this5.defaultActive = _ids6;
-                _this5.navIds = _ids6;
-                _this5.setTitle(_ids6[0]);
               }
             }
-            _this5.setTips(_this5.menus);
-            utils_store.set('nav', _this5.menus);
-            _this5.setMenu(_this5.menus);
+            _this6.setTips(_this6.menus);
+            utils_store.set('nav', _this6.menus);
+            _this6.setMenu(_this6.menus);
           } else {
-            _this5.$message.error('未分配菜单权限，请联系管理员！');
+            _this6.$message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this6.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
@@ -50689,11 +50879,11 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //遍历设置菜单气泡提醒
     setTips: function setTips(obj) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this6.setTips(item);
+          _this7.setTips(item);
         });
       } else {
         if (Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
@@ -50703,7 +50893,7 @@ var log = utils_util["a" /* default */].getParams('console');
         var flag = false;
         if (obj.children && obj.children.length) {
           obj.children.forEach(function (item) {
-            if (_this6.setTips(item)) {
+            if (_this7.setTips(item)) {
               flag = true;
             }
           });
@@ -50713,7 +50903,7 @@ var log = utils_util["a" /* default */].getParams('console');
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach(function (item) {
-            if (_this6.setTips(item)) {
+            if (_this7.setTips(item)) {
               flag = true;
             }
           });
@@ -51007,7 +51197,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this7 = this;
+      var _this8 = this;
 
       var type = res.type;
 
@@ -51028,7 +51218,7 @@ var log = utils_util["a" /* default */].getParams('console');
             this.setMenu(this.menus);
           }
           this.$nextTick(function () {
-            _this7.reset = true;
+            _this8.reset = true;
           });
           break;
         case 'user':
@@ -51056,21 +51246,21 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //刷新子页面、子路由
     handleRefresh: function handleRefresh() {
-      var _this8 = this;
+      var _this9 = this;
 
       if (this.method === 'iframe') {
         this.page = utils_util["a" /* default */].handlerUrl(this.page);
       } else {
         this.refresh = false;
         this.$nextTick(function () {
-          _this8.refresh = true;
+          _this9.refresh = true;
         });
       }
     },
 
     //跳转页面
     handleJump: function handleJump(page, type, res) {
-      var _this9 = this;
+      var _this10 = this;
 
       var prevPage = sessionStorage.getItem('jump');
       console.log(page);
@@ -51101,7 +51291,7 @@ var log = utils_util["a" /* default */].getParams('console');
           this.wjName = 'singlespa';
           this.page = this.host + page;
           this.$nextTick(function () {
-            _this9.refresh = true;
+            _this10.refresh = true;
           });
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
@@ -51130,7 +51320,7 @@ var log = utils_util["a" /* default */].getParams('console');
                   query: params
                 });
                 this.$nextTick(function () {
-                  _this9.refresh = true;
+                  _this10.refresh = true;
                 });
               } else {
                 var urlopenmode = utils_util["a" /* default */].getParams({
@@ -51146,7 +51336,7 @@ var log = utils_util["a" /* default */].getParams('console');
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this9.refresh = true;
+                    _this10.refresh = true;
                   });
                 }
               }
@@ -51158,7 +51348,7 @@ var log = utils_util["a" /* default */].getParams('console');
         }
       }
       this.$nextTick(function () {
-        _this9.showPage = true;
+        _this10.showPage = true;
       });
     },
 
@@ -51270,7 +51460,7 @@ var log = utils_util["a" /* default */].getParams('console');
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this10 = this;
+      var _this11 = this;
 
       utils_util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
@@ -51279,7 +51469,7 @@ var log = utils_util["a" /* default */].getParams('console');
           if (typeof res === 'string') {
             res = res.split(',');
           }
-          _this10.setDefault(_this10.menus, res);
+          _this11.setDefault(_this11.menus, res);
         }
       }, false);
     },
@@ -51298,7 +51488,7 @@ var log = utils_util["a" /* default */].getParams('console');
       this.handleConnect(this.client);
     },
     handleConnect: function handleConnect(client) {
-      var _this11 = this;
+      var _this12 = this;
 
       client.connect({}, function () {
         //localStorage.setItem("socket",true);
@@ -51309,22 +51499,22 @@ var log = utils_util["a" /* default */].getParams('console');
           for (var i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
-                _this11.online = data[i];
+                _this12.online = data[i];
               }
               if (i === 'sysMsgNums') {
-                _this11.notice = data[i];
-                if (_this11.showMsg) {
-                  _this11.$refs.message.getMsg(true);
+                _this12.notice = data[i];
+                if (_this12.showMsg) {
+                  _this12.$refs.message.getMsg(true);
                 }
               }
               if (i === 'menuTipsMap') {
-                _this11.menuTips = data[i];
+                _this12.menuTips = data[i];
               }
               if (i === 'sysMsgList') {
-                _this11.sysMsg = data[i];
+                _this12.sysMsg = data[i];
               }
               if (i === 'extraData') {
-                _this11.extraData = data[i];
+                _this12.extraData = data[i];
               }
             }
           }
@@ -51335,13 +51525,13 @@ var log = utils_util["a" /* default */].getParams('console');
       });
     },
     handleOpened: function handleOpened(res) {
-      var _this12 = this;
+      var _this13 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this12.sysMsg = [];
+          _this13.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -51362,7 +51552,7 @@ var log = utils_util["a" /* default */].getParams('console');
       }
     },
     handleReLogin: function handleReLogin(res) {
-      var _this13 = this;
+      var _this14 = this;
 
       if (res && typeof res == 'string') {
         res = JSON.parse(res);
@@ -51393,7 +51583,7 @@ var log = utils_util["a" /* default */].getParams('console');
         this.timer = setTimeout(function () {
           console.log('handleReLogin');
           sessionStorage.setItem('remind', 1);
-          _this13.$confirm(msg, btn).then(function () {
+          _this14.$confirm(msg, btn).then(function () {
             utils_util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
             var loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
             if (loginPage) {
@@ -51468,8 +51658,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6641fcac_render,
-  mainvue_type_template_id_6641fcac_staticRenderFns,
+  mainvue_type_template_id_b2aea55c_render,
+  mainvue_type_template_id_b2aea55c_staticRenderFns,
   false,
   null,
   null,
@@ -70677,7 +70867,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.91',
+  version: '0.4.93',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,