n20-common-lib 2.7.45 → 2.7.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.45",
+  "version": "2.7.47",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/formItemRender.vue

@@ -250,7 +250,7 @@ export default {
     const calcSelectWidth = (item, value) => {
       let textMaxWidth = 426 - getWidth(item.label) - 16
       let textMinWidth = 76
-      const multiple = item.props?.multiple || false
+      const multiple = item.props?.multiple || item?.multiple || false
       if (!multiple) {
         if (!value) {
           return textMinWidth + 'px'
@@ -279,12 +279,13 @@ export default {
             item.props?.valueKey || 'value',
             item.props?.labelKey || 'label'
           )
+          console.log(selectedName)
           if (value?.length > 1) {
             return getWidth(selectedName) + 32 > textMaxWidth
               ? textMaxWidth + 'px'
-              : getWidth(selectedName) + 110 + 'px'
+              : getWidth(selectedName) + 32 + 'px'
           } else {
-            return getWidth(selectedName) + 32 < textMinWidth ? textMinWidth + 'px' : getWidth(selectedName) + 84 + 'px'
+            return getWidth(selectedName) + 32 < textMinWidth ? textMinWidth + 'px' : getWidth(selectedName) + 48 + 'px'
           }
         }
       }

package/src/components/ShowColumn/index.vue

@@ -173,13 +173,13 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
 
+import { Message } from 'element-ui'
+import forEachs from '../../utils/forEachs'
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
-import forEachs from '../../utils/forEachs'
-import { Message } from 'element-ui'
 export default {
   name: 'ShowColumn',
   components: { dialogWrap, dragList },
@@ -424,8 +424,11 @@ export default {
       // 自动保存设置的显示列
       this.userNo = sessionStorage.getItem('userNo')
       !this.isExport && this.autoSave && this.saveColumns(list)
-
+      
       this.$emit('setColumns', list)
+      if (this.isExport) {
+        this.visible = false
+      }
     },
     saveColumns(list) {
       let columns = saveTransform(list, this.labelKey, this.isFilter)