eoss-ui 0.4.98 → 0.5.10

package/lib/main.js

@@ -97,8 +97,14 @@ module.exports =
 /* 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__(6);
 /* 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__(2);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_6__);
+var _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; };
+
 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; };
 
 /**
@@ -109,7 +115,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(7).sm2;
+var sm2 = __webpack_require__(9).sm2;
+
+
 
 
 
@@ -256,7 +264,7 @@ var ajax = function ajax(_ref) {
             clearTimeout(loginMsg);
             loginMsg = setTimeout(function () {
               sessionStorage.setItem('remind', 1);
-              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -303,7 +311,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -1752,7 +1760,7 @@ var getWeekday = function getWeekday(date) {
  * @param {String} [url] - url地址
  **/
 
-var handlerUrl = function handlerUrl(url, before) {
+var handlerUrl = function handlerUrl(url, param, before) {
   var arry = url.split('?');
   if (arry.length > 2) {
     var ary = arry.splice(1, arry.length);
@@ -1774,6 +1782,10 @@ var handlerUrl = function handlerUrl(url, before) {
   } else {
     url += '?_tt=' + new Date().getTime();
   }
+  if (param) {
+    var str = queryParams(param);
+    url += '&' + str;
+  }
   if (before && before === arry[0]) {
     var pathname = win.location.pathname;
     if (pathname === '/') {
@@ -1938,29 +1950,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  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('./', '');
-        }
+  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();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',
@@ -2015,7 +2027,7 @@ var isLogined = function isLogined(_ref8) {
               }
               break;
             case 4:
-              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2035,7 +2047,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2166,7 +2178,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_4__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2525,6 +2537,70 @@ var setStorage = function setStorage(_ref14) {
   }
 };
 
+/**
+ * socket
+ * @desc:webSocket
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [url] - 连接地址
+ * @param {String} [take] - 订阅地址
+ * @param {String} [debug] - 调试
+ * @param {String} [interval] - 重连间隔时间
+ **/
+function socket(options) {
+  var nextDate = 0;
+  var connect = 1;
+  return new Promise(function (resolve, reject) {
+    var wshost = getStorage('wshost') || '';
+    var option = {
+      url: wshost + _config_api__WEBPACK_IMPORTED_MODULE_0__[/* wss */ "Zb"],
+      take: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* topic */ "Qb"],
+      debug: true,
+      interval: 20
+    };
+    var websocket = win.websocket || {};
+    if (options && isObject(options)) {
+      option = _extends({}, option, options);
+    }
+    var key = window.btoa(option.url);
+    if (!websocket[key]) {
+      websocket[key] = { socket: new sockjs_client__WEBPACK_IMPORTED_MODULE_4___default.a(option.url) };
+      win.websocket = websocket;
+    }
+
+    var client = websocket[key] ? websocket[key].client : null;
+    if (!client) {
+      client = websocket[key].client = stompjs__WEBPACK_IMPORTED_MODULE_5___default.a.over(websocket[key].socket);
+      !option.debug && (client.debug = null);
+    }
+    client.connect({}, function () {
+      client.subscribe(option.take, function (response) {
+        var res = JSON.parse(response.body);
+        resolve(res, function () {
+          client.disconnect();
+          win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
+        }, client, websocket[key]);
+      });
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
+      if (connect > 5 && diffSecond < option.interval) {
+        client.disconnect();
+        if (win.top.websocket) {
+          if (Object.keys(win.top.websocket).length > 1) {
+            delete win.top.websocket[key];
+          } else {
+            delete win.top.websocket;
+          }
+        }
+      } else {
+        win.top.websocket && win.top.websocket[key] && setTimeout(function () {
+          socket(options);
+        }, 5000);
+      }
+      reject(error);
+    });
+  });
+}
 /**
  * sum
  * @desc 求和
@@ -2777,7 +2853,6 @@ var urlJoinParams = function urlJoinParams(_ref15) {
       params[items[0]] = items[1];
     });
   }
-  '&_tt=' + new Date().getTime();
   params = extend(true, params, param);
   var str = queryParams(params);
   if (str) {
@@ -2945,6 +3020,7 @@ var watermark = function watermark(option) {
   sendMessage: sendMessage,
   setFavicon: setFavicon,
   setStorage: setStorage,
+  socket: socket,
   startWith: startWith,
   sum: sum,
   takeLeft: takeLeft,
@@ -3433,10 +3509,22 @@ module.exports = require("json-bigint");
 /* 7 */
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("sockjs-client");
 
 /***/ }),
 /* 8 */
