n20-common-lib 2.22.54 → 2.22.56

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -57,10 +57,10 @@
               <span v-if="requiredTypes.includes(row[keys.type])" style="color: red" class="m-r-s">*</span>
               <el-select
                 v-model="row[keys.type]"
-                :disabled="row._typeDisabled"
+                :disabled="row._typeDisabled || row._typeUpdating"
                 :placeholder="'请选择' | $lc"
                 style="width: calc(100% - 16px)"
-                @change="$emit('typeChange', row[keys.type])"
+                @change="handleTypeChange(row)"
               >
                 <el-option
                   v-for="item in typeOptions"
@@ -268,7 +268,13 @@
       :close-on-click-modal="false"
       :destroy-on-open="true"
     >
-      <el-select v-model="bathType" class="m-b-s w-100p" clearable @change="handleBathChange">
+      <el-select
+        v-if="!autoMatchBatchFileType"
+        v-model="bathType"
+        class="m-b-s w-100p"
+        clearable
+        @change="handleBathChange"
+      >
         <el-option
           v-for="item in typeOptions"
           :key="item.type"
@@ -278,7 +284,7 @@
         />
       </el-select>
       <Upload
-        v-if="bathType"
+        v-if="autoMatchBatchFileType || bathType"
         ref="upload-batch"
         class="n20-upload-drag"
         :msg-type="null"
@@ -305,7 +311,7 @@
         </template>
       </Upload>
       <div class="dialog-footer">
-        <el-button type="primary" @click="batchUploadFn">{{ '确认' | $lc }}</el-button>
+        <el-button type="primary" :loading="batchUploading" @click="batchUploadFn">{{ '确认' | $lc }}</el-button>
         <el-button plain @click="visibleBatch = false">{{ '取消' | $lc }}</el-button>
       </div>
     </Dialog>
@@ -435,6 +441,10 @@ export default {
       type: Boolean,
       default: false
     },
+    autoMatchBatchFileType: {
+      type: Boolean,
+      default: false
+    },
     showBatchPrint: {
       type: Boolean,
       default: false
@@ -503,6 +513,7 @@ export default {
       previewSameOrg: false,
       seeRow: {},
       officeStatus: false,
+      batchUploading: false,
       // 批量上传使用的文件数据（避免直接修改计算属性）
       _batchFileData: null
     }
@@ -757,11 +768,157 @@ export default {
         data: JSON.stringify(dto)
       }
     },
