n20-common-lib 2.22.59 → 2.22.60

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -109,7 +109,7 @@
               :action="apiPrefix ? apiPrefix + action : action"
               :multiple="multiple"
               :headers="headers"
-              :disabled="!row[keys.type] || row._typeDisabled"
+              :disabled="!row[keys.type] || row._typeDisabled || row._uploadDisabled"
               :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
               :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
               :http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
@@ -334,7 +334,6 @@ import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
 import Upload from '../Upload/index.vue'
 
-
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
   return component
@@ -348,9 +347,9 @@ const keysDefault = {
   user: 'user'
 }
 const typeOptionsDefault = [
-  { type: '001', label: $lc("信贷合同") },
-  { type: '002', label: $lc("贴现合同") },
-  { type: '003', label: $lc("其他合同") }
+  { type: '001', label: $lc('信贷合同') },
+  { type: '002', label: $lc('贴现合同') },
+  { type: '003', label: $lc('其他合同') }
 ]
 
 export default {
@@ -526,7 +525,7 @@ export default {
       return this.dataPorp.fileSize || undefined
     },
     fileAcceptTip() {
-      return this.dataPorp.fileAcceptTip || $lc("支持扩展名：.rar .zip .doc .docx .pdf .jpg...")
+      return this.dataPorp.fileAcceptTip || $lc('支持扩展名：.rar .zip .doc .docx .pdf .jpg...')
     },
     fileData() {
       return this.dataPorp.fileData || undefined
@@ -575,13 +574,13 @@ export default {
       const stripName = (v) => (v == null ? '' : String(v).replace(/\.[A-z0-9]+$/, ''))
       const dir = order === 'ascending' ? 1 : -1
       const sorted = [...this.tableData].sort(
-        (a, b) => stripName(a[nameKey]).localeCompare(stripName(b[nameKey]), 'zh-CN', { numeric: true }) * dir
+        (a, b) => stripName(a[nameKey]).localeCompare(stripName(b[nameKey]), 'zh-CN', { numeric:true }) * dir
       )
       // 原地更新 tableData（沿用现有 splice 修改 prop 数组的模式）
       this.tableData.splice(0, this.tableData.length, ...sorted)
       this.$emit('sort', this.tableData.slice())
       this.saveFileSort().catch(() => {
-        this.$message.error($lc("附件排序保存失败"))
+        this.$message.error($lc('附件排序保存失败'))
       })
     },
     async saveFileSort() {
@@ -745,7 +744,7 @@ export default {
       if (code === 200) {
         let aDom = document.createElement('a')
         aDom.href = data
-        aDom.download = $lc("批量附件.pdf")
+        aDom.download = '批量附件.pdf'
         aDom.click()
 
         this.$nextTick(() => {
@@ -794,14 +793,16 @@ export default {
           }
         }
 
+        let file = files.map((item) => item.raw)
         let FD = new FormData()
-        files.forEach((item) => {
-          FD.append('file', item.raw)
+        file.forEach((item) => {
+          FD.append('file', item)
         })
 
-        let remoteFileUpload = JSON.parse(this.fileData?.data || '{}')
-        remoteFileUpload.bussValues = this.typeOptions.map((item) => item.type)
-        FD.append('remoteFileUpload', JSON.stringify(remoteFileUpload))
+        let requestData = JSON.parse(this.fileData?.data || '{}')
+        requestData.bussId = requestData.bussId ?? this.fileData?.bussId ?? ''
+        requestData.bussValues = this.typeOptions.map((item) => item.type)
+        FD.append('data', JSON.stringify(requestData))
 
         this.batchUploading = true
         let { data } = await axios.post(
@@ -819,6 +820,22 @@ export default {
 
         let responseList = Array.isArray(data) ? data : []
         let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
+        rows.forEach((row) => {
+          let type = row[this.keys.type]
+          if (!type) {
+            return
+          }
+          let placeholderIndex = this.tableData.findIndex(
+            (item) =>
+              item[this.keys.type] === type &&
+              !item[this.keys.url] &&
+              !item[this.keys.name] &&
+              !item._name
+          )
+          if (placeholderIndex > -1) {
+            this.tableData.splice(placeholderIndex, 1)
+          }
+        })
         this.tableData.splice(0, 0, ...rows)
         let pendingFiles = [...files]
         rows.forEach((row) => {
@@ -844,6 +861,7 @@ export default {
         _percent: 100,
         _status: 'success',
         _typeDisabled: false,
+        _uploadDisabled: true,
         _typeUpdating: false,
         _shouldUpdateFileType: !item.attno,
         _lastFileType: item.attno,
@@ -981,17 +999,17 @@ export default {
     deleteRows() {
       if (!this.selectionList.length) {
         return this.$message({
-          message: $lc("请先勾选要删除的数据！"),
+          message: $lc('请先勾选要删除的数据！'),
           type: 'warning',
           showClose: true
         })
       }
       this.$msgboxPor({
-        title: $lc("确认删除所选附件吗？"),
-        message: $lc("删除后数据不可恢复"),
+        title: $lc('确认删除所选附件吗？'),
+        message: $lc('删除后数据不可恢复'),
         type: 'error',
-        confirmButtonText: $lc("确认"),
-        cancelButtonText: $lc("取消")
+        confirmButtonText: $lc('确认'),
+        cancelButtonText: $lc('取消')
       }).then(() => {
         this.$emit('delete-rows', this.selectionList)
       }).catch(() => undefined)