n20-common-lib 3.3.0 → 3.3.2

package/src/components/FileUploadTable/index.vue

@@ -546,14 +546,14 @@ export default {
   watch: {
     dataPorp: {
       handler() {
-        this.requiredTypes = this.dataPorp.typeOptions
+        this.requiredTypes = this.typeOptions
           .filter((item) => {
             return item.required === 1
           })
           .map((item) => {
             return item.attno
           })
-        if (this.dataPorp.typeOptions.length === 0) {
+        if (this.typeOptions.length === 0) {
           return false
         }
         this.setTableData()
@@ -711,10 +711,17 @@ export default {
         this.$emit('aiFn', data)
       }
     },
+    getUserNameSafe() {
+      try {
+        return (JSON.parse(sessionStorage.getItem('userInfo') || '{}') || {}).uname
+      } catch (e) {
+        return undefined
+      }
+    },
     // 平铺附件
     setTableData() {
       if (this.tableData.length === 0 && !this.readonly) {
-        this.dataPorp.typeOptions
+        this.typeOptions
           .filter((item) => {
             if (this.fileRequired) {
               return item.required === 1
@@ -730,9 +737,7 @@ export default {
             }
             obj[this.keys.type] = item.attno
             obj[this.keys.time] = ''
-            obj[this.keys.user] = JSON.parse(sessionStorage.getItem('userInfo')).uname
-
-            console.log(obj)
+            obj[this.keys.user] = this.getUserNameSafe()
             this.tableData.push(obj)
           })
       }
@@ -799,7 +804,13 @@ export default {
     handleBathChange() {
       // 创建新的文件数据对象，避免直接修改计算属性
       let fileData = this.fileData || {}
-      let dto = JSON.parse(fileData.data || '{}')
+      let dto
+      try {
+        dto = JSON.parse(fileData.data || '{}')
+      } catch (e) {
+        this.$message.error($lc('批量上传参数格式错误'))
+        return
+      }
       dto[this.keys.type] = this.bathType
       this.batchFileData = {
         ...fileData,
@@ -816,6 +827,9 @@ export default {
       $uploadwrap.submit()
     },
     async autoMatchBatchUpload() {
+      if (this.batchUploading) {
+        return
+      }
       let $uploadwrap = this.$refs['upload-batch']
       let uploadFiles = $uploadwrap?.$refs?.upload?.uploadFiles || []
       let files = uploadFiles.filter((item) => item.status === 'ready' && item.raw)
@@ -824,6 +838,7 @@ export default {
         return
       }
 
+      this.batchUploading = true
       try {
         for (let item of files) {
           let result = await $uploadwrap.beforeUploadFn(item.raw)
@@ -838,16 +853,35 @@ export default {
           FD.append('file', item)
         })
 
-        let requestData = JSON.parse(this.fileData?.data || '{}')
+        let requestData
+        try {
+          requestData = JSON.parse(this.fileData?.data || '{}')
+        } catch (e) {
+          this.$message.error($lc('批量上传参数格式错误'))
+          return
+        }
+        // bussValues 为业务值代码（getByBussValues 入参域），优先显式配置，其次 data JSON 携带
+        let configuredBussValues =
+          Array.isArray(this.dataPorp.bussValues) && this.dataPorp.bussValues.length
+            ? this.dataPorp.bussValues
+            : Array.isArray(requestData.bussValues)
+            ? requestData.bussValues
+            : []
+        let bussValues = configuredBussValues.filter((v) => v !== undefined && v !== null && v !== '')
+        if (!bussValues.length) {
+          this.$message.error($lc('请配置附件分类'))
+          return
+        }
         requestData.bussId = requestData.bussId ?? this.fileData?.bussId ?? ''
-        requestData.bussValues = this.typeOptions.map((item) => item.type)
+        requestData.bussValues = bussValues
         FD.append('data', JSON.stringify(requestData))
 
-        this.batchUploading = true
         let { data } = await axios.post(
-          this.apiPrefix
+          (this.apiPrefix
             ? `${this.apiPrefix}/neams/eamsbaserecord/batchSaveFile`
-            : '/neams/eamsbaserecord/batchSaveFile',
+            : '/neams/eamsbaserecord/batchSaveFile') +
+            '?r=' +
+            Math.random(),
           FD,
           {
             headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
@@ -858,6 +892,10 @@ export default {
         )
 
         let responseList = Array.isArray(data) ? data : []
+        if (!responseList.length) {
+          this.$message.warning($lc('上传结果为空，请稍后重试'))
+          return
+        }
         let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
         rows.forEach((row) => {
           let type = row[this.keys.type]
@@ -879,8 +917,8 @@ export default {
           this.$emit('on-success', sourceFile?.raw, row)
         })
 
-        $uploadwrap.clearFiles()
-        $uploadwrap.fileList = []
+        $uploadwrap?.clearFiles?.()
+        $uploadwrap && ($uploadwrap.fileList = [])
         this.visibleBatch = false
       } catch (err) {
         this.$message.error(err?.msg || $lc('上传失败'))
@@ -889,7 +927,12 @@ export default {
       }
     },
     buildAutoMatchBatchRow(item) {
-      let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+      let userInfo = {}
+      try {
+        userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+      } catch (e) {
+        // sessionStorage 不可用时忽略
+      }
       let row = {
         ...item,
         _name: item.fileName,
@@ -898,7 +941,7 @@ export default {
         _typeDisabled: false,
         _uploadDisabled: true,
         _typeUpdating: false,
-        _shouldUpdateFileType: !item.attno,
+        _originalType: item.attno ?? '',
         _lastFileType: item.attno,
         _lastFileTypeName: item.attname,
         _lastBussValue: item.bussValue
@@ -908,15 +951,24 @@ export default {
       row[this.keys.name] = item.fileName
       row[this.keys.url] = this.keys.url === this.keys.rowKey ? item.beid : item.filePath || item.beid
       row[this.keys.time] = row[this.keys.time] || dayjs().format('YYYY-MM-DD HH:mm:ss')
-      row[this.keys.user] = row[this.keys.user] || userInfo.uname
+      row[this.keys.user] = row[this.keys.user] || (userInfo.uname ?? '')
       return row
     },
     handleTypeChange(row) {
       let type = row[this.keys.type]
       this.$emit('typeChange', type)
-      if (!row._shouldUpdateFileType || !type) {
+      if (!type || row._originalType === type) {
         return
       }
+      // 未识别类型的行手动选中类型后，删除该类型对应的占位行
+      if (!row._originalType) {
+        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.updateFileBuss(row, type)
     },
     async updateFileBuss(row, type) {
@@ -936,9 +988,11 @@ export default {
 
       try {
         await axios.post(
-          this.apiPrefix
+          (this.apiPrefix
             ? `${this.apiPrefix}/neams/eamsbaserecord/updateFlieBuss`
-            : '/neams/eamsbaserecord/updateFlieBuss',
+            : '/neams/eamsbaserecord/updateFlieBuss') +
+            '?r=' +
+            Math.random(),
           [
             {
               beid: row.beid,
@@ -962,6 +1016,7 @@ export default {
         this.$set(row, '_lastFileType', type)
         this.$set(row, '_lastFileTypeName', typeName)
         this.$set(row, '_lastBussValue', row.bussValue)
+        this.$set(row, '_originalType', type)
       } catch (err) {
         this.$set(row, this.keys.type, previousType)
         this.$set(row, 'attno', previousType)
@@ -979,7 +1034,7 @@ export default {
         [this.keys.name]: '',
         [this.keys.type]: this.bathType,
         [this.keys.time]: '',
-        [this.keys.user]: JSON.parse(sessionStorage.getItem('userInfo')).uname,
+        [this.keys.user]: this.getUserNameSafe(),
         _percent: 0,
         _status: undefined,
         _typeDisabled: false
@@ -1004,14 +1059,14 @@ export default {
 
         list.push(file)
         let $uploadwrap = this.$refs['upload-batch']
-        $uploadwrap.fileList = list
+        $uploadwrap && ($uploadwrap.fileList = list)
       }
     },
     batchRemove(file, fileList) {
       let list = fileList.filter((f) => f.uid !== file.uid)
 
       let $uploadwrap = this.$refs['upload-batch']
-      $uploadwrap.fileList = list
+      $uploadwrap && ($uploadwrap.fileList = list)
 
       this.$emit('on-remove', file)
     },
@@ -1144,7 +1199,12 @@ export default {
         let data = opt.data || this.fileData
 
         if (data) {
-          let dto = JSON.parse(data.data)
+          let dto
+          try {
+            dto = JSON.parse(data.data || '{}')
+          } catch (e) {
+            return Promise.reject({ msg: $lc('批量上传参数格式错误') })
+          }
           dto[this.keys.type] = this.bathType
           data.data = JSON.stringify(dto)
           for (let k in data) {