eoss-ui 0.5.72 → 0.5.74

package/lib/upload.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/utils/webSocket.js

@@ -29,6 +29,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -39,14 +41,12 @@ var WebSocket = function () {
 
     if (!this.client) {
       // 连接SockJS
-      var socket = new _sockjsClient2.default(this.host + this.url);
-      // 获取STOMP子协议的客户端对象
-      this.client = _stompjs2.default.over(socket);
+      this.socket = new _sockjsClient2.default(this.host + this.url, { timeout: 60000 });
+      this.client = _stompjs2.default.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = function () {};
     }
 
@@ -58,9 +58,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 () {
@@ -69,6 +70,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -77,7 +86,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));
@@ -118,6 +127,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };

package/lib/wujie.js

@@ -3893,6 +3893,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3903,14 +3905,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 () {};
     }
 
@@ -3922,9 +3922,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 () {
@@ -3933,6 +3934,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3941,7 +3950,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));
@@ -3982,6 +3991,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };

package/lib/wxlogin.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.72",
+  "version": "0.5.74",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.98",
+    "eoss-element": "^0.2.99",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/clients/src/main.vue

@@ -2,7 +2,9 @@
   <div class="es-clients">
     <img v-if="logo" class="es-clients-logo" :src="logo" />
     <div class="es-clients-title">
-      请通过手机浏览器（iOS11版本以上的苹果手机使用照相功能）扫码下载安装
+      请通过手机浏览器
+      <template v-if="ios"> （iOS11版本以上的苹果手机使用照相功能） </template>
+      扫码下载安装
     </div>
     <ul class="es-clients-list">
       <li v-if="ios" class="es-clients-item">

package/packages/data-table/src/main.vue

