n20-common-lib 2.5.52 → 2.5.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.52",
+  "version": "2.5.55",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/AdvancedFilter/formItemRender.vue

@@ -117,6 +117,9 @@ export default {
     const calcWidth = (value, type) => {
       let W = null
       if (!value) {
+        if (type) {
+          return w + 100 + 'px'
+        }
         return w + 'px'
       }
       if (getWidth(value, type) > w) {
@@ -126,22 +129,31 @@ export default {
           W = getWidth(value, type)
         }
       } else {
-        W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40
+        if (type) {
+          W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40 + 100
+        } else {
+          W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40
+        }
       }
       return W + 'px'
     }
 
-    const calcSelectWidth = (value) => {
+    const calcSelectWidth = (value, type) => {
       let W = null
       if (!value) {
         return w + 'px'
       } else {
         let label = item.options.find((res) => (res.value || res[item.props.valueKey]) === value)?.label
-        if (getWidth(label) > w) {
-          if (getWidth(label) > MAX_WIDTH) {
+        const width = getWidth(label)
+        if (width > w) {
+          if (width > MAX_WIDTH) {
             W = MAX_WIDTH
           } else {
-            W = getWidth(label)
+            if (type) {
+              W = width + 45
+            } else {
+              W = width
+            }
           }
         } else {
           W = w
@@ -257,7 +269,7 @@ export default {
               collapseTags: true
             },
             style: {
-              width: calcSelectWidth(form[item.value])
+              width: calcSelectWidth(form[item.value], item.multiple)
             },
             props: selectProps,
 

package/src/components/AdvancedFilter/index.vue

@@ -120,6 +120,9 @@ export default {
       let item = this.GroupData.find((f) => f[this.onlyKey] === id)
       if (item) {
         item.options = opts || []
+      } else {
+        item = this.GroupData.find((f) => f.value === id)
+        item.options = opts || []
       }
     },
     filter() {
@@ -195,6 +198,7 @@ export default {
     },
 
     check(keys) {
+      this.$emit('check')
       // 保存当前选择的过滤条件
       this.checkList = keys
       let saveCheckArr = []

package/src/components/ShowColumn/index.vue

@@ -166,7 +166,6 @@
       </div>
     </dialogWrap>
     <div slot="footer" class="text-c">
-      <el-button type="primary" v-has="isHas" @click="handleInitialize">{{ '初始化' | $lc }}</el-button>
       <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
       <el-button plain @click="reset">{{ '恢复默认' | $lc }}</el-button>
     </div>