eoss-ui 0.5.72 → 0.5.74

package/lib/button-group.js

@@ -4196,6 +4196,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -4206,14 +4208,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 () {};
     }
 
@@ -4225,9 +4225,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 () {
@@ -4236,6 +4237,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -4244,7 +4253,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));
@@ -4285,6 +4294,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };

package/lib/button.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/checkbox-group.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();
     };

package/lib/clients.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // 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/clients/src/main.vue?vue&type=template&id=2f0c03c7&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=template&id=12fa73ca&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -208,11 +208,18 @@ var render = function () {
     _vm.logo
       ? _c("img", { staticClass: "es-clients-logo", attrs: { src: _vm.logo } })
       : _vm._e(),
-    _c("div", { staticClass: "es-clients-title" }, [
-      _vm._v(
-        "\n    请通过手机浏览器（iOS11版本以上的苹果手机使用照相功能）扫码下载安装\n  "
-      ),
-    ]),
+    _c(
+      "div",
+      { staticClass: "es-clients-title" },
+      [
+        _vm._v("\n    请通过手机浏览器\n    "),
+        _vm.ios
+          ? [_vm._v(" （iOS11版本以上的苹果手机使用照相功能） ")]
+          : _vm._e(),
+        _vm._v("\n    扫码下载安装\n  "),
+      ],
+      2
+    ),
     _c("ul", { staticClass: "es-clients-list" }, [
       _vm.ios
         ? _c(
@@ -325,7 +332,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/clients/src/main.vue?vue&type=template&id=2f0c03c7&
+// CONCATENATED MODULE: ./packages/clients/src/main.vue?vue&type=template&id=12fa73ca&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/clients/src/main.vue?vue&type=script&lang=js&
 var _props;
@@ -373,6 +380,8 @@ var _props;
 //
 //
 //
+//
+//
 
 //import util from 'eoss-ui/src/utils/util';
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({

package/lib/data-table-form.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();
     };

package/lib/data-table.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();
     };
@@ -3816,8 +3826,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=f4b01d22&
-var mainvue_type_template_id_f4b01d22_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
+var mainvue_type_template_id_7b641b60_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4128,10 +4138,10 @@ var mainvue_type_template_id_f4b01d22_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_f4b01d22_render._withStripped = true
+mainvue_type_template_id_7b641b60_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=f4b01d22&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6633,8 +6643,8 @@ var mainvue_type_script_lang_js_components, _watch;
         if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 2) {
-          this.config.totalCount = this.data.length - this.lose;
+        this.config.totalCount = this.data.length - this.lose;
+        if (this.page && this.data.length > this.config.pageSize) {
           return this.data.filter(function (item, index) {
             return index > (_this.config.pageNum - 1) * _this.config.pageSize - 1 && index < _this.config.pageNum * _this.config.pageSize;
           });
@@ -6699,6 +6709,14 @@ var mainvue_type_script_lang_js_components, _watch;
       this.resetHeight();
       this.doLayout();
     },
+
+    // data: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler(val) {
+    //     this.config.totalCount = val.length - this.lose;
+    //   }
+    // },
     page: function page() {
       this.resetHeight();
       this.doLayout();
@@ -7571,7 +7589,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_f4b01d22_render,
+  mainvue_type_template_id_7b641b60_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.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/dialog.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();
     };