eoss-ui 0.5.72 → 0.5.73

package/lib/data-table.js

@@ -3816,8 +3816,8 @@ module.exports = require("vue");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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
@@ -4128,10 +4128,10 @@ var mainvue_type_template_id_f4b01d22_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_f4b01d22_render._withStripped = true
+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&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6633,8 +6633,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;
           });
@@ -6699,6 +6699,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();
@@ -7571,7 +7579,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_f4b01d22_render,
+  mainvue_type_template_id_7b641b60_render,
   staticRenderFns,
   false,
   null,

package/lib/eoss-ui.common.js

@@ -6688,8 +6688,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 +6999,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 +9490,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 +9556,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 +10436,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,
@@ -50442,8 +50450,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=a08554be&
+var mainvue_type_template_id_a08554be_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50580,16 +50588,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" },
@@ -50648,7 +50667,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,
@@ -50881,11 +50902,11 @@ var mainvue_type_template_id_268dce6d_render = function () {
     1
   )
 }
-var mainvue_type_template_id_268dce6d_staticRenderFns = []
-mainvue_type_template_id_268dce6d_render._withStripped = true
+var mainvue_type_template_id_a08554be_staticRenderFns = []
+mainvue_type_template_id_a08554be_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=a08554be&
 
 // 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 +53035,7 @@ var main_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
 //
 //
 //
+//
 
 
 
@@ -53185,7 +53207,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       type: String,
       default: '230px'
     },
-    navWidth: String
+    navWidth: String,
+    showCollapse: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     showHeader: function showHeader() {
@@ -53219,7 +53245,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菜单
@@ -54865,8 +54891,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_a08554be_render,
+  mainvue_type_template_id_a08554be_staticRenderFns,
   false,
   null,
   null,
@@ -54954,6 +54980,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 +55330,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=7b4319fb&
+var mainvue_type_template_id_7b4319fb_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -55381,7 +55410,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 +55469,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 +55517,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_7b4319fb_staticRenderFns = []
+mainvue_type_template_id_7b4319fb_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=7b4319fb&
 
 // 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 +55614,7 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
 //
 //
 //
+//
 
 
 /* harmony default export */ var nav_src_mainvue_type_script_lang_js_ = ({
@@ -55632,6 +55663,9 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
     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;
     },
@@ -55729,6 +55763,9 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
       } else {
         this.subMenu = [];
       }
+    },
+    showMenu: function showMenu() {
+      this.resetHeight();
     }
   },
   data: function data() {
@@ -55866,7 +55903,12 @@ mainvue_type_template_id_3f63e2ce_render._withStripped = true
           height -= 15;
         }
         _this4.height = height + 'px';
-        _this4.menuHeight = _this4.showTitle ? height - 49 + 'px' : height + 'px';
+        if (_this4.showTitle) {
+          var theight = _this4.$refs.navTitle.offsetHeight;
+          _this4.menuHeight = height - theight + 'px';
+        } else {
+          _this4.menuHeight = height + 'px';
+        }
       });
     }
   }
@@ -55883,8 +55925,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_7b4319fb_render,
+  mainvue_type_template_id_7b4319fb_staticRenderFns,
   false,
   null,
   null,
@@ -58641,6 +58683,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 +59813,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 +60121,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 +60316,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 +60978,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 +66576,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 +66773,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 +67164,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 +67478,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 +74979,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.72',
+  version: '0.5.73',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,