-    batchUploadFn() {
+    async batchUploadFn() {
+      if (this.autoMatchBatchFileType) {
+        await this.autoMatchBatchUpload()
+        return
+      }
       let $uploadwrap = this.$refs['upload-batch']
       // 直接提交上传，关闭对话框的逻辑在 batchSuccess 回调中处理
       $uploadwrap.submit()
     },
+    async autoMatchBatchUpload() {
+      let $uploadwrap = this.$refs['upload-batch']
+      let uploadFiles = $uploadwrap?.$refs?.upload?.uploadFiles || []
+      let files = uploadFiles.filter((item) => item.status === 'ready' && item.raw)
+      if (!files.length) {
+        this.$message.warning($lc('请先选择上传文件'))
+        return
+      }
+
+      try {
+        for (let item of files) {
+          let result = await $uploadwrap.beforeUploadFn(item.raw)
+          if (result === false) {
+            return
+          }
+        }
+
+        let FD = new FormData()
+        files.forEach((item) => {
+          FD.append('file', item.raw)
+        })
+
+        let remoteFileUpload = JSON.parse(this.fileData?.data || '{}')
+        remoteFileUpload.bussValues = this.typeOptions.map((item) => item.type)
+        FD.append('remoteFileUpload', JSON.stringify(remoteFileUpload))
+
+        this.batchUploading = true
+        let { data } = await axios.post(
+          this.apiPrefix
+            ? `${this.apiPrefix}/neams/eamsbaserecord/batchSaveFile`
+            : '/neams/eamsbaserecord/batchSaveFile',
+          FD,
+          {
+            headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
+            loading: false,
+            noMsg: true,
+            timeout: 900000
+          }
+        )
+
+        let responseList = Array.isArray(data) ? data : []
+        let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
+        this.tableData.splice(0, 0, ...rows)
+        let pendingFiles = [...files]
+        rows.forEach((row) => {
+          let fileIndex = pendingFiles.findIndex((item) => item.raw.name === row[this.keys.name])
+          let sourceFile = pendingFiles.splice(fileIndex > -1 ? fileIndex : 0, 1)[0]
+          this.$emit('on-success', sourceFile?.raw, row)
+        })
+
+        $uploadwrap.clearFiles()
+        $uploadwrap.fileList = []
+        this.visibleBatch = false
+      } catch (err) {
+        this.$message.error(err?.msg || $lc('上传失败'))
+      } finally {
+        this.batchUploading = false
+      }
+    },
+    buildAutoMatchBatchRow(item) {
+      let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+      let row = {
+        ...item,
+        _name: item.fileName,
+        _percent: 100,
+        _status: 'success',
+        _typeDisabled: false,
+        _typeUpdating: false,
+        _shouldUpdateFileType: !item.attno,
+        _lastFileType: item.attno,
+        _lastFileTypeName: item.attname,
+        _lastBussValue: item.bussValue
+      }
+      row[this.keys.rowKey] = item.beid
+      row[this.keys.type] = item.attno
+      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
+      return row
+    },
+    handleTypeChange(row) {
+      let type = row[this.keys.type]
+      this.$emit('typeChange', type)
+      if (!row._shouldUpdateFileType || !type) {
+        return
+      }
+      this.updateFileBuss(row, type)
+    },
+    async updateFileBuss(row, type) {
+      let previousType = row._lastFileType
+      let previousTypeName = row._lastFileTypeName
+      let previousBussValue = row._lastBussValue
+      let typeOption = this.typeOptions.find((item) => item.type === type)
+      let typeName = typeOption?.attname || typeOption?.label || ''
+      let bussValue = typeOption?.bussValue
+
+      this.$set(row, 'attno', type)
+      this.$set(row, 'attname', typeName)
+      if (bussValue !== undefined) {
+        this.$set(row, 'bussValue', bussValue)
+      }
+      this.$set(row, '_typeUpdating', true)
+
+      try {
+        await axios.post(
+          this.apiPrefix
+            ? `${this.apiPrefix}/neams/eamsbaserecord/updateFlieBuss`
+            : '/neams/eamsbaserecord/updateFlieBuss',
+          [
+            {
+              beid: row.beid,
+              reid: row.reid,
+              appno: row.appno,
+              syscode: row.syscode,
+              bussValue: row.bussValue,
+              bussId: row.bussId,
+              bussName: row.bussName,
+              attno: row.attno,
+              attname: row.attname,
+              filePath: row.filePath,
+              fileName: row.fileName,
+              fmid: row.fmid
+            }
+          ],
+          {
+            noMsg: true
+          }
+        )
+        this.$set(row, '_lastFileType', type)
+        this.$set(row, '_lastFileTypeName', typeName)
+        this.$set(row, '_lastBussValue', row.bussValue)
+      } catch (err) {
+        this.$set(row, this.keys.type, previousType)
+        this.$set(row, 'attno', previousType)
+        this.$set(row, 'attname', previousTypeName)
+        this.$set(row, 'bussValue', previousBussValue)
+        this.$message.error(err?.msg || $lc('附件类型更新失败'))
+      } finally {
+        this.$set(row, '_typeUpdating', false)
+      }
+    },
     batchSuccess(response, file, fileList) {
       // 创建完整的行对象，初始化状态字段
       let row = {

package/src/components/ShowColumn/index.vue

@@ -462,20 +462,14 @@ function saveTransform(list, labelKey, isFilter) {
   let listN = []
   if (!isFilter) {
     list.forEach((c) => {
-      if (c.prop && !c.children && !c.isNew && !c.width & !c.isNew) {
-        listN.push({ _colKey: 'prop', _colVal: c.prop })
-      } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
-        listN.push({ _colKey: 'type', _colVal: c.type })
-      } else {
-        let sFn = false
-        for (let k in c) {
-          if (typeof c[k] === 'function') sFn = true
-        }
-        if (sFn && c[labelKey]) {
-          listN.push({ _colKey: labelKey, _colVal: c[labelKey] })
-        } else {
-          listN.push(c)
-        }
+      const colKey = getColumnKey(c, labelKey)
+      // 已有列只保存稳定标识和用户设置，label 始终从当前 columns 中获取
+      if (colKey && !c.isNew && !c.remote) {
+        listN.push(createColumnReference(c, colKey))
+      }
+      // 用户新增列、远程列等没有本地定义可供回填，需要保留完整配置
+      else {
+        listN.push(c)
       }
     })
   } else {
@@ -494,6 +488,44 @@ function saveTransform(list, labelKey, isFilter) {
   return listN
 }
 
+const COLUMN_KEY_PRIORITY = ['columnKey', 'prop', 'slotName', 'field', 'type']
+const COLUMN_SETTING_KEYS = ['fixed', 'width', 'wrap', 'bold', 'align']
+
+function getColumnKey(column, labelKey = 'label') {
+  return COLUMN_KEY_PRIORITY.find(
+    (key) => key !== labelKey && column[key] !== undefined && column[key] !== null && column[key] !== ''
+  )
+}
+
+function createColumnReference(column, colKey) {
+  const entry = { _colKey: colKey, _colVal: column[colKey] }
+  COLUMN_SETTING_KEYS.forEach((key) => {
+    if (column[key] !== undefined) entry[key] = column[key]
+  })
+  return entry
+}
+
+function findCurrentColumn(savedColumn, columnsT, labelKey) {
+  if (savedColumn._colKey) {
+    const column = columnsT.find((c) => c[savedColumn._colKey] === savedColumn._colVal)
+    if (column) return column
+  }
+
+  // 兼容历史完整对象，以及曾使用翻译后 label 作为 _colKey 的数据
+  const colKey = getColumnKey(savedColumn, labelKey)
+  if (colKey) {
+    return columnsT.find((c) => c[colKey] === savedColumn[colKey])
+  }
+}
+
+function mergeColumnSettings(column, savedColumn) {
+  const settings = {}
+  COLUMN_SETTING_KEYS.forEach((key) => {
+    if (savedColumn[key] !== undefined) settings[key] = savedColumn[key]
+  })
+  return Object.keys(settings).length ? { ...column, ...settings } : column
+}
+
 function getTransform(list, columnsT, labelKey = 'label') {
   let columns = []
   list.forEach((d) => {
@@ -505,16 +537,15 @@ function getTransform(list, columnsT, labelKey = 'label') {
       column && columns.push(column)
       // 如果list中的每一项是对象
     } else if (typeof d === 'object') {
-      // 如果d中有_colKey属性
-      if (d._colKey) {
-        // 从columnsT中找到d._colKey等于d._colVal的项
-        let column = columnsT.find((c) => c[d._colKey] === d._colVal)
-        // 如果找到，则将其添加到columns中
-        column && columns.push(column)
-        // 如果d中没有_colKey属性
-      } else {
-        // 将d添加到columns中
+      const column = findCurrentColumn(d, columnsT, labelKey)
+      if (column) {
+        // 使用当前 columns 的完整定义（包括当前语言 label），仅合并用户设置
+        columns.push(mergeColumnSettings(column, d))
+      } else if (!d._colKey) {
+        // 用户新增列、远程列等没有本地定义，保持原有数据形态
         columns.push(d)
+      } else {
+        // _colKey 数据未匹配到当前列时沿用原行为：忽略已不存在的列
       }
     }
   })