eoss-ui 0.5.72 → 0.5.74

package/lib/eoss-ui.common.js

@@ -3563,6 +3563,8 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
@@ -3573,14 +3575,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 +3592,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 +3604,14 @@ var WebSocket = function () {
         }, 5000);
       }
     });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   };
   /** 订阅服务端 */
 
@@ -3611,7 +3620,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 +3661,7 @@ var WebSocket = function () {
 
   WebSocket.prototype.destroy = function destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };
@@ -6430,8 +6440,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 +6449,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 +6541,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 +6570,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 +6621,8 @@ var _props;
 //
 //
 //
+//
+//
 
 //import util from 'eoss-ui/src/utils/util';
 /* harmony default export */ var clients_src_mainvue_type_script_lang_js_ = ({
@@ -6670,8 +6689,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 +6707,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=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
@@ -6999,11 +7018,11 @@ var mainvue_type_template_id_f4b01d22_render = function () {
     1
   )
 }
-var mainvue_type_template_id_f4b01d22_staticRenderFns = []
-mainvue_type_template_id_f4b01d22_render._withStripped = true
+var mainvue_type_template_id_7b641b60_staticRenderFns = []
+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&
 
 // 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 () {
@@ -9490,8 +9509,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;
           });
@@ -9556,6 +9575,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();
@@ -10428,8 +10455,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_f4b01d22_render,
-  mainvue_type_template_id_f4b01d22_staticRenderFns,
+  mainvue_type_template_id_7b641b60_render,
+  mainvue_type_template_id_7b641b60_staticRenderFns,
   false,
   null,
   null,
@@ -48389,8 +48416,8 @@ mainvue_type_template_id_249fae96_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=249fae96&
 