@@ -541,13 +541,8 @@ export default {
         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((item, index) => {
             return (
               index > (this.config.pageNum - 1) * this.config.pageSize - 1 &&
@@ -622,6 +617,13 @@ export default {
       this.resetHeight();
       this.doLayout();
     },
+    // data: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler(val) {
+    //     this.config.totalCount = val.length - this.lose;
+    //   }
+    // },
     page() {
       this.resetHeight();
       this.doLayout();

package/packages/login/src/resetPassword.vue

@@ -322,7 +322,7 @@ export default {
                   : {},
                 {
                   required: true,
-                  message: '请输入新密码',
+                  message: '请确认新密码',
                   trigger: 'blur'
                 },
                 { validator: this.reregExpValidate, trigger: 'blur' }

package/packages/main/src/main.vue

@@ -80,9 +80,10 @@
       <div class="es-main-left" v-if="layout !== 'topnav' && showSide">
         <div
           class="es-main-side"
+          :class="{ 'es-main-topside': layout === 'topside' }"
           v-if="layout === 'topside' || layout === 'side'"
         >
-          <div class="es-main-side-logo">
+          <div class="es-main-side-logo" v-if="layout === 'topside'">
             <img class="es-main-logo" :src="logoUrl" v-if="logoUrl" />
           </div>
           <es-handle-user
@@ -118,6 +119,7 @@
         />
         <es-nav
           v-if="showMenu && showDefault"
+          :hide-sub-menu="hideSubMenu"
           :is-top="layout == 'topside'"
           :overlap="layout == 'side'"
           :data="menu"
@@ -129,7 +131,7 @@
           :sub-icon="subIcon"
           :biserial="biserial"
           :title="showNavTitle ? title : false"
-          :showCollapse="showNavTitle"
+          :showCollapse="showNavTitle ? showCollapse : false"
           :menu-tips="menuTips"
           :is-default="isDefault"
           :paddingLeft="navPaddingLeft"
@@ -251,6 +253,15 @@
       </slot>
     </es-dialog>
     <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
+    <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
+      <iframe
+        v-if="dialog.show"
+        width="100%"
+        height="100%"
+        frameborder="0"
+        :src="dialog.src"
+      ></iframe>
+    </es-dialog>
   </div>
 </template>
 <script>
@@ -432,7 +443,15 @@ export default {
       type: String,
       default: '230px'
     },
-    navWidth: String
+    navWidth: String,
+    showCollapse: {
+      type: Boolean,
+      default: true
+    },
+    onlineView: {
+      type: [String, Boolean],
+      default: true
+    }
   },
   computed: {
     showHeader() {
@@ -474,7 +493,7 @@ export default {
         : this.navWidth;
     },
     showNavTitle() {
-      return this.layout !== 'topside' && this.layout !== 'side';
+      return this.layout !== 'topside';
     },
     //tabs菜单
     fourthTabs() {
@@ -575,6 +594,14 @@ export default {
     },
     menuCode() {
       return appCode || this.appCode;
+    },
+    onlineUrl() {
+      if (this.onlineView) {
+        return typeof this.onlineView == 'string'
+          ? this.onlineView
+          : '/main/sysuseronline/list.dhtml';
+      }
+      return false;
     }
   },
   watch: {
@@ -692,7 +719,9 @@ export default {
       timer: null,
       pid: null,
       showPage: false,
-      webSocket: null
+      webSocket: null,
+      dialog: {},
+      hideSubMenu: false
     };
   },
   created() {
@@ -1057,8 +1086,14 @@ export default {
      * @param {Boolean} [isUrl] - res是否是url地址
      * @param {Object} [param] - 拼接地址后的参数
      */
-    jumpMenu(res, isUrl, path) {
-      let option = { url: res, isUrl: isUrl, path: path };
+    jumpMenu(res, isUrl, param, hide) {
+      if (this.showSide === false) {
+        this.isSide = true;
+      }
+      if (hide !== undefined && hide !== null && hide !== '') {
+        this.hideSubMenu = hide;
+      }
+      let option = { url: res, isUrl: isUrl, param: param };
       if (util.isObject(res)) {
         if (res.urlopenmode == 1) {
           util.win.open(res.url);
@@ -1606,6 +1641,7 @@ export default {
           }
           break;
         case 'sub':
+          this.hideSubMenu = false;
           this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
@@ -1729,6 +1765,7 @@ export default {
     handleTrigger(res) {},
     //头部工具交互事件
     handleClick(res) {
+      console.log(res);
       const { type } = res;
       switch (type) {
         //刷新
@@ -1753,13 +1790,15 @@ export default {
         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/packages/menu/src/main.vue

@@ -67,6 +67,9 @@ export default {
     },
     width() {
       this.getMaxWidth();
+    },
+    height() {
+      this.$refs.esMenu.update();
     }
   },
   data() {

package/packages/nav/src/main.vue

@@ -39,11 +39,11 @@
       :biserial="biserial"
       :style="{
         width: biserial ? width : boxWidth,
-        left: show ? '15px' : navWidth
+        left: biserial ? (show ? '15px' : navWidth) : ''
       }"
-      v-show="biserial ? subMenu.length : menu.length"
+      v-show="showMenu"
     >
-      <div class="es-nav-title" v-if="showTitle">
+      <div class="es-nav-title" v-if="showTitle" ref="navTitle">
         <span v-show="!isCollapse">{{ headline }}</span>
         <template v-if="showCollapse">
           <i
@@ -65,6 +65,7 @@
         :collapse="isCollapse"
         :default-active="menuActive"
         :width="isTop ? boxWidth : menuWidth"
+        :height="menuHeight"
         :style="{ height: menuHeight }"
         :is-default="isDefault"
         :biserial="biserial"
@@ -90,6 +91,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util';
+import { debounce } from 'throttle-debounce';
 export default {
   name: 'EsNav',
   inheritAttrs: false,
@@ -130,12 +132,17 @@ export default {
       type: Boolean,
       default: true
     },
-    overlap: Boolean
+    overlap: Boolean,
+    //隐藏菜单
+    hideSubMenu: Boolean
   },
   computed: {
     show() {
       return this.overlap && this.subMenu.length;
     },
+    showMenu() {
+      return this.biserial ? this.subMenu.length : this.menu.length;
+    },
     menu() {
       return this.data;
     },
@@ -174,7 +181,11 @@ export default {
           return this.navWidth;
         }
       }
-      return this.subMenu && this.subMenu.length && this.isShow && !this.overlap
+      return this.subMenu &&
+        this.subMenu.length &&
+        this.isShow &&
+        !this.overlap &&
+        !this.hideSubMenu
         ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px'
         : this.navWidth;
     },
@@ -193,10 +204,13 @@ export default {
         this.headline = val;
       }
     },
+    boxWidth() {
+      this.getHeight();
+    },
     biserial: {
       handler(val) {
         this.isShow = !val;
-        this.resetHeight();
+        this.getHeight();
       }
     },
     defaultActive: {
@@ -246,6 +260,11 @@ export default {
       } else {
         this.subMenu = [];
       }
+    },
+    showMenu(val) {
+      if (val) {
+        this.getHeight();
+      }
     }
   },
   data() {
@@ -260,8 +279,13 @@ export default {
       subMenu: []
     };
   },
+  beforeCreate() {
+    this.getHeight = debounce(500, () => {
+      this.resetHeight();
+    });
+  },
   mounted() {
-    this.resetHeight();
+    this.getHeight();
     this.move();
   },
   methods: {
@@ -365,7 +389,12 @@ export default {
           height -= 15;
         }
         this.height = height + 'px';
-        this.menuHeight = this.showTitle ? height - 49 + 'px' : height + 'px';
+        if (this.showTitle) {
+          let theight = this.$refs.navTitle.offsetHeight;
+          this.menuHeight = height - theight + 'px';
+        } else {
+          this.menuHeight = height + 'px';
+        }
       });
     }
   }

package/packages/select/src/main.vue

@@ -212,6 +212,7 @@ export default {
       }
     },
     url: {
+      immediate: true,
       handler(val, old) {
         if (val && old !== val && !this.sysCode) {
           this.getData();

package/packages/selector/src/main.vue

@@ -115,7 +115,7 @@
             type="text"
             ref="reference"
             autocomplete="off"
-            clearable="clearable"
+            :clearable="clearable"
             showClearIcon
             :name="name"
             :readonly="filterable ? false : true"