n20-common-lib 2.7.65 → 2.7.67

package/package.json

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

package/src/components/AdvancedFilter/formItemRender.vue

@@ -297,7 +297,7 @@ export default {
     }
     // 计算区间内容宽度
     const calcRangeWidth = (item, value, value2) => {
-      let textMaxWidth = 284 - getWidth(item.label) - 16
+      let textMaxWidth = 426 - getWidth(item.label) - 16
       let textMinWidth = 160
       if (!value && !value2) {
         return textMinWidth + 'px'
@@ -325,7 +325,7 @@ export default {
     }
 
     const calcDateWidth = (item, value) => {
-      let textMaxWidth = 282 - getWidth(item.label) - 16
+      let textMaxWidth = 382 - getWidth(item.label) - 16
       let textMinWidth = 76
       if (!value) {
         return textMinWidth + 'px'
@@ -436,7 +436,7 @@ export default {
         const selectProps = {
           placeholder: item.props && item.props.placeholder ? item.props.placeholder : $lc('请选择'),
           clearable: (item.props && this.item.props.clearable) ?? true,
-          multiple: item.multiple || item.props.multiple,
+          multiple: item.multiple || item.props?.multiple,
           ...item.props
         }
         elementDom = h(

package/src/components/FileImport/index.vue

@@ -39,9 +39,9 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 import downloadBlob from '../../utils/downloadBlob'
+import { $lc } from '../../utils/i18n/index'
 import Upload from '../Upload/index.vue'
 import uploadMsg from '../Upload/uploadMsg.vue'
 export default {
@@ -60,6 +60,10 @@ export default {
       type: String,
       default: '60%'
     },
+    fileType: {
+      type: String,
+      default: '.xlsx,.xls,.csv'
+    },
     fileName: {
       type: String,
       default: $lc('下载.xlsx')
@@ -106,13 +110,17 @@ export default {
     }
   },
   data() {
-    return {
-      errorV: false
-    }
+    return {}
   },
-  watch: {
-    validateDialog(val) {
-      this.errorV = val
+  computed: {
+    errorV: {
+      get() {
+        return this.validateDialog
+      },
+      set(v) {
+        this.$emit('update:validateDialog', v)
+        return v
+      }
     }
   },
   methods: {
@@ -130,9 +138,10 @@ export default {
         this.$refs['upload-trigger'].click()
         return
       }
+
       let input = document.createElement('input')
       input.type = 'file'
-      input.accept = '.xlsx,.xls,.csv'
+      input.accept = this.fileType
       input.addEventListener('change', (event) => {
         this.uploadHttpRequest && this.uploadHttpRequest(event.target.files[0])
       })

package/src/components/Upload/uploadMsg.vue

@@ -6,6 +6,7 @@
     :visible.sync="progressV"
     :title="title"
     append-to-body
+    @close="handleClose"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
   >
@@ -110,10 +111,10 @@
 </template>
 
 <script>
+import cloneDeep from 'lodash/cloneDeep'
 import { $lc } from '../../utils/i18n/index'
-import { colfF } from '../Table/filters.js'
 import Pagination from '../Pagination/index.vue'
-import cloneDeep from 'lodash/cloneDeep'
+import { colfF } from '../Table/filters.js'
 export default {
   name: 'UploadMsg',
   components: { Pagination },
@@ -203,6 +204,7 @@ export default {
       },
       set(v) {
         this.$emit('update:visible', v)
+        return v
       }
     },
 
@@ -249,6 +251,9 @@ export default {
         this.progressV = false
       }
     },
+    handleClose() {
+      this.progressV = false
+    },
     getList() {
       const startIndex = (this.page.current - 1) * this.page.pageSize
       const endIndex = startIndex + this.page.pageSize