eoss-ui 0.5.73 → 0.5.75

package/lib/wxlogin.js

@@ -621,6 +621,35 @@ var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
   return workdays;
 };
 
+/**
+ * chunkToChinese
+ * @desc 将四位数的整数转换为中文大写
+ * @param {number} chunk - 数字
+ **/
+function chunkToChinese(chunk) {
+  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+  var capitalDigits = ['', '拾', '佰', '仟'];
+
+  var result = '';
+  var digitIndex = 0;
+
+  while (chunk > 0) {
+    var digit = chunk % 10;
+    if (digit > 0) {
+      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+    } else {
+      // 当前数字是零，需要判断是否需要添加零
+      if (result.charAt(0) !== '零') {
+        result = '零' + result;
+      }
+    }
+    chunk = Math.floor(chunk / 10);
+    digitIndex++;
+  }
+
+  return result;
+}
+
 /**
  * concatenate
  * @desc 指定连接符合并文本
@@ -1816,6 +1845,31 @@ var getWeekday = function getWeekday(date) {
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
 
+/**
+ * getZoom
+ * @desc 获取缩放比
+ * @param {number} n - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
+ **/
+var getZoom = function getZoom() {
+  var ratio = 0;
+  var screen = window.screen;
+  var ua = navigator.userAgent.toLowerCase();
+  if (window.devicePixelRatio !== undefined) {
+    ratio = window.devicePixelRatio;
+  } else if (~ua.indexOf('msie')) {
+    if (screen.deviceXDPI && screen.logicalXDPI) {
+      ratio = screen.deviceXDPI / screen.logicalXDPI;
+    }
+  } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+    ratio = window.outerWidth / window.innerWidth;
+  }
+
+  if (ratio) {
+    ratio = Math.round(ratio * 100);
+  }
+
+  return ratio / 100;
+};
 /**
  * handlerUrl
  * @desc:更新url参数中的时间戳
@@ -2558,32 +2612,53 @@ var rmbToCapital = function rmbToCapital(number) {
 
   return result;
 };
+/**
+ * setScale
+ * @desc 设置缩放
+ * @param {number} width - 分辨率宽度
+ * @param {number} height - 分辨率高度
+ **/
+var setScale = function setScale() {
+  var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1920;
+  var height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1080;
 
-// 辅助函数，将四位数的整数转换为中文大写
-function chunkToChinese(chunk) {
-  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-  var capitalDigits = ['', '拾', '佰', '仟'];
-
-  var result = '';
-  var digitIndex = 0;
-
-  while (chunk > 0) {
-    var digit = chunk % 10;
-    if (digit > 0) {
-      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+  var n = 1;
+  var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+  var zoom = getZoom();
+  if (isMac) {
+    n = 2;
+  } else {
+    n = 1;
+  }
+  if (zoom === 1) {
+    document.body.style.removeProperty('transform');
+    document.body.style.removeProperty('width');
+    document.body.style.removeProperty('height');
+    document.body.style.removeProperty('transform-origin');
+    return;
+  }
+  if (Math.abs(parseInt(width - window.innerWidth * zoom / n, 10)) > 15 && window.innerWidth * zoom / n !== width) {
+    var scale = 'scale(' + window.innerWidth * zoom / width / zoom + ',' + window.innerHeight * zoom / height / zoom + ')';
+    document.body.style.transform = scale;
+    document.body.style.width = width + 'px';
+    document.body.style.height = height + 'px';
+    document.body.style.transformOrigin = '0 0';
+  } else {
+    if (isMac) {
+      var _scale = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     } else {
-      // 当前数字是零，需要判断是否需要添加零
-      if (result.charAt(0) !== '零') {
-        result = '零' + result;
-      }
+      var _scale2 = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale2;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     }
-    chunk = Math.floor(chunk / 10);
-    digitIndex++;
   }
-
-  return result;
-}
-
+};
 /**
  * sendMessage
  * @desc:向iframe发送信息
@@ -3119,6 +3194,7 @@ var watermark = function watermark(option) {
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
   setFavicon: setFavicon,
+  setScale: setScale,
   setStorage: setStorage,
   socket: socket,
   startWith: startWith,
@@ -3658,6 +3734,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3668,14 +3746,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 +3763,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 +3775,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3706,7 +3791,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 +3832,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.73",
+  "version": "0.5.75",
   "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.99",
+    "eoss-element": "^0.2.100",
     "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

@@ -476,6 +476,7 @@ export default {
     theads: {
       get() {
         let thead = [];
+        let addfilter = false;
         let types = this.theadData
           .filter((item) => {
             return (
@@ -488,6 +489,7 @@ export default {
             return item.type;
           });
         if (this.dragSort && !types.includes('sort')) {
+          addfilter = true;
           thead.push({
             type: 'sort',
             key: 'es-sort'
@@ -501,8 +503,12 @@ export default {
             fixed: 'left',
             selectable: this.selectable,
             reserveSelection: this.reserveSelection,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-checkbox'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.numbers && !types.includes('index')) {
           let index = 1;
@@ -521,9 +527,12 @@ export default {
             align: 'center',
             fixed: 'left',
             index: index,
-            filterIcon: this.filter ? 'es-icon-biao' : undefined,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-index'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.theadData.length) {
           thead = [...thead, ...this.theadData];

package/packages/input/src/main.vue

@@ -264,26 +264,27 @@ export default {
           );
         }
       }
+      let { prefix, suffix, prepend, append, ...attrs } = this.$attrs;
       if (this.$slots.prefix) {
         doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));
-      } else if (this.$attrs.prefix) {
+      } else if (prefix) {
         this.renderd(doms, h, 'prefix');
         cls.push('es-input-button-prefix');
       }
       if (this.$slots.suffix) {
         doms.push(h('template', { slot: 'suffix' }, this.$slots.suffix));
-      } else if (this.$attrs.suffix) {
+      } else if (suffix) {
         this.renderd(doms, h, 'suffix');
         cls.push('es-input-button-suffix');
       }
       if (this.$slots.prepend) {
         doms.push(h('template', { slot: 'prepend' }, this.$slots.prepend));
-      } else if (this.$attrs.prepend) {
+      } else if (prepend) {
         this.renderd(doms, h, 'prepend');
       }
       if (this.$slots.append) {
         doms.push(h('template', { slot: 'append' }, this.$slots.append));
-      } else if (this.$attrs.append) {
+      } else if (append) {
         this.renderd(doms, h, 'append');
       }
       if (this.fetchSuggestions || this.url || this.data.length > 0) {
@@ -295,7 +296,7 @@ export default {
               rules: this.rule
             },
             attrs: {
-              ...this.$attrs,
+              ...attrs,
               fetchSuggestions: this.fetchSuggestions
                 ? this.fetchSuggestions
                 : this.getData,
@@ -323,7 +324,7 @@ export default {
           domProps: {
             value: this.model
           },
-          attrs: { ...this.$attrs },
+          attrs: { ...attrs },
           on: { ...this.$listeners },
           directives: [
             {

package/packages/login/src/main.vue

@@ -350,6 +350,7 @@
   </div>
 </template>
 <script>
+import { debounce } from 'throttle-debounce';
 import resetPassword from './resetPassword.vue';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -566,6 +567,10 @@ export default {
     scanIntervalTime: {
       type: Number,
       default: 1500
+    },
+    isScale: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -768,6 +773,9 @@ export default {
     };
   },
   beforeCreate() {
+    this.setScale = debounce(300, () => {
+      util.setScale();
+    });
     util.removeStorage([
       'remind',
       'ssId',
@@ -780,6 +788,10 @@ export default {
     ]);
   },
   created() {
+    if (this.isScale) {
+      util.setScale();
+      window.addEventListener('resize', this.setScale);
+    }
     this.code = util.getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -1558,6 +1570,7 @@ export default {
     }
   },
   beforeDestroy() {
+    window.removeEventListener('resize', this.setScale);
     document.removeEventListener('keyup', this.doLogin);
     document.removeEventListener('keydown', this.forbiddenTab);
   }

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

@@ -119,6 +119,7 @@
         />
         <es-nav
           v-if="showMenu && showDefault"
+          :hide-sub-menu="hideSubMenu"
           :is-top="layout == 'topside'"
           :overlap="layout == 'side'"
           :data="menu"
@@ -252,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>
@@ -437,6 +447,10 @@ export default {
     showCollapse: {
       type: Boolean,
       default: true
+    },
+    onlineView: {
+      type: [String, Boolean],
+      default: true
     }
   },
   computed: {
@@ -580,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: {
@@ -697,7 +719,9 @@ export default {
       timer: null,
       pid: null,
       showPage: false,
-      webSocket: null
+      webSocket: null,
+      dialog: {},
+      hideSubMenu: false
     };
   },
   created() {
@@ -1062,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);
@@ -1611,6 +1641,7 @@ export default {
           }
           break;
         case 'sub':
+          this.hideSubMenu = false;
           this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
@@ -1734,6 +1765,7 @@ export default {
     handleTrigger(res) {},
     //头部工具交互事件
     handleClick(res) {
+      console.log(res);
       const { type } = res;
       switch (type) {
         //刷新
@@ -1758,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/nav/src/main.vue

@@ -39,9 +39,9 @@
       :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" ref="navTitle">
         <span v-show="!isCollapse">{{ headline }}</span>
@@ -91,6 +91,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util';
+import { debounce } from 'throttle-debounce';
 export default {
   name: 'EsNav',
   inheritAttrs: false,
@@ -131,7 +132,9 @@ export default {
       type: Boolean,
       default: true
     },
-    overlap: Boolean
+    overlap: Boolean,
+    //隐藏菜单
+    hideSubMenu: Boolean
   },
   computed: {
     show() {
@@ -178,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;
     },
@@ -197,10 +204,13 @@ export default {
         this.headline = val;
       }
     },
+    boxWidth() {
+      this.getHeight();
+    },
     biserial: {
       handler(val) {
         this.isShow = !val;
-        this.resetHeight();
+        this.getHeight();
       }
     },
     defaultActive: {
@@ -251,8 +261,10 @@ export default {
         this.subMenu = [];
       }
     },
-    showMenu() {
-      this.resetHeight();
+    showMenu(val) {
+      if (val) {
+        this.getHeight();
+      }
     }
   },
   data() {
@@ -267,8 +279,13 @@ export default {
       subMenu: []
     };
   },
+  beforeCreate() {
+    this.getHeight = debounce(500, () => {
+      this.resetHeight();
+    });
+  },
   mounted() {
-    this.resetHeight();
+    this.getHeight();
     this.move();
   },
   methods: {

package/packages/select/src/main.vue

@@ -673,26 +673,27 @@ export default {
           });
         }
       }
+      let { prefix, suffix, prepend, append, ...attrs } = this.$attrs;
       if (this.$slots.prefix) {
         doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));
-      } else if (this.$attrs.prefix) {
+      } else if (prefix) {
         this.renderd(doms, h, 'prefix');
         cls.push('es-select-button-prefix');
       }
       if (this.$slots.suffix) {
         doms.push(h('template', { slot: 'suffix' }, this.$slots.suffix));
-      } else if (this.$attrs.suffix) {
+      } else if (suffix) {
         this.renderd(doms, h, 'suffix');
         cls.push('es-select-button-suffix');
       }
       if (this.$slots.prepend) {
         doms.push(h('template', { slot: 'prepend' }, this.$slots.prepend));
-      } else if (this.$attrs.prepend) {
+      } else if (prepend) {
         this.renderd(doms, h, 'prepend');
       }
       if (this.$slots.append) {
         doms.push(h('template', { slot: 'append' }, this.$slots.append));
-      } else if (this.$attrs.append) {
+      } else if (append) {
         this.renderd(doms, h, 'append');
       }
       if (!this.models && this.results.length && this.defaultValue) {
@@ -717,7 +718,7 @@ export default {
             }
           ],
           props: {
-            ...this.$attrs,
+            ...attrs,
             multiple: this.multiple,
             valueType: this.valueType,
             valueKey: this.valKey,