n20-common-lib 2.6.0 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/assets/css/cl-layout-aside.scss

@@ -1,28 +1,34 @@
 $--hover-bg-color: #303d59;
 
 .layout-aside {
+
   .el-menu-item,
   .el-submenu__title {
     height: $--aside-height;
     line-height: $--aside-height;
     padding-right: 16px;
+
     i {
       color: inherit;
     }
+
     &:hover,
     &:focus {
       background: var(--an-hoverBackgroundColor, $--hover-bg-color) !important;
     }
   }
+
   .el-submenu__icon-arrow {
     right: 16px;
   }
+
   .el-menu-item.is-active {
     background: var(--an-activeBackgroundColor, $--color-primary) !important;
   }
 
   &.el-menu--collapse {
     width: $--aside-collapse-width;
+
     .el-tooltip,
     .el-submenu__title {
       padding-left: 16px !important;
@@ -32,6 +38,7 @@ $--hover-bg-color: #303d59;
     .open-collapsed-btn {
       padding-left: 10px;
       padding-right: 10px;
+
       .rotate-icon {
         transform: rotate(180deg);
       }
@@ -83,29 +90,36 @@ $--hover-bg-color: #303d59;
     line-height: $--aside-height;
     padding-left: 10px !important;
     padding-right: 10px !important;
+
     &:hover,
     &:focus {
       background: var(--an-hoverBackgroundColor, $--hover-bg-color) !important;
     }
   }
+
   .el-submenu__title {
     height: $--aside-height;
     padding-left: 10px !important;
     padding-right: 16px !important;
+
     i {
       color: inherit;
     }
+
     &:hover,
     &:focus {
       background: var(--an-hoverBackgroundColor, $--hover-bg-color) !important;
     }
   }
+
   .el-submenu__icon-arrow {
     right: 16px;
   }
+
   .el-menu-item.is-active {
     background: var(--an-activeBackgroundColor, $--color-primary) !important;
   }
+
   .el-menu--vertical {
     margin-top: -6px;
   }
@@ -124,7 +138,7 @@ $--hover-bg-color: #303d59;
   border-top-right-radius: 4px;
 }
 
-.el-menu--collapse > .el-menu-item [class^='el-icon-'],
-.el-menu--collapse > .el-submenu > .el-submenu__title [class^='el-icon-'] {
+.el-menu--collapse>.el-menu-item [class^='el-icon-'],
+.el-menu--collapse>.el-submenu>.el-submenu__title [class^='el-icon-'] {
   width: 18px;
-}
+}

package/src/assets/css/filter.scss

@@ -96,11 +96,20 @@
     }
 
     .n20-num-w {
+      padding-left: 5px;
 
       .el-input,
       .el-input__inner {
         padding-left: 0;
       }
+
+      .el-input--suffix .el-input__inner {
+        padding-right: 20px;
+      }
+    }
+
+    .n20-numberRange {
+      padding-right: 8px;
     }
 
     &-close {

package/src/components/AdvancedFilter/formItemRender.vue

@@ -118,7 +118,7 @@ export default {
       let W = null
       if (!value) {
         if (type) {
-          return w + 100 + 'px'
+          return w + 110 + 'px'
         }
         return w + 'px'
       }

package/src/components/AdvancedFilter/index.vue

@@ -266,7 +266,18 @@ export default {
         .then(({ data }) => {
           let _data = JSON.parse(data)
           if (_data && _data.length > 0) {
-            this.GroupData = _data
+            this.GroupData = _data.map((item) => {
+              for (let i = 0; i < this.filterList.length; i++) {
+                const originItem = this.filterList[i]
+                if (originItem.id === item.id) {
+                  item.label = originItem.label
+                  if (item.options && originItem.options) {
+                    item.options = originItem.options
+                  }
+                }
+              }
+              return item
+            })
           } else {
             this.GroupData = this.filterList.filter((item) => {
               if (item.isDefault) {

package/src/components/InputNumber/numberRange.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="n20-num-w">
+  <div class="n20-num-w n20-numberRange">
     <inputNumber
       v-bind="$attrs"
       :value="startValue"

package/src/components/Layout/AsideNav/menuItem.vue

@@ -1,5 +1,10 @@
 <template>
-  <el-menu-item :index="item.uuid" @click="$emit('click', item)">
+  <el-menu-item
+    v-title="`${item.title}`"
+    :show-overflow-tooltip="true"
+    :index="item.uuid"
+    @click="$emit('click', item)"
+  >
     <i v-if="item.iconUrl" class="el-icon- icon-url" :style="{ backgroundImage: `url(${item.iconUrl})` }"></i>
     <i v-else :class="item.iconClass"></i>
     <span v-if="!item.href" slot="title">{{ item | titleF }}</span>

package/src/components/Layout/AsideNav/submenuTitle.vue

@@ -1,5 +1,5 @@
 <template>
-  <component :is="'slot'">
+  <component v-title="`${item.title}`" class="truncate" :show-overflow-tooltip="true" :is="'div'">
     <i v-if="item.iconUrl" class="el-icon- icon-url" :style="{ backgroundImage: `url(${item.iconUrl})` }"></i>
     <i v-else :class="item.iconClass"></i>
     <span>{{ item | titleF }}</span>