eoss-ui 0.5.11 → 0.5.13

package/lib/main.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 29);
+/******/ 	return __webpack_require__(__webpack_require__.s = 30);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -97,14 +97,9 @@ 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 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; };
-
+/* harmony import */ var _webSocket__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 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; };
 
 /**
@@ -115,8 +110,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(9).sm2;
-
+var sm2 = __webpack_require__(10).sm2;
 
 
 
@@ -264,7 +258,7 @@ var ajax = function ajax(_ref) {
             clearTimeout(loginMsg);
             loginMsg = setTimeout(function () {
               sessionStorage.setItem('remind', 1);
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -311,7 +305,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -2012,7 +2006,7 @@ var isLogined = function isLogined(_ref8) {
               win.top.location.href = href;
               break;
             case 4:
-              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2032,7 +2026,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2163,7 +2157,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2531,60 +2525,13 @@ var setStorage = function setStorage(_ref14) {
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
  **/
-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);
-    });
-  });
+function socket(option, vm) {
+  var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
+  socket.init(option, vm);
+  return socket;
 }
 /**
  * sum
@@ -3492,24 +3439,156 @@ module.exports = require("json-bigint");
 
 /***/ }),
 /* 7 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      var socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      _this.subscribe();
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.client.disconnect();
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+/* 8 */
 /***/ (function(module, exports) {
 
 module.exports = require("sockjs-client");
 
 /***/ }),
-/* 8 */
+/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = require("stompjs");
 
 /***/ }),
-/* 9 */
+/* 10 */
 /***/ (function(module, exports) {
 
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 10 */
+/* 11 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3536,13 +3615,12 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 11 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 12 */,
 /* 13 */,
 /* 14 */,
 /* 15 */,
@@ -3550,13 +3628,13 @@ module.exports = require("babel-runtime/regenerator");
 /* 17 */,
 /* 18 */,
 /* 19 */,
-/* 20 */
+/* 20 */,
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("runtime-import");
 
 /***/ }),
-/* 21 */,
 /* 22 */,
 /* 23 */,
 /* 24 */,
@@ -3564,14 +3642,15 @@ module.exports = require("runtime-import");
 /* 26 */,
 /* 27 */,
 /* 28 */,
-/* 29 */
+/* 29 */,
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=e6267c3c&
+// 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=314bc538&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4001,7 +4080,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=e6267c3c&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=314bc538&
 
 // 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 () {
@@ -4030,7 +4109,7 @@ userinfovue_type_template_id_799780ee_render._withStripped = true
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(10);
+var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5647,11 +5726,11 @@ 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 "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(11);
+var regenerator_ = __webpack_require__(12);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(20);
+var external_runtime_import_ = __webpack_require__(21);
 
 // 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&
 
@@ -6335,8 +6414,6 @@ var log = util["a" /* default */].getParams('console');
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -6413,7 +6490,8 @@ var log = util["a" /* default */].getParams('console');
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created: function created() {
@@ -6606,6 +6684,9 @@ var log = util["a" /* default */].getParams('console');
       this.showSet = !this.showSet;
     },
     setConfig: function setConfig(results, flag) {
+      if (this.socket) {
+        this.initWebSocket();
+      }
       if (flag) {
         sessionStorage.setItem('mainConfig', JSON.stringify(results));
         util["a" /* default */].setStorage({
@@ -6703,9 +6784,6 @@ var log = util["a" /* default */].getParams('console');
       util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           _this3.setConfig(res.results, 1);
-          if (_this3.socket) {
-            _this3.initWebSocket();
-          }
           if (_this3.remote) {
             _this3.getMenu();
           } else {
@@ -7583,42 +7661,45 @@ var log = util["a" /* default */].getParams('console');
     initWebSocket: function initWebSocket() {
       var _this11 = this;
 
-      util["a" /* default */].socket().then(function (res, close) {
-        _this11.close = close;
-        var data = res.data;
-        for (var i in data) {
-          if (data[i] !== null && data[i] !== undefined) {
-            if (i === 'onlineUserNums' && data[i] > 0) {
-              _this11.online = data[i];
-            }
-            if (i === 'sysMsgNums') {
-              _this11.notice = data[i];
-              if (_this11.showMsg) {
-                _this11.$refs.message.getMsg(true);
+      this.webSocket = util["a" /* default */].socket({
+        url: api["Zb" /* wss */],
+        take: api["Qb" /* topic */],
+        success: function success(res) {
+          var data = res.data || {};
+          for (var i in data) {
+            if (data[i] !== null && data[i] !== undefined) {
+              if (i === 'onlineUserNums' && data[i] > 0) {
+                _this11.online = data[i];
+              }
+              if (i === 'sysMsgNums') {
+                _this11.notice = data[i];
+                if (_this11.showMsg) {
+                  _this11.$refs.message.getMsg(true);
+                }
+              }
+              if (i === 'menuTipsMap') {
+                _this11.menuTips = data[i];
+              }
+              if (i === 'sysMsgList') {
+                _this11.sysMsg = data[i];
+              }
+              if (i === 'extraData') {
+                _this11.extraData = data[i];
               }
-            }
-            if (i === 'menuTipsMap') {
-              _this11.menuTips = data[i];
-            }
-            if (i === 'sysMsgList') {
-              _this11.sysMsg = data[i];
-            }
-            if (i === 'extraData') {
-              _this11.extraData = data[i];
             }
           }
+          if (_this11.$store) {
+            try {
+              _this11.$store.commit('websocket', data);
+            } catch (error) {}
+          }
+          if (_this11.$eventBus) {
+            _this11.$eventBus.$emit('websocket', data);
+          }
+          if (util["a" /* default */].win.eventBus) {
+            util["a" /* default */].win.eventBus.$emit('websocket', data);
+          }
         }
-        if (_this11.$store) {
-          _this11.$store.commit('websocket', data);
-        }
-        if (_this11.$eventBus) {
-          _this11.$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) {
@@ -7738,8 +7819,8 @@ var log = util["a" /* default */].getParams('console');
   },
   beforeDestroy: function beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 });

package/lib/menu.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 73);
+/******/ 	return __webpack_require__(__webpack_require__.s = 74);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 73:
+/***/ 74:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";