eoss-ui 0.5.72 → 0.5.74

package/lib/input-number.js

@@ -3658,6 +3658,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3668,14 +3670,12 @@ var WebSocket = function () {
 
     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);
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = function () {};
     }
 
@@ -3687,9 +3687,10 @@ var WebSocket = function () {
       // 订阅消息
       _this.subscribe();
     }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
       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 () {
@@ -3698,6 +3699,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3706,7 +3715,7 @@ var WebSocket = function () {
     var _this2 = this;
 
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, function (response) {
+    this.subscription = this.client.subscribe(this.take, function (response) {
       if (response && (_this2.callback || _this2.success)) {
         var callback = _this2.callback || _this2.success;
         callback(JSON.parse(response.body));
@@ -3747,6 +3756,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };

package/lib/input.js

@@ -3690,6 +3690,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3700,14 +3702,12 @@ var WebSocket = function () {
 
     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);
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = function () {};
     }
 
@@ -3719,9 +3719,10 @@ var WebSocket = function () {
       // 订阅消息
       _this.subscribe();
     }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
       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 () {
@@ -3730,6 +3731,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3738,7 +3747,7 @@ var WebSocket = function () {
     var _this2 = this;
 
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, function (response) {
+    this.subscription = this.client.subscribe(this.take, function (response) {
       if (response && (_this2.callback || _this2.success)) {
         var callback = _this2.callback || _this2.success;
         callback(JSON.parse(response.body));
@@ -3779,6 +3788,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };

package/lib/login.js

@@ -3643,6 +3643,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3653,14 +3655,12 @@ var WebSocket = function () {
 
     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);
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = function () {};
     }
 
@@ -3672,9 +3672,10 @@ var WebSocket = function () {
       // 订阅消息
       _this.subscribe();
     }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
       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 () {
@@ -3683,6 +3684,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3691,7 +3700,7 @@ var WebSocket = function () {
     var _this2 = this;
 
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, function (response) {
+    this.subscription = this.client.subscribe(this.take, function (response) {
       if (response && (_this2.callback || _this2.success)) {
         var callback = _this2.callback || _this2.success;
         callback(JSON.parse(response.body));
@@ -3732,6 +3741,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };
@@ -4780,8 +4790,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=249fae96&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
-var resetPasswordvue_type_template_id_28f463b9_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=579bc87d&
+var resetPasswordvue_type_template_id_579bc87d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4841,11 +4851,11 @@ var resetPasswordvue_type_template_id_28f463b9_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_28f463b9_staticRenderFns = []
-resetPasswordvue_type_template_id_28f463b9_render._withStripped = true
+var resetPasswordvue_type_template_id_579bc87d_staticRenderFns = []
+resetPasswordvue_type_template_id_579bc87d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=579bc87d&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5098,7 +5108,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
               trigger: 'blur'
             } : {}, {
               required: true,
-              message: '请输入新密码',
+              message: '请确认新密码',
               trigger: 'blur'
             }, { validator: this.reregExpValidate, trigger: 'blur' }]
           }, {
@@ -5337,8 +5347,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_28f463b9_render,
-  resetPasswordvue_type_template_id_28f463b9_staticRenderFns,
+  resetPasswordvue_type_template_id_579bc87d_render,
+  resetPasswordvue_type_template_id_579bc87d_staticRenderFns,
   false,
   null,
   null,

package/lib/main.js

@@ -3643,6 +3643,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3653,14 +3655,12 @@ var WebSocket = function () {
 
     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);
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = function () {};
     }
 
@@ -3672,9 +3672,10 @@ var WebSocket = function () {
       // 订阅消息
       _this.subscribe();
     }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
       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 () {
@@ -3683,6 +3684,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3691,7 +3700,7 @@ var WebSocket = function () {
     var _this2 = this;
 
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, function (response) {
+    this.subscription = this.client.subscribe(this.take, function (response) {
       if (response && (_this2.callback || _this2.success)) {
         var callback = _this2.callback || _this2.success;
         callback(JSON.parse(response.body));
@@ -3732,6 +3741,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };
@@ -3826,7 +3836,7 @@ module.exports = require("runtime-import");
 // 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=268dce6d&
+// 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=572765ea&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3964,16 +3974,27 @@ var render = function () {
                     _vm.layout === "topside" || _vm.layout === "side"
                       ? _c(
                           "div",
-                          { staticClass: "es-main-side" },
+                          {
+                            staticClass: "es-main-side",
+                            class: {
+                              "es-main-topside": _vm.layout === "topside",
+                            },
+                          },
                           [
-                            _c("div", { staticClass: "es-main-side-logo" }, [
-                              _vm.logoUrl
-                                ? _c("img", {
-                                    staticClass: "es-main-logo",
-                                    attrs: { src: _vm.logoUrl },
-                                  })
-                                : _vm._e(),
-                            ]),
+                            _vm.layout === "topside"
+                              ? _c(
+                                  "div",
+                                  { staticClass: "es-main-side-logo" },
+                                  [
+                                    _vm.logoUrl
+                                      ? _c("img", {
+                                          staticClass: "es-main-logo",
+                                          attrs: { src: _vm.logoUrl },
+                                        })
+                                      : _vm._e(),
+                                  ]
+                                )
+                              : _vm._e(),
                             _c("es-handle-user", {
                               attrs: {
                                 data: { type: "user" },
@@ -4021,6 +4042,7 @@ var render = function () {
                     _vm.showMenu && _vm.showDefault
                       ? _c("es-nav", {
                           attrs: {
+                            "hide-sub-menu": _vm.hideSubMenu,
                             "is-top": _vm.layout == "topside",
                             overlap: _vm.layout == "side",
                             data: _vm.menu,
@@ -4032,7 +4054,9 @@ var render = function () {
                             "sub-icon": _vm.subIcon,
                             biserial: _vm.biserial,
                             title: _vm.showNavTitle ? _vm.title : false,
-                            showCollapse: _vm.showNavTitle,
+                            showCollapse: _vm.showNavTitle
+                              ? _vm.showCollapse
+                              : false,
                             "menu-tips": _vm.menuTips,
                             "is-default": _vm.isDefault,
                             paddingLeft: _vm.navPaddingLeft,
@@ -4261,6 +4285,33 @@ var render = function () {
         attrs: { data: _vm.sysMsg, winopen: _vm.winopen },
         on: { opened: _vm.handleOpened },
       }),
+      _c(
+        "es-dialog",
+        {
+          attrs: {
+            title: _vm.dialog.title,
+            visible: _vm.dialog.show,
+            size: "md",
+          },
+          on: {
+            "update:visible": function ($event) {
+              _vm.$set(_vm.dialog, "show", $event)
+            },
+          },
+        },
+        [
+          _vm.dialog.show
+            ? _c("iframe", {
+                attrs: {
+                  width: "100%",
+                  height: "100%",
+                  frameborder: "0",
+                  src: _vm.dialog.src,
+                },
+              })
+            : _vm._e(),
+        ]
+      ),
     ],
     1
   )
@@ -4269,7 +4320,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=268dce6d&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=572765ea&
 
 // 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=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -6414,6 +6465,17 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6585,7 +6647,15 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       type: String,
       default: '230px'
     },
-    navWidth: String
+    navWidth: String,
+    showCollapse: {
+      type: Boolean,
+      default: true
+    },
+    onlineView: {
+      type: [String, Boolean],
+      default: true
+    }
   },
   computed: {
     showHeader: function showHeader() {
@@ -6619,7 +6689,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       return this.layout === 'side' ? this.navBoxWidth : this.layout === 'subsystem' || this.layout === 'topside' ? '0' : this.navWidth;
     },
     showNavTitle: function showNavTitle() {
-      return this.layout !== 'topside' && this.layout !== 'side';
+      return this.layout !== 'topside';
     },
 
     //tabs菜单
@@ -6707,6 +6777,12 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     },
     menuCode: function menuCode() {
       return appCode || this.appCode;
+    },
+    onlineUrl: function onlineUrl() {
+      if (this.onlineView) {
+        return typeof this.onlineView == 'string' ? this.onlineView : '/main/sysuseronline/list.dhtml';
+      }
+      return false;
     }
   },
   watch: {
@@ -6824,7 +6900,9 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       timer: null,
       pid: null,
       showPage: false,
-      webSocket: null
+      webSocket: null,
+      dialog: {},
+      hideSubMenu: false
     };
   },
   created: function created() {
@@ -7172,10 +7250,16 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
      * @param {Boolean} [isUrl] - res是否是url地址
      * @param {Object} [param] - 拼接地址后的参数
      */
-    jumpMenu: function jumpMenu(res, isUrl, path) {
+    jumpMenu: function jumpMenu(res, isUrl, param, hide) {
       var _this5 = this;
 
-      var option = { url: res, isUrl: isUrl, path: path };
+      if (this.showSide === false) {
+        this.isSide = true;
+      }
+      if (hide !== undefined && hide !== null && hide !== '') {
+        this.hideSubMenu = hide;
+      }
+      var option = { url: res, isUrl: isUrl, param: param };
       if (util["a" /* default */].isObject(res)) {
         if (res.urlopenmode == 1) {
           util["a" /* default */].win.open(res.url);
@@ -7201,11 +7285,11 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
               this.method = 'router';
               var routes = this.$router.options.routes;
               if (routes) {
-                var _path = this.hasRouter(routes, option.url);
-                if (_path) {
+                var path = this.hasRouter(routes, option.url);
+                if (path) {
                   var params = util["a" /* default */].getParams({ url: option.url });
                   this.$router.push({
-                    path: _path,
+                    path: path,
                     query: params
                   });
                 } else {
@@ -7671,6 +7755,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           }
           break;
         case 'sub':
+          this.hideSubMenu = false;
           this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
@@ -7767,19 +7852,19 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           }
         }
       } else {
-        var _path2 = res.path;
-        if (_path2 !== '/' && _path2 !== '/404') {
-          _path2 = _path2.replace(_path2[1], _path2[1].toLowerCase());
+        var _path = res.path;
+        if (_path !== '/' && _path !== '/404') {
+          _path = _path.replace(_path[1], _path[1].toLowerCase());
         }
         var pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.replace(pathname[1], pathname[1].toLowerCase()).split('?')[0];
-        if (res.path !== '/' && pathname == _path2) {
+        if (res.path !== '/' && pathname == _path) {
           return pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
-          var _path3 = this.hasRouter(res.children, url);
-          if (_path3) {
-            return _path3;
+          var _path2 = this.hasRouter(res.children, url);
+          if (_path2) {
+            return _path2;
           }
         }
       }
@@ -7791,6 +7876,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     handleClick: function handleClick(res) {
       var _this8 = this;
 
+      console.log(res);
       var type = res.type;
 
       switch (type) {
@@ -7816,13 +7902,15 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         case 'user':
           this.showUserInfo = true;
           break;
-        // case 'online':
-        //   this.dialog = {
-        //     title: '查看在线人员',
-        //     show: true,
-        //     url: '/main/sysuseronline/list.dhtml'
-        //   };
-        //   break;
+        case 'online':
+          if (this.onlineUrl) {
+            this.dialog = {
+              title: '查看在线人员',
+              show: true,
+              src: this.onlineUrl
+            };
+          }
+          break;
         case 'notice':
           this.showMsg = !this.showMsg;
           break;

package/lib/menu.js

@@ -280,6 +280,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     },
     width: function width() {
       this.getMaxWidth();
+    },
+    height: function height() {
+      this.$refs.esMenu.update();
     }
   },
   data: function data() {