-// 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
@@ -48450,11 +48477,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; };
@@ -48698,7 +48725,7 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
               trigger: 'blur'
             } : {}, {
               required: true,
-              message: '请输入新密码',
+              message: '请确认新密码',
               trigger: 'blur'
             }, { validator: this.reregExpValidate, trigger: 'blur' }]
           }, {
@@ -48934,8 +48961,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,
@@ -50442,8 +50469,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=268dce6d&
-var mainvue_type_template_id_268dce6d_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
@@ -50580,16 +50607,27 @@ var mainvue_type_template_id_268dce6d_render = function () {
                     _vm.layout === "topside" || _vm.layout === "side"
                       ? _c(
                           "div",
-                          { staticClass: "es-main-side" },
+                          {
+                            staticClass: "es-main-side",
+                            class: {
+                              "es-main-topside": _vm.layout === "topside",
+                            },
+                          },
                           [
-                            _c("div", { staticClass: "es-main-side-logo" }, [
-                              _vm.logoUrl
-                                ? _c("img", {
-                                    staticClass: "es-main-logo",
-                                    attrs: { src: _vm.logoUrl },
-                                  })
-                                : _vm._e(),
-                            ]),
+                            _vm.layout === "topside"
+                              ? _c(
+                                  "div",
+                                  { staticClass: "es-main-side-logo" },
+                                  [
+                                    _vm.logoUrl
+                                      ? _c("img", {
+                                          staticClass: "es-main-logo",
+                                          attrs: { src: _vm.logoUrl },
+                                        })
+                                      : _vm._e(),
+                                  ]
+                                )
+                              : _vm._e(),
                             _c("es-handle-user", {
                               attrs: {
                                 data: { type: "user" },
@@ -50637,6 +50675,7 @@ var mainvue_type_template_id_268dce6d_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,
@@ -50648,7 +50687,9 @@ var mainvue_type_template_id_268dce6d_render = function () {
                             "sub-icon": _vm.subIcon,
                             biserial: _vm.biserial,
                             title: _vm.showNavTitle ? _vm.title : false,
-                            showCollapse: _vm.showNavTitle,
+                            showCollapse: _vm.showNavTitle
+                              ? _vm.showCollapse
+                              : false,
                             "menu-tips": _vm.menuTips,
                             "is-default": _vm.isDefault,
                             paddingLeft: _vm.navPaddingLeft,
@@ -50877,15 +50918,42 @@ var mainvue_type_template_id_268dce6d_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_268dce6d_staticRenderFns = []
-mainvue_type_template_id_268dce6d_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=268dce6d&
+// 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 () {
@@ -53014,6 +53082,17 @@ var main_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -53185,7 +53264,15 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       type: String,
       default: '230px'
     },
-    navWidth: String
+    navWidth: String,
+    showCollapse: {
+      type: Boolean,
+      default: true
+    },
+    onlineView: {
+      type: [String, Boolean],
+      default: true
+    }
   },
   computed: {
     showHeader: function showHeader() {
@@ -53219,7 +53306,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       return this.layout === 'side' ? this.navBoxWidth : this.layout === 'subsystem' || this.layout === 'topside' ? '0' : this.navWidth;
     },
     showNavTitle: function showNavTitle() {
-      return this.layout !== 'topside' && this.layout !== 'side';
+      return this.layout !== 'topside';
     },
 
     //tabs菜单
@@ -53307,6 +53394,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: {
@@ -53424,7 +53517,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() {
@@ -53772,10 +53867,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);
@@ -53801,11 +53902,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 {
@@ -54271,6 +54372,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 = [];
@@ -54367,19 +54469,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;
           }
         }
       }
@@ -54391,6 +54493,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) {
@@ -54416,13 +54519,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;
@@ -54865,8 +54970,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_268dce6d_render,
-  mainvue_type_template_id_268dce6d_staticRenderFns,
+  mainvue_type_template_id_572765ea_render,
+  mainvue_type_template_id_572765ea_staticRenderFns,
   false,
   null,
   null,
@@ -54954,6 +55059,9 @@ var menu_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
     },
     width: function width() {
       this.getMaxWidth();
+    },
+    height: function height() {
+      this.$refs.esMenu.update();
     }
   },
   data: function data() {
@@ -55301,8 +55409,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=3f63e2ce&
-var mainvue_type_template_id_3f63e2ce_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
@@ -55365,15 +55473,15 @@ var mainvue_type_template_id_3f63e2ce_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 },
         },
@@ -55381,7 +55489,7 @@ var mainvue_type_template_id_3f63e2ce_render = function () {
           _vm.showTitle
             ? _c(
                 "div",
-                { staticClass: "es-nav-title" },
+                { ref: "navTitle", staticClass: "es-nav-title" },
                 [
                   _c(
                     "span",
@@ -55440,6 +55548,7 @@ var mainvue_type_template_id_3f63e2ce_render = function () {
                   collapse: _vm.isCollapse,
                   "default-active": _vm.menuActive,
                   width: _vm.isTop ? _vm.boxWidth : _vm.menuWidth,
+                  height: _vm.menuHeight,
                   "is-default": _vm.isDefault,
                   biserial: _vm.biserial,
                   paddingLeft: _vm.paddingLeft,
@@ -55487,11 +55596,11 @@ var mainvue_type_template_id_3f63e2ce_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_3f63e2ce_staticRenderFns = []
-mainvue_type_template_id_3f63e2ce_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=3f63e2ce&
+// 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&
 //
@@ -55584,6 +55693,8 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
 //
 //
 //
+//
+
 
 
 /* harmony default export */ var nav_src_mainvue_type_script_lang_js_ = ({
@@ -55626,12 +55737,17 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
       type: Boolean,
       default: true
     },
-    overlap: Boolean
+    overlap: Boolean,
+    //隐藏菜单
+    hideSubMenu: Boolean
   },
   computed: {
     show: function show() {
       return this.overlap && this.subMenu.length;
     },
+    showMenu: function showMenu() {
+      return this.biserial ? this.subMenu.length : this.menu.length;
+    },
     menu: function menu() {
       return this.data;
     },
@@ -55660,7 +55776,7 @@ mainvue_type_template_id_3f63e2ce_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;
@@ -55675,11 +55791,14 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
         this.headline = val;
       }
     },
+    boxWidth: function boxWidth() {
+      this.getHeight();
+    },
 
     biserial: {
       handler: function handler(val) {
         this.isShow = !val;
-        this.resetHeight();
+        this.getHeight();
       }
     },
     defaultActive: {
@@ -55729,6 +55848,11 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
       } else {
         this.subMenu = [];
       }
+    },
+    showMenu: function showMenu(val) {
+      if (val) {
+        this.getHeight();
+      }
     }
   },
   data: function data() {
@@ -55743,15 +55867,22 @@ mainvue_type_template_id_3f63e2ce_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;
@@ -55803,7 +55934,7 @@ mainvue_type_template_id_3f63e2ce_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);
@@ -55849,12 +55980,12 @@ mainvue_type_template_id_3f63e2ce_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;
@@ -55862,11 +55993,16 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
             height -= item.offsetHeight + mt + mb;
           }
         });
-        if (_this4.overlap) {
+        if (_this5.overlap) {
           height -= 15;
         }
-        _this4.height = height + 'px';
-        _this4.menuHeight = _this4.showTitle ? height - 49 + 'px' : height + 'px';
+        _this5.height = height + 'px';
+        if (_this5.showTitle) {
+          var theight = _this5.$refs.navTitle.offsetHeight;
+          _this5.menuHeight = height - theight + 'px';
+        } else {
+          _this5.menuHeight = height + 'px';
+        }
       });
     }
   }