+/***/ (function(module, exports) {
+
+module.exports = require("stompjs");
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports) {
+
+module.exports = require("sm-crypto");
+
+/***/ }),
+/* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3463,36 +3551,24 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 9 */
+/* 11 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 10 */,
-/* 11 */,
 /* 12 */,
 /* 13 */,
 /* 14 */,
 /* 15 */,
 /* 16 */,
 /* 17 */,
-/* 18 */
-/***/ (function(module, exports) {
-
-module.exports = require("runtime-import");
-
-/***/ }),
-/* 19 */
-/***/ (function(module, exports) {
-
-module.exports = require("sockjs-client");
-
-/***/ }),
+/* 18 */,
+/* 19 */,
 /* 20 */
 /***/ (function(module, exports) {
 
-module.exports = require("stompjs");
+module.exports = require("runtime-import");
 
 /***/ }),
 /* 21 */,
@@ -3510,7 +3586,7 @@ module.exports = require("stompjs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/main.vue?vue&type=template&id=67d8ca27&
+// 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=cef5b378&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3940,10 +4016,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=67d8ca27&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=cef5b378&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(9);
+var regenerator_ = __webpack_require__(11);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // 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&
@@ -3973,7 +4049,7 @@ userinfovue_type_template_id_799780ee_render._withStripped = true
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(8);
+var store = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5590,7 +5666,7 @@ async_componentvue_type_template_id_51f0233c_scoped_true_render._withStripped =
 // CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=51f0233c&scoped=true&
 
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(18);
+var external_runtime_import_ = __webpack_require__(20);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
 
@@ -5741,14 +5817,6 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var async_component = (async_component_component.exports);
-// EXTERNAL MODULE: external "sockjs-client"
-var external_sockjs_client_ = __webpack_require__(19);
-var external_sockjs_client_default = /*#__PURE__*/__webpack_require__.n(external_sockjs_client_);
-
-// EXTERNAL MODULE: external "stompjs"
-var external_stompjs_ = __webpack_require__(20);
-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&
 
 
@@ -6013,13 +6081,17 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
 
 
-
-
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
 var log = util["a" /* default */].getParams('console');
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsMain',
   inheritAttrs: false,
+  provide: function provide() {
+    return {
+      esMain: this
+    };
+  },
+
   components: {
     userinfo: userinfo,
     settings: settings,
@@ -6282,8 +6354,7 @@ var log = util["a" /* default */].getParams('console');
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      client: null,
-      websocket: null,
+      close: null,
       connect: 0,
       wjName: 'singlespa',
       menus: '',
@@ -6365,11 +6436,12 @@ var log = util["a" /* default */].getParams('console');
     };
   },
   created: function created() {
+    var params = util["a" /* default */].getParams() || {};
     this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
-    this.isHeader = util["a" /* default */].getParams('header');
+    this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util["a" /* default */].setFavicon(sysLogoIco);
-    this.isLogin();
+    this.isLogin(params);
   },
   mounted: function mounted() {
     util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -6385,16 +6457,15 @@ var log = util["a" /* default */].getParams('console');
   },
 
   methods: {
-    isLogin: function isLogin() {
+    isLogin: function isLogin(query) {
       var _this = this;
 
       return mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var query, token, loginPage, pathname;
+        var token, loginPage, pathname;
         return regenerator_default.a.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                query = util["a" /* default */].getParams();
                 token = util["a" /* default */].getStorage('token') || util["a" /* default */].getStorage('Authorization');
                 loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
 
@@ -6413,12 +6484,12 @@ var log = util["a" /* default */].getParams('console');
                   }
                 }
 
-                if (!(!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
-                  _context.next = 9;
+                if (!(!token && query && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
+                  _context.next = 8;
                   break;
                 }
 
-                _context.next = 7;
+                _context.next = 6;
                 return util["a" /* default */].ajax({
                   method: 'post',
                   url: api["b" /* authCenter */],
@@ -6521,14 +6592,14 @@ var log = util["a" /* default */].getParams('console');
                   }
                 }).catch(function (e) {});
 
-              case 7:
-                _context.next = 10;
+              case 6:
+                _context.next = 9;
                 break;
 
-              case 9:
+              case 8:
                 _this.getConfig();
 
-              case 10:
+              case 9:
               case 'end':
                 return _context.stop();
             }
@@ -6632,7 +6703,7 @@ var log = util["a" /* default */].getParams('console');
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
-        } else if (sessionStorage.getItem('jump') && this.history) {
+        } else if (sessionStorage.getItem('jump') && this.isHistory) {
           var _ids = this.getId(this.menus, sessionStorage.getItem('jump'), true);
           if (_ids) {
             this.defaultActive = _ids;
@@ -6651,7 +6722,7 @@ var log = util["a" /* default */].getParams('console');
               this.navIds = _ids2;
               this.setTitle(_ids2[0]);
             }
-          } else if (sessionStorage.getItem('jump') && this.history) {
+          } else if (sessionStorage.getItem('jump') && this.isHistory) {
             var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
             if (_ids3) {
               this.defaultActive = _ids3;
@@ -6726,18 +6797,28 @@ var log = util["a" /* default */].getParams('console');
           this.results[i] = results[i].split(',');
         }
         if (i === 'indexUrl' && this.loadHomePage) {
-          this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
-          if (this.isHomePage && this.homePage) {
-            if (this.menus && this.menus.length) {
-              var ids = null;
-              this.homePage && (ids = this.getId(this.menus, this.homePage));
-              if (ids) {
-                this.defaultActive = ids;
-              } else if (this.homePage) {
-                this.handleJump(this.homePage);
+          var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
+          var hash = util["a" /* default */].win.location.hash;
+          if (hash) {
+            hash = hash.split('?')[0];
+          }
+          var jump = sessionStorage.getItem('jump');
+          if (!applicationid && (!jump || !this.isHistory) && hash === '#/' && hash === '#/main') {
+            this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
+            if (this.isHomePage && this.homePage) {
+              if (this.menus && this.menus.length) {
+                var ids = null;
+                this.homePage && (ids = this.getId(this.menus, this.homePage));
+                if (ids) {
+                  this.defaultActive = ids;
+                } else if (this.homePage) {
+                  this.handleJump(this.homePage);
+                }
+                this.setMenu(this.menus);
               }
-              this.setMenu(this.menus);
             }
+          } else if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
           }
         }
         if (i === 'doorIndex' && results[i]) {
@@ -6822,22 +6903,26 @@ var log = util["a" /* default */].getParams('console');
         }
       });
     },
-    jumpMenu: function jumpMenu(res, flag) {
+    jumpMenu: function jumpMenu(res, flag, param) {
+      var option = { url: res, flag: flag, param: param };
+      if (util["a" /* default */].isObject(res)) {
+        option = _extends({}, option, res);
+      }
       var ids = void 0;
-      if (typeof res === 'string') {
-        if (flag) {
-          ids = this.getId(this.menus, res, true);
+      if (typeof option.url === 'string') {
+        if (option.flag) {
+          ids = this.getId(this.menus, option.url, true);
           if (!ids) {
             this.$message.error('未在菜单栏中找到此地址');
             return;
           }
         } else {
-          ids = res.split(',');
+          ids = option.url.split(',');
         }
       } else {
-        ids = res;
+        ids = option.url;
       }
-      this.setDefault(this.menus, ids);
+      this.setDefault(this.menus, ids, option.param);
     },
     getId: function getId(arry, res, path) {
       if (!res) {
@@ -6899,7 +6984,7 @@ var log = util["a" /* default */].getParams('console');
               if (ids) {
                 _this6.defaultActive = ids;
               }
-            } else if (sessionStorage.getItem('jump') && _this6.history) {
+            } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
               var _ids4 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
               if (_ids4) {
                 _this6.defaultActive = _ids4;
@@ -6918,7 +7003,7 @@ var log = util["a" /* default */].getParams('console');
                   _this6.navIds = _ids5;
                   _this6.setTitle(_ids5[0]);
                 }
-              } else if (sessionStorage.getItem('jump') && _this6.history) {
+              } else if (sessionStorage.getItem('jump') && _this6.isHistory) {
                 var _ids6 = _this6.getId(_this6.menus, sessionStorage.getItem('jump'), true);
                 if (_ids6) {
                   _this6.defaultActive = _ids6;
@@ -7068,7 +7153,7 @@ var log = util["a" /* default */].getParams('console');
           _this7.setTips(item);
         });
       } else {
-        if (Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
+        if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
           this.$set(obj, 'tips', false);
           delete obj.tips;
         }
@@ -7104,12 +7189,12 @@ var log = util["a" /* default */].getParams('console');
     },
 
     //设置默认导航页面
-    setDefault: function setDefault(res, active) {
+    setDefault: function setDefault(res, active, param) {
       this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
-      this.getUrl(res, active);
+      this.getUrl(res, active, param);
       if (this.layout === 'subsystem' || this.layout === 'subSystem' || this.layout === 'topnav' || this.layout === 'topNav' || this.layout === 'topside' || this.layout === 'topSide') {
         if (this.layout === 'subsystem' || this.layout === 'subSystem') {
           this.navs = [];
@@ -7158,18 +7243,18 @@ var log = util["a" /* default */].getParams('console');
     },
 
     //获取页面类型及地址
-    getUrl: function getUrl(res, active, index) {
+    getUrl: function getUrl(res, active, index, param) {
       index = index === undefined ? 0 : index;
       for (var i = 0; i < res.length; i++) {
         var item = res[i];
         if (item.id === active[index]) {
           if (index === active.length - 1) {
-            this.handleJump(item.url, item.urlopenmode, item);
+            this.handleJump(item.url, item.urlopenmode, item, param);
             return item.url;
           } else {
             if (item.children && item.children.length) {
               index++;
-              var _url4 = this.getUrl(item.children, active, index);
+              var _url4 = this.getUrl(item.children, active, index, param);
               if (_url4 && index === active.length - 1) {
                 this.tabs = '';
               }
@@ -7177,7 +7262,7 @@ var log = util["a" /* default */].getParams('console');
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url5 = this.getUrl(item.fourthTabs, active, index);
+              var _url5 = this.getUrl(item.fourthTabs, active, index, param);
               if (_url5) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
@@ -7185,7 +7270,7 @@ var log = util["a" /* default */].getParams('console');
             }
           }
         } else if (item.children && item.children.length) {
-          this.getUrl(item.children, active, index);
+          this.getUrl(item.children, active, index, param);
         }
       }
       return false;
@@ -7366,7 +7451,7 @@ var log = util["a" /* default */].getParams('console');
         if (res.path !== '/' && pathname == _path) {
           return pathname;
         }
-        if (Object.prototype.hasOwnProperty.call(res, 'children')) {
+        if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           var _path2 = this.hasRouter(res.children, url);
           if (_path2) {
             return _path2;
@@ -7441,9 +7526,10 @@ var log = util["a" /* default */].getParams('console');
     },
 
     //跳转页面
-    handleJump: function handleJump(page, type, res) {
+    handleJump: function handleJump(page, type, res, param) {
       var _this10 = this;
 
+      console.log(page);
       var prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -7464,7 +7550,7 @@ var log = util["a" /* default */].getParams('console');
       } else if (type == 3) {
         this.method = 'iframe';
         this.refresh = false;
-        this.page = util["a" /* default */].handlerUrl(page);
+        this.page = util["a" /* default */].handlerUrl(page, param);
       } else if (page) {
         var urls = page.split('?');
         if (urls[0].indexOf('.js') > 1) {
@@ -7477,12 +7563,12 @@ var log = util["a" /* default */].getParams('console');
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
           this.refresh = false;
-          this.page = util["a" /* default */].handlerUrl(page);
+          this.page = util["a" /* default */].handlerUrl(page, param);
         } else {
           if (urls[0].indexOf('.html') === -1 && urls[0].indexOf('#/') === -1) {
             this.method = 'iframe';
             this.refresh = false;
-            this.page = util["a" /* default */].handlerUrl(page);
+            this.page = util["a" /* default */].handlerUrl(page, param);
           } else {
             this.method = 'router';
             var routes = this.$router.options.routes;
@@ -7490,6 +7576,9 @@ var log = util["a" /* default */].getParams('console');
               var path = this.hasRouter(routes, urls[0]);
               if (path) {
                 var params = util["a" /* default */].getParams({ url: page });
+                if (param) {
+                  params = _extends({}, params, param);
+                }
                 if (res) {
                   this.routerKey = res.id;
                   if (Object.prototype.hasOwnProperty.call(res, 'keepAlive')) {
@@ -7511,7 +7600,7 @@ var log = util["a" /* default */].getParams('console');
                 if (this.loadWujie === false || this.downgrade && isIE || urlopenmode == 3) {
                   this.method = 'iframe';
                   this.refresh = false;
-                  this.page = util["a" /* default */].handlerUrl(page);
+                  this.page = util["a" /* default */].handlerUrl(page, param);
                 } else {
                   this.method = 'wujie';
                   this.wjName = res && res.appCode ? res.appCode : 'application';
@@ -7657,52 +7746,44 @@ var log = util["a" /* default */].getParams('console');
 
     //开启weosocket
     initWebSocket: function initWebSocket() {
-      //初始化weosocket
-      if (!this.websocket) {
-        var _url6 = (util["a" /* default */].getStorage('wshost') || '') + api["Zb" /* wss */];
-        this.websocket = new external_sockjs_client_default.a(_url6);
-      }
-      this.client = external_stompjs_default.a.over(this.websocket);
-      if (!this.isConsole && this.client) {
-        this.client.debug = null;
-      }
-      this.handleConnect(this.client);
-    },
-    handleConnect: function handleConnect(client) {
       var _this12 = this;
 
-      client.connect({}, function () {
-        //localStorage.setItem("socket",true);
-        //订阅服务端的
-        client.subscribe(api["Qb" /* topic */], function (response) {
-          var res = JSON.parse(response.body);
-          var data = res.data;
-          for (var i in data) {
-            if (data[i] !== null && data[i] !== undefined) {
-              if (i === 'onlineUserNums' && data[i] > 0) {
-                _this12.online = data[i];
-              }
-              if (i === 'sysMsgNums') {
-                _this12.notice = data[i];
-                if (_this12.showMsg) {
-                  _this12.$refs.message.getMsg(true);
-                }
-              }
-              if (i === 'menuTipsMap') {
-                _this12.menuTips = data[i];
-              }
-              if (i === 'sysMsgList') {
-                _this12.sysMsg = data[i];
-              }
-              if (i === 'extraData') {
-                _this12.extraData = data[i];
+      util["a" /* default */].socket().then(function (res, close) {
+        _this12.close = close;
+        var data = res.data;
+        for (var i in data) {
+          if (data[i] !== null && data[i] !== undefined) {
+            if (i === 'onlineUserNums' && data[i] > 0) {
+              _this12.online = data[i];
+            }
+            if (i === 'sysMsgNums') {
+              _this12.notice = data[i];
+              if (_this12.showMsg) {
+                _this12.$refs.message.getMsg(true);
               }
             }
+            if (i === 'menuTipsMap') {
+              _this12.menuTips = data[i];
+            }
+            if (i === 'sysMsgList') {
+              _this12.sysMsg = data[i];
+            }
+            if (i === 'extraData') {
+              _this12.extraData = data[i];
+            }
           }
-        });
-      }, function (error) {
-        console.log('webSocket连接失败');
-        client.disconnect();
+        }
+        if (_this12.$store) {
+          _this12.$store.commit('websocket', data);
+        }
+        if (_this12.$eventBus) {
+          _this12.$eventBus.$emit('websocket', data);
+        }
+        if (util["a" /* default */].win.eventBus) {
+          util["a" /* default */].win.eventBus.$emit('websocket', data);
+        }
+      }).catch(function (err) {
+        console.log(err);
       });
     },
     handleOpened: function handleOpened(res) {
@@ -7822,8 +7903,8 @@ var log = util["a" /* default */].getParams('console');
   },
   beforeDestroy: function beforeDestroy() {
     this.timer = null;
-    if (this.client && this.client.connected) {
-      this.client.disconnect();
+    if (this.close) {
+      this.close();
     }
   }
 });