eoss-ui 0.5.73 → 0.5.75

package/lib/eoss-ui.common.js

@@ -620,6 +620,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 指定连接符合并文本
@@ -1815,6 +1844,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参数中的时间戳
@@ -2557,32 +2611,53 @@ var rmbToCapital = function rmbToCapital(number) {
 
   return result;
 };
-
-// 辅助函数，将四位数的整数转换为中文大写
-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;
+/**
+ * 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;
+
+  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发送信息
@@ -3118,6 +3193,7 @@ var watermark = function watermark(option) {
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
   setFavicon: setFavicon,
+  setScale: setScale,
   setStorage: setStorage,
   socket: socket,
   startWith: startWith,
@@ -3563,6 +3639,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3573,14 +3651,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 () {};
     }
 
@@ -3592,9 +3668,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 () {
@@ -3603,6 +3680,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3611,7 +3696,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));
@@ -3652,6 +3737,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };
@@ -6430,8 +6516,8 @@ checkbox_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var checkbox_group = (checkbox_group_src_main);
-// 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&
-var mainvue_type_template_id_2f0c03c7_render = function () {
+// 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 mainvue_type_template_id_12fa73ca_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6439,11 +6525,18 @@ var mainvue_type_template_id_2f0c03c7_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(
@@ -6524,7 +6617,7 @@ var mainvue_type_template_id_2f0c03c7_render = function () {
     ]),
   ])
 }
-var mainvue_type_template_id_2f0c03c7_staticRenderFns = [
+var mainvue_type_template_id_12fa73ca_staticRenderFns = [
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -6553,10 +6646,10 @@ var mainvue_type_template_id_2f0c03c7_staticRenderFns = [
     ])
   },
 ]
-mainvue_type_template_id_2f0c03c7_render._withStripped = true
+mainvue_type_template_id_12fa73ca_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;
@@ -6604,6 +6697,8 @@ var _props;
 //
 //
 //
+//
+//
 
 //import util from 'eoss-ui/src/utils/util';
 /* harmony default export */ var clients_src_mainvue_type_script_lang_js_ = ({
@@ -6670,8 +6765,8 @@ var _props;
 
 var clients_src_main_component = normalizeComponent(
   packages_clients_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_2f0c03c7_render,
-  mainvue_type_template_id_2f0c03c7_staticRenderFns,
+  mainvue_type_template_id_12fa73ca_render,
+  mainvue_type_template_id_12fa73ca_staticRenderFns,
   false,
   null,
   null,
@@ -6688,8 +6783,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// 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 () {
+// 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=202d0a16&
+var mainvue_type_template_id_202d0a16_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6999,11 +7094,11 @@ var mainvue_type_template_id_7b641b60_render = function () {
     1
   )
 }
-var mainvue_type_template_id_7b641b60_staticRenderFns = []
-mainvue_type_template_id_7b641b60_render._withStripped = true
+var mainvue_type_template_id_202d0a16_staticRenderFns = []
+mainvue_type_template_id_202d0a16_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=202d0a16&
 
 // 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/children.vue?vue&type=template&id=44b7ff61&
 var childrenvue_type_template_id_44b7ff61_render = function () {
@@ -9432,12 +9527,14 @@ var mainvue_type_script_lang_js_components, _watch;
     theads: {
       get: function get() {
         var thead = [];
+        var addfilter = false;
         var types = this.theadData.filter(function (item) {
           return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
         }).map(function (item) {
           return item.type;
         });
         if (this.dragSort && !types.includes('sort')) {
+          addfilter = true;
           thead.push({
             type: 'sort',
             key: 'es-sort'
@@ -9451,8 +9548,12 @@ var mainvue_type_script_lang_js_components, _watch;
             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')) {
           var index = 1;
@@ -9468,9 +9569,12 @@ var mainvue_type_script_lang_js_components, _watch;
             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 = [].concat(thead, this.theadData);
@@ -10436,8 +10540,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7b641b60_render,
-  mainvue_type_template_id_7b641b60_staticRenderFns,
+  mainvue_type_template_id_202d0a16_render,
+  mainvue_type_template_id_202d0a16_staticRenderFns,
   false,
   null,
   null,
@@ -46321,6 +46425,8 @@ var input_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 
 
 
@@ -46553,26 +46659,34 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           }, [content]);
         }
       }
+
+      var _$attrs = this.$attrs,
+          prefix = _$attrs.prefix,
+          suffix = _$attrs.suffix,
+          prepend = _$attrs.prepend,
+          append = _$attrs.append,
+          attrs = mainvue_type_script_lang_js_objectWithoutProperties(_$attrs, ['prefix', 'suffix', 'prepend', 'append']);
+
       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) {
@@ -46581,7 +46695,7 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           props: {
             rules: this.rule
           },
-          attrs: input_src_mainvue_type_script_lang_js_extends({}, this.$attrs, {
+          attrs: input_src_mainvue_type_script_lang_js_extends({}, attrs, {
             fetchSuggestions: this.fetchSuggestions ? this.fetchSuggestions : this.getData,
             triggerOnFocus: this.focusShow,
             value: this.model
@@ -46599,7 +46713,7 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
         domProps: {
           value: this.model
         },
-        attrs: input_src_mainvue_type_script_lang_js_extends({}, this.$attrs),
+        attrs: input_src_mainvue_type_script_lang_js_extends({}, attrs),
         on: input_src_mainvue_type_script_lang_js_extends({}, this.$listeners),
         directives: [{
           name: 'show',
@@ -47460,8 +47574,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=249fae96&
-var mainvue_type_template_id_249fae96_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/main.vue?vue&type=template&id=5f60346a&
+var mainvue_type_template_id_5f60346a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48391,14 +48505,14 @@ var mainvue_type_template_id_249fae96_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_249fae96_staticRenderFns = []
-mainvue_type_template_id_249fae96_render._withStripped = true
+var mainvue_type_template_id_5f60346a_staticRenderFns = []
+mainvue_type_template_id_5f60346a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=249fae96&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5f60346a&
 
-// 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
@@ -48458,11 +48572,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&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=script&lang=js&
 var resetPasswordvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -48706,7 +48820,7 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
               trigger: 'blur'
             } : {}, {
               required: true,
-              message: '请输入新密码',
+              message: '请确认新密码',
               trigger: 'blur'
             }, { validator: this.reregExpValidate, trigger: 'blur' }]
           }, {
@@ -48942,8 +49056,8 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
 
 var resetPassword_component = normalizeComponent(
   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,
@@ -49314,6 +49428,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 
 
+
 /* harmony default export */ var login_src_mainvue_type_script_lang_js_ = ({
   name: 'EsLogin',
   inheritAttrs: false,
@@ -49502,6 +49617,10 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     scanIntervalTime: {
       type: Number,
       default: 1500
+    },
+    isScale: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -49695,9 +49814,16 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     };
   },
   beforeCreate: function beforeCreate() {
+    this.setScale = Object(external_throttle_debounce_["debounce"])(300, function () {
+      utils_util["a" /* default */].setScale();
+    });
     utils_util["a" /* default */].removeStorage(['remind', 'ssId', 'token', 'Authorization', 'deviceUnique', 'userId', 'userName', 'useCaseCodes']);
   },
   created: function created() {
+    if (this.isScale) {
+      utils_util["a" /* default */].setScale();
+      window.addEventListener('resize', this.setScale);
+    }
     this.code = utils_util["a" /* default */].getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -50416,6 +50542,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
   },
   beforeDestroy: function beforeDestroy() {
+    window.removeEventListener('resize', this.setScale);
     document.removeEventListener('keyup', this.doLogin);
     document.removeEventListener('keydown', this.forbiddenTab);
   }
@@ -50432,8 +50559,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_249fae96_render,
-  mainvue_type_template_id_249fae96_staticRenderFns,
+  mainvue_type_template_id_5f60346a_render,
+  mainvue_type_template_id_5f60346a_staticRenderFns,
   false,
   null,
   null,
@@ -50450,8 +50577,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// 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=a08554be&
-var mainvue_type_template_id_a08554be_render = function () {
+// 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 mainvue_type_template_id_572765ea_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50656,6 +50783,7 @@ var mainvue_type_template_id_a08554be_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,
@@ -50898,15 +51026,42 @@ var mainvue_type_template_id_a08554be_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
   )
 }
-var mainvue_type_template_id_a08554be_staticRenderFns = []
-mainvue_type_template_id_a08554be_render._withStripped = true
+var mainvue_type_template_id_572765ea_staticRenderFns = []
+mainvue_type_template_id_572765ea_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a08554be&
+// 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 () {
@@ -53036,6 +53191,16 @@ var main_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -53211,6 +53376,10 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     showCollapse: {
       type: Boolean,
       default: true
+    },
+    onlineView: {
+      type: [String, Boolean],
+      default: true
     }
   },
   computed: {
@@ -53333,6 +53502,12 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     },
     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: {
@@ -53450,7 +53625,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       timer: null,
       pid: null,
       showPage: false,
-      webSocket: null
+      webSocket: null,
+      dialog: {},
+      hideSubMenu: false
     };
   },
   created: function created() {
@@ -53798,10 +53975,16 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
      * @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 (utils_util["a" /* default */].isObject(res)) {
         if (res.urlopenmode == 1) {
           utils_util["a" /* default */].win.open(res.url);
@@ -53827,11 +54010,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
               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 = utils_util["a" /* default */].getParams({ url: option.url });
                   this.$router.push({
-                    path: _path,
+                    path: path,
                     query: params
                   });
                 } else {
@@ -54297,6 +54480,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           }
           break;
         case 'sub':
+          this.hideSubMenu = false;
           this.navIds = [node.id];
           if (node.url) {
             this.tabs = [];
@@ -54393,19 +54577,19 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           }
         }
       } 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;
           }
         }
       }
@@ -54417,6 +54601,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     handleClick: function handleClick(res) {
       var _this8 = this;
 
+      console.log(res);
       var type = res.type;
 
       switch (type) {
@@ -54442,13 +54627,15 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         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;
@@ -54891,8 +55078,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a08554be_render,
-  mainvue_type_template_id_a08554be_staticRenderFns,
+  mainvue_type_template_id_572765ea_render,
+  mainvue_type_template_id_572765ea_staticRenderFns,
   false,
   null,
   null,
@@ -55330,8 +55517,8 @@ menu_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var menu = (menu_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=7b4319fb&
-var mainvue_type_template_id_7b4319fb_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=ccb38c80&
+var mainvue_type_template_id_ccb38c80_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -55394,15 +55581,15 @@ var mainvue_type_template_id_7b4319fb_render = function () {
             {
               name: "show",
               rawName: "v-show",
-              value: _vm.biserial ? _vm.subMenu.length : _vm.menu.length,
-              expression: "biserial ? subMenu.length : menu.length",
+              value: _vm.showMenu,
+              expression: "showMenu",
             },
           ],
           staticClass: "es-nav-main",
           class: { "es-nav-overlap": _vm.overlap },
           style: {
             width: _vm.biserial ? _vm.width : _vm.boxWidth,
-            left: _vm.show ? "15px" : _vm.navWidth,
+            left: _vm.biserial ? (_vm.show ? "15px" : _vm.navWidth) : "",
           },
           attrs: { biserial: _vm.biserial },
         },
@@ -55517,11 +55704,11 @@ var mainvue_type_template_id_7b4319fb_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_7b4319fb_staticRenderFns = []
-mainvue_type_template_id_7b4319fb_render._withStripped = true
+var mainvue_type_template_id_ccb38c80_staticRenderFns = []
+mainvue_type_template_id_ccb38c80_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=7b4319fb&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=ccb38c80&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=script&lang=js&
 //
@@ -55617,6 +55804,7 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
 //
 
 
+
 /* harmony default export */ var nav_src_mainvue_type_script_lang_js_ = ({
   name: 'EsNav',
   inheritAttrs: false,
@@ -55657,7 +55845,9 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
       type: Boolean,
       default: true
     },
-    overlap: Boolean
+    overlap: Boolean,
+    //隐藏菜单
+    hideSubMenu: Boolean
   },
   computed: {
     show: function show() {
@@ -55694,7 +55884,7 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
           return this.navWidth;
         }
       }
-      return this.subMenu && this.subMenu.length && this.isShow && !this.overlap ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px' : this.navWidth;
+      return this.subMenu && this.subMenu.length && this.isShow && !this.overlap && !this.hideSubMenu ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px' : this.navWidth;
     },
     _navWidth: function _navWidth() {
       return this.overlap ? parseInt(this.navWidth, 10) - 30 + 'px' : this.navWidth;
@@ -55709,11 +55899,14 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
         this.headline = val;
       }
     },
+    boxWidth: function boxWidth() {
+      this.getHeight();
+    },
 
     biserial: {
       handler: function handler(val) {
         this.isShow = !val;
-        this.resetHeight();
+        this.getHeight();
       }
     },
     defaultActive: {
@@ -55764,8 +55957,10 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
         this.subMenu = [];
       }
     },
-    showMenu: function showMenu() {
-      this.resetHeight();
+    showMenu: function showMenu(val) {
+      if (val) {
+        this.getHeight();
+      }
     }
   },
   data: function data() {
@@ -55780,15 +55975,22 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
       subMenu: []
     };
   },
+  beforeCreate: function beforeCreate() {
+    var _this3 = this;
+
+    this.getHeight = Object(external_throttle_debounce_["debounce"])(500, function () {
+      _this3.resetHeight();
+    });
+  },
   mounted: function mounted() {
-    this.resetHeight();
+    this.getHeight();
     this.move();
   },
 
   methods: {
     //设置按钮拖动
     move: function move() {
-      var _this3 = this;
+      var _this4 = this;
 
       var area = this.$refs.area.$el;
       var box = this.$refs.box;
@@ -55840,7 +56042,7 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
           var isClick = eTime - sTime < 200;
           if (isClick) {
             var onArea = function onArea() {
-              _this3.subMenu = [];
+              _this4.subMenu = [];
               area.removeEventListener('click', onArea);
             };
             area.addEventListener('click', onArea);
@@ -55886,12 +56088,12 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
       this.$emit('close', res);
     },
     resetHeight: function resetHeight() {
-      var _this4 = this;
+      var _this5 = this;
 
       this.$nextTick(function () {
-        var height = _this4.$refs.esNav.parentNode.offsetHeight;
-        Array.from(_this4.$refs.esNav.parentNode.children).forEach(function (item) {
-          if (item !== _this4.$refs.esNav) {
+        var height = _this5.$refs.esNav.parentNode.offsetHeight;
+        Array.from(_this5.$refs.esNav.parentNode.children).forEach(function (item) {
+          if (item !== _this5.$refs.esNav) {
             var mt = utils_util["a" /* default */].getStyle(item, 'margin-top');
             var mb = utils_util["a" /* default */].getStyle(item, 'margin-bottom');
             mt = mt ? parseInt(mt, 10) : 0;
@@ -55899,15 +56101,15 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
             height -= item.offsetHeight + mt + mb;
           }
         });
-        if (_this4.overlap) {
+        if (_this5.overlap) {
           height -= 15;
         }
-        _this4.height = height + 'px';
-        if (_this4.showTitle) {
-          var theight = _this4.$refs.navTitle.offsetHeight;
-          _this4.menuHeight = height - theight + 'px';
+        _this5.height = height + 'px';
+        if (_this5.showTitle) {
+          var theight = _this5.$refs.navTitle.offsetHeight;
+          _this5.menuHeight = height - theight + 'px';
         } else {
-          _this4.menuHeight = height + 'px';
+          _this5.menuHeight = height + 'px';
         }
       });
     }
@@ -55925,8 +56127,8 @@ mainvue_type_template_id_7b4319fb_render._withStripped = true
 
 var nav_src_main_component = normalizeComponent(
   packages_nav_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7b4319fb_render,
-  mainvue_type_template_id_7b4319fb_staticRenderFns,
+  mainvue_type_template_id_ccb38c80_render,
+  mainvue_type_template_id_ccb38c80_staticRenderFns,
   false,
   null,
   null,
@@ -58473,6 +58675,8 @@ var select_src_mainvue_type_script_lang_js_extends = Object.assign || function (
 
 var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+function src_mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 
 
 
@@ -59064,26 +59268,34 @@ var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           });
         }
       }
+
+      var _$attrs = this.$attrs,
+          prefix = _$attrs.prefix,
+          suffix = _$attrs.suffix,
+          prepend = _$attrs.prepend,
+          append = _$attrs.append,
+          attrs = src_mainvue_type_script_lang_js_objectWithoutProperties(_$attrs, ['prefix', 'suffix', 'prepend', 'append']);
+
       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) {
@@ -59103,7 +59315,7 @@ var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           name: 'show',
           value: this.display
         }],
-        props: select_src_mainvue_type_script_lang_js_extends({}, this.$attrs, {
+        props: select_src_mainvue_type_script_lang_js_extends({}, attrs, {
           multiple: this.multiple,
           valueType: this.valueType,
           valueKey: this.valKey,
@@ -68428,7 +68640,7 @@ tree_group_src_main.install = function (Vue) {
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/toolbar/src/main.vue?vue&type=script&lang=js&
 var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+function toolbar_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 /* harmony default export */ var toolbar_src_mainvue_type_script_lang_js_ = ({
   name: 'EsToolbar',
@@ -68579,7 +68791,7 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
           multiCondition = items.multiCondition,
           contents = items.contents,
           group = items.group,
-          other = mainvue_type_script_lang_js_objectWithoutProperties(items, ['config', 'type', 'reset', 'multiCondition', 'contents', 'group']);
+          other = toolbar_src_mainvue_type_script_lang_js_objectWithoutProperties(items, ['config', 'type', 'reset', 'multiCondition', 'contents', 'group']);
 
       if (type === 'text') {
         text = [h('div', { class: 'es-toolbar-text' }, Array.isArray(contents) ? contents.map(function (item) {
@@ -74979,7 +75191,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.73',
+  version: '0.5.75',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,