@@ -55883,8 +56019,8 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
 
 var nav_src_main_component = normalizeComponent(
   packages_nav_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3f63e2ce_render,
-  mainvue_type_template_id_3f63e2ce_staticRenderFns,
+  mainvue_type_template_id_ccb38c80_render,
+  mainvue_type_template_id_ccb38c80_staticRenderFns,
   false,
   null,
   null,
@@ -58641,6 +58777,7 @@ var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
       }
     },
     url: {
+      immediate: true,
       handler: function handler(val, old) {
         if (val && old !== val && !this.sysCode) {
           this.getData();
@@ -59770,8 +59907,8 @@ select_ganged_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var select_ganged = (select_ganged_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=bcfee2b4&
-var mainvue_type_template_id_bcfee2b4_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=59002e4c&
+var mainvue_type_template_id_59002e4c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -60078,7 +60215,7 @@ var mainvue_type_template_id_bcfee2b4_render = function () {
                                   attrs: {
                                     type: "text",
                                     autocomplete: "off",
-                                    clearable: "clearable",
+                                    clearable: _vm.clearable,
                                     showClearIcon: "",
                                     name: _vm.name,
                                     readonly: _vm.filterable ? false : true,
@@ -60273,11 +60410,11 @@ var mainvue_type_template_id_bcfee2b4_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_bcfee2b4_staticRenderFns = []
-mainvue_type_template_id_bcfee2b4_render._withStripped = true
+var mainvue_type_template_id_59002e4c_staticRenderFns = []
+mainvue_type_template_id_59002e4c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=bcfee2b4&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=59002e4c&
 
 // EXTERNAL MODULE: external "eoss-element/src/utils/clickoutside"
 var clickoutside_ = __webpack_require__(18);
@@ -60935,8 +61072,8 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 var selector_src_main_component = normalizeComponent(
   packages_selector_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_bcfee2b4_render,
-  mainvue_type_template_id_bcfee2b4_staticRenderFns,
+  mainvue_type_template_id_59002e4c_render,
+  mainvue_type_template_id_59002e4c_staticRenderFns,
   false,
   null,
   null,
@@ -66533,8 +66670,8 @@ tips_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var tips = (tips_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=3eb6c637&
-var mainvue_type_template_id_3eb6c637_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=4df0cd89&
+var mainvue_type_template_id_4df0cd89_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -66730,11 +66867,11 @@ var mainvue_type_template_id_3eb6c637_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_3eb6c637_staticRenderFns = []
-mainvue_type_template_id_3eb6c637_render._withStripped = true
+var mainvue_type_template_id_4df0cd89_staticRenderFns = []
+mainvue_type_template_id_4df0cd89_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=3eb6c637&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=4df0cd89&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=script&lang=js&
 //
@@ -67121,9 +67258,9 @@ mainvue_type_template_id_3eb6c637_render._withStripped = true
     getTreeDatas: function getTreeDatas(param) {
       var _this2 = this;
 
-      this.loading = true;
       var params = utils_util["a" /* default */].extend({}, this.param, this.where, param);
       if (!this.url || !this.isRemote) return;
+      this.loading = true;
       utils_util["a" /* default */].ajax({
         url: this.url,
         method: this.method,
@@ -67435,8 +67572,8 @@ mainvue_type_template_id_3eb6c637_render._withStripped = true
 
 var tree_src_main_component = normalizeComponent(
   packages_tree_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3eb6c637_render,
-  mainvue_type_template_id_3eb6c637_staticRenderFns,
+  mainvue_type_template_id_4df0cd89_render,
+  mainvue_type_template_id_4df0cd89_staticRenderFns,
   false,
   null,
   null,
@@ -74936,7 +75073,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.72',
+  version: '0.5.74',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,