eoss-ui 0.5.73 → 0.5.74

package/packages/theme-chalk/lib/nav.css

@@ -1 +1 @@
-@charset "UTF-8";.es-nav,.es-nav .es-nav-main{display:inline-block;overflow:hidden}.es-nav{transition:all .2s;-webkit-transition:all .2s}.es-nav .el-menu,.es-nav .es-menu{background-color:transparent}.es-nav .es-nav-main{position:relative;height:100%;background-color:#002766}.es-nav .es-nav-main:not(.es-nav-overlap){border-right:1px solid #d9d9d9}.es-nav .es-nav-main .es-nav-title{width:100%;height:45px;font-size:15px;line-height:30px;text-align:center;overflow:hidden;padding:7px 32px 7px 0;background-color:#096dd9;color:#fff;position:relative;z-index:1;-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.2);box-shadow:0 4px 10px 0 rgba(0,0,0,.2)}.es-nav .es-nav-main .es-nav-title .es-collapse-handle{font-size:20px;cursor:pointer;position:absolute;right:12px;top:50%;margin-top:-10px;color:#fff}.es-nav .es-nav-main .es-nav-title .es-collapse-handle.es-icon-zengjiasuojinliang{right:50%;margin-right:-10px}.es-nav .es-nav-main .es-nav-title .el-tooltip{text-align:center;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;position:relative;padding:0 4px}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter{padding-right:10px;cursor:pointer}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter .el-icon--right{position:absolute;right:6px;top:50%;margin-top:-4px}.es-nav .es-nav-initial{width:70px;-webkit-box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);position:relative;z-index:2;height:100%;background:#003a8c}.es-nav .es-nav-initial .el-menu-item,.es-nav .es-nav-initial .es-menu-vertical{height:auto}.es-nav .es-nav-initial .el-menu-item.is-active,.es-nav .es-nav-initial .es-menu-vertical.is-active{background:#096dd9}.es-nav .es-nav-initial .es-nav-overlap .es-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-nav .es-nav-initial .es-nav-overlap .es-menu .es-menu-item{width:90px;height:90px;margin-bottom:20px}.es-nav .es-nav-initial .es-nav-overlap .es-menu .es-menu-item:nth-child(2n){margin-left:20px}.es-nav.es-nav-biserial{position:relative}.es-nav.es-nav-biserial .es-nav-main{position:absolute;top:0;bottom:0}.es-nav.es-nav-biserial .es-menu-title-vertical{margin-right:0}.es-nav .es-sets-button{position:fixed;top:100px;left:0;z-index:2;border-radius:50%;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12)}.es-nav .es-sets-button .el-button{font-size:22px;padding:8px;cursor:move}
+@charset "UTF-8";.es-nav,.es-nav .es-nav-main{display:inline-block;overflow:hidden}.es-nav{transition:all .2s;-webkit-transition:all .2s}.es-nav .el-menu,.es-nav .es-menu{background-color:transparent}.es-nav .es-nav-main{position:relative;height:100%;background-color:#003a8c}.es-nav .es-nav-main[biserial=true]{background-color:#002766}.es-nav .es-nav-main:not(.es-nav-overlap){border-right:1px solid #d9d9d9}.es-nav .es-nav-main .es-nav-title{width:100%;height:45px;font-size:15px;line-height:30px;text-align:center;overflow:hidden;padding:7px 32px 7px 0;background-color:#096dd9;color:#fff;position:relative;z-index:1;-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.2);box-shadow:0 4px 10px 0 rgba(0,0,0,.2)}.es-nav .es-nav-main .es-nav-title .es-collapse-handle{font-size:20px;cursor:pointer;position:absolute;right:12px;top:50%;margin-top:-10px;color:#fff}.es-nav .es-nav-main .es-nav-title .es-collapse-handle.es-icon-zengjiasuojinliang{right:50%;margin-right:-10px}.es-nav .es-nav-main .es-nav-title .el-tooltip{text-align:center;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;position:relative;padding:0 4px}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter{padding-right:10px;cursor:pointer}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter .el-icon--right{position:absolute;right:6px;top:50%;margin-top:-4px}.es-nav .es-nav-initial{width:70px;-webkit-box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);position:relative;z-index:2;height:100%;background:#003a8c}.es-nav .es-nav-initial .el-menu-item,.es-nav .es-nav-initial .es-menu-vertical{height:auto}.es-nav .es-nav-initial .el-menu-item.is-active,.es-nav .es-nav-initial .es-menu-vertical.is-active{background:#096dd9}.es-nav .es-nav-initial .es-nav-overlap .es-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-nav .es-nav-initial .es-nav-overlap .es-menu .es-menu-item{width:90px;height:90px;margin-bottom:20px}.es-nav .es-nav-initial .es-nav-overlap .es-menu .es-menu-item:nth-child(2n){margin-left:20px}.es-nav.es-nav-biserial{position:relative}.es-nav.es-nav-biserial .es-nav-main{position:absolute;top:0;bottom:0}.es-nav.es-nav-biserial .es-menu-title-vertical{margin-right:0}.es-nav .es-sets-button{position:fixed;top:100px;left:0;z-index:2;border-radius:50%;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12)}.es-nav .es-sets-button .el-button{font-size:22px;padding:8px;cursor:move}

package/packages/theme-chalk/src/nav.scss

@@ -13,7 +13,10 @@
     overflow: hidden;
     display: inline-block;
     height: 100%;
-    background-color: $--color-primary-light-10;
+    background-color: $--color-primary-light-9;
+    &[biserial='true'] {
+      background-color: $--color-primary-light-10;
+    }
     &:not(.es-nav-overlap) {
       border-right: $--border-base;
     }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.73',
+  version: '0.5.74',
   install,
   Button,
   ButtonGroup,

package/src/utils/webSocket.js

@@ -15,21 +15,20 @@ class WebSocket {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
   connect() {
     if (!this.client) {
     // 连接SockJS
-      let socket = new SockJS(this.host + this.url);
-      // 获取STOMP子协议的客户端对象
-      this.client = Stomp.over(socket);
-
+      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
+      this.client = Stomp.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = () => {};
     }
 
@@ -41,9 +40,10 @@ class WebSocket {
       // 订阅消息
       this.subscribe();
     }, (error) => {
+      this.unsubscribe();
+      this.client = null;
       let 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(() => {
@@ -52,11 +52,17 @@ class WebSocket {
         }, 5000);
       }
     });
+  }// 清除订阅
+  unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   }
   /** 订阅服务端 */
   subscribe() {
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, (response) => {
+    this.subscription = this.client.subscribe(this.take, (response) => {
       if (response && (this.callback || this.success)) {
         let callback = this.callback || this.success;
         callback(JSON.parse(response.body));
@@ -89,6 +95,7 @@ class WebSocket {
   /** 销毁 */
   destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };