n20-common-lib 3.2.20 → 3.2.22

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -268,7 +268,7 @@
       :close-on-click-modal="false"
       :destroy-on-open="true"
     >
-      <el-select v-model="bathType" class="m-b-s" clearable @change="handleBathChange">
+      <el-select v-model="bathType" class="m-b-s w-100p" clearable @change="handleBathChange">
         <el-option
           v-for="item in typeOptions"
           :key="item.type"
@@ -288,7 +288,7 @@
         :multiple="true"
         :show-file-list="true"
         :action="apiPrefix ? apiPrefix + action : action"
-        :data="fileData"
+        :data="_batchFileData || fileData"
         :headers="headers"
         :accept="fileAccept"
         :size="fileSize"
@@ -497,7 +497,9 @@ export default {
       previewName: undefined,
       previewSameOrg: false,
       seeRow: {},
-      officeStatus: false
+      officeStatus: false,
+      // 批量上传使用的文件数据（避免直接修改计算属性）
+      _batchFileData: null
     }
   },
   computed: {
@@ -741,20 +743,32 @@ export default {
       if (bu) return bu(file)
     },
     handleBathChange() {
-      let dto = JSON.parse(this.dataPorp.fileData.data)
+      // 创建新的文件数据对象，避免直接修改计算属性
+      let fileData = this.fileData || {}
+      let dto = JSON.parse(fileData.data || '{}')
       dto[this.keys.type] = this.bathType
-      this.fileData.data = JSON.stringify(dto)
+      this._batchFileData = {
+        ...fileData,
+        data: JSON.stringify(dto)
+      }
     },
     batchUploadFn() {
       let $uploadwrap = this.$refs['upload-batch']
-      let fileList = $uploadwrap.fileList
-      if (fileList.length !== 0 && fileList.every((f) => f.status === 'success')) {
-        this.visibleBatch = false
-      }
+      // 直接提交上传，关闭对话框的逻辑在 batchSuccess 回调中处理
       $uploadwrap.submit()
     },
     batchSuccess(response, file, fileList) {
-      let row = { ...this.dataPorp.keys }
+      // 创建完整的行对象，初始化状态字段
+      let row = {
+        id: 'n' + Math.random(),
+        [this.keys.name]: '',
+        [this.keys.type]: this.bathType,
+        [this.keys.time]: '',
+        [this.keys.user]: JSON.parse(sessionStorage.getItem('userInfo')).uname,
+        _percent: 0,
+        _status: undefined,
+        _typeDisabled: false
+      }
       this.tableData.splice(0, 0, row)
       this.$nextTick(() => {
         this.onSuccessFn(response, file, fileList, row)
@@ -901,13 +915,8 @@ export default {
         let FD = new FormData()
         FD.append(opt.filename, opt.file)
 
-        let data
-        if (window._fileData) {
-          data = window._fileData
-          delete window._fileData
-        } else {
-          data = opt.data
-        }
+        // 优先使用 opt.data，其次使用 this.fileData，移除全局变量 window._fileData 的使用
+        let data = opt.data || this.fileData
 
         if (data) {
           let dto = JSON.parse(data.data)
@@ -981,7 +990,7 @@ export default {
           _percent = 99
           _status = 'error'
         } else {
-          _percent = 99
+          _percent = 100
           _status = 'success'
         }
         setTimeout(() => {

package/src/components/ProFilterView/index.vue

@@ -265,7 +265,7 @@ export default {
     // 默认 false —— 完全向后兼容，业务方按页面粒度显式开启
     autoExpandWithValues: {
       type: Boolean,
-      default: false
+      default: true
     },
     // 是否显示筛选按钮及筛选区域，为 false 时不显示筛选按钮、视图相关 UI，且不请求筛选相关接口
     isFilter: {