eoss-ui 0.5.72 → 0.5.73

package/lib/main.js

@@ -3826,7 +3826,7 @@ module.exports = require("runtime-import");
 // 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/main/src/main.vue?vue&type=template&id=268dce6d&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3964,16 +3964,27 @@ var 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" },
@@ -4032,7 +4043,9 @@ var 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,
@@ -4269,7 +4282,7 @@ var staticRenderFns = []
 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 () {
@@ -6414,6 +6427,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
 
 
 
@@ -6585,7 +6599,11 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       type: String,
       default: '230px'
     },
-    navWidth: String
+    navWidth: String,
+    showCollapse: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     showHeader: function showHeader() {
@@ -6619,7 +6637,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       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菜单

package/lib/menu.js

@@ -280,6 +280,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     },
     width: function width() {
       this.getMaxWidth();
+    },
+    height: function height() {
+      this.$refs.esMenu.update();
     }
   },
   data: function data() {

package/lib/nav.js

@@ -3628,7 +3628,7 @@ module.exports = require("axios");
 // 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/nav/src/main.vue?vue&type=template&id=3f63e2ce&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3708,7 +3708,7 @@ var render = function () {
           _vm.showTitle
             ? _c(
                 "div",
-                { staticClass: "es-nav-title" },
+                { ref: "navTitle", staticClass: "es-nav-title" },
                 [
                   _c(
                     "span",
@@ -3767,6 +3767,7 @@ var 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,
@@ -3818,7 +3819,7 @@ var staticRenderFns = []
 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&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3914,6 +3915,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3962,6 +3964,9 @@ var util = __webpack_require__(0);
     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;
     },
@@ -4059,6 +4064,9 @@ var util = __webpack_require__(0);
       } else {
         this.subMenu = [];
       }
+    },
+    showMenu: function showMenu() {
+      this.resetHeight();
     }
   },
   data: function data() {
@@ -4196,7 +4204,12 @@ var util = __webpack_require__(0);
           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';
+        }
       });
     }
   }

package/lib/select.js

@@ -4052,6 +4052,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       }
     },
     url: {
+      immediate: true,
       handler: function handler(val, old) {
         if (val && old !== val && !this.sysCode) {
           this.getData();

package/lib/selector.js

@@ -3642,7 +3642,7 @@ module.exports = require("json-bigint");
 // 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/selector/src/main.vue?vue&type=template&id=bcfee2b4&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3950,7 +3950,7 @@ var render = function () {
                                   attrs: {
                                     type: "text",
                                     autocomplete: "off",
-                                    clearable: "clearable",
+                                    clearable: _vm.clearable,
                                     showClearIcon: "",
                                     name: _vm.name,
                                     readonly: _vm.filterable ? false : true,
@@ -4149,7 +4149,7 @@ var staticRenderFns = []
 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: ./src/utils/util.js
 var util = __webpack_require__(0);