n20-common-lib 2.22.66 → 2.22.69

package/package.json

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

package/src/components/FileUploadTable/index.vue

@@ -57,26 +57,30 @@
           <slot slot="header" slot-scope="scope" name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
           <slot slot-scope="{ row }" name="type" :row="row">
             <span v-if="readonly">{{ row[keys.type] | typeFiter(typeOptions) }}</span>
-            <div v-else class="flex-box flex-v">
+            <div v-else class="flex-box flex-v file-upload-table__type-cell">
               <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 || row._typeUpdating"
-                :placeholder="'请选择' | $lc"
-                style="width: calc(100% - 16px)"
-                @change="handleTypeChange(row)"
-              >
-                <el-option
-                  v-for="item in typeOptions"
-                  :key="item.type"
-                  :disabled="item.disabled"
-                  :value="item.type"
-                  :label="item.label"
-                />
-              </el-select>
+              <div class="file-upload-table__type-content">
+                <el-select
+                  v-model="row[keys.type]"
+                  :class="{ 'file-upload-table__type-error': row._typeError }"
+                  :disabled="row._typeDisabled || row._typeUpdating"
+                  :placeholder="'请选择' | $lc"
+                  style="width: 100%"
+                  @change="handleTypeChange(row)"
+                >
+                  <el-option
+                    v-for="item in typeOptions"
+                    :key="item.type"
+                    :disabled="item.disabled"
+                    :value="item.type"
+                    :label="item.label"
+                  />
+                </el-select>
+              </div>
             </div>
           </slot>
         </el-table-column>
+        <slot name="type-after"></slot>
         <el-table-column :label="'附件名称' | $lc" :prop="keys.name" sortable="custom">
           <slot slot="header" slot-scope="scope" name="name-header" :column="scope.column">{{ '附件名称' | $lc }}</slot>
           <slot slot-scope="{ row }" name="name" :row="row">
@@ -86,10 +90,11 @@
               v-title
               :value="row[keys.name] ? row[keys.name].replace(/\.[A-z0-9]+$/, '') : ''"
               disabled
-              :placeholder="'请输入' | $lc"
+              :placeholder="'上传后自动带出' | $lc"
             />
           </slot>
         </el-table-column>
+
         <el-table-column v-if="readonly" :label="'附件上传' | $lc" :prop="keys.name">
           <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column"
             >{{ '附件上传' | $lc }}
@@ -113,7 +118,7 @@
               :action="apiPrefix ? apiPrefix + action : action"
               :multiple="multiple"
               :headers="headers"
-              :disabled="!row[keys.type] || row._typeDisabled || row._uploadDisabled"
+              :disabled="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"
@@ -126,6 +131,7 @@
                     : onSuccessFn(response, file, fileList, row)
               "
               :on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
+              @click.native.capture="handleUploadClick($event, row)"
             />
           </slot>
         </el-table-column>
@@ -561,12 +567,19 @@ export default {
           return false
         }
         this.setTableData()
+        this.setSingleTypeForEmptyRows()
       },
       immediate: true,
       deep: true
     },
     tableKey() {
       this.initSortable()
+    },
+    tableData: {
+      handler() {
+        this.setSingleTypeForEmptyRows()
+      },
+      immediate: true
     }
   },
   mounted() {
@@ -844,11 +857,17 @@ export default {
 
         let requestData = JSON.parse(this.fileData?.data || '{}')
         requestData.bussId = requestData.bussId ?? this.fileData?.bussId ?? ''
-        requestData.bussValues = this.typeOptions.map((item) => item.type)
+        // bussValues 应为业务编码列表（与 updateFlieBuss/getByBussValues 契约一致），而非附件类型编号(attno)
+        let bussValues = [...new Set(this.typeOptions.map((item) => item.bussValue).filter(Boolean))]
+        requestData.bussValues = bussValues.length ? bussValues : [requestData.bussValue].filter(Boolean)
+        if (!requestData.bussValues.length) {
+          this.$message.warning($lc('附件类型业务编码缺失，无法自动识别上传，请检查附件类型配置'))
+          return
+        }
         FD.append('data', JSON.stringify(requestData))
 
         this.batchUploading = true
-        let { data } = await axios.post(
+        let res = await axios.post(
           this.apiPrefix
             ? `${this.apiPrefix}/neams/eamsbaserecord/batchSaveFile`
             : '/neams/eamsbaserecord/batchSaveFile',
@@ -861,7 +880,14 @@ export default {
           }
         )
 
-        let responseList = Array.isArray(data) ? data : []
+        // axios 封装会把 code:0 短路成 200 误判成功（utils/axios.js 拦截器 falsy 缺陷），此处必须二次校验
+        if (!res || Number(res.code) !== 200 || !Array.isArray(res.data)) {
+          throw { msg: (res && res.msg) || $lc('批量上传失败') }
+        }
+        let responseList = res.data
+        if (responseList.length < files.length) {
+          this.$message.warning($lc('部分文件上传失败，请检查附件列表'))
+        }
         let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
         rows.forEach((row) => {
           let type = row[this.keys.type]
@@ -879,7 +905,8 @@ export default {
         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]
+          if (fileIndex === -1) return // 匹配不到不消费文件，避免错配
+          let sourceFile = pendingFiles.splice(fileIndex, 1)[0]
           this.$emit('on-success', sourceFile?.raw, row)
         })
 
@@ -917,6 +944,9 @@ export default {
     },
     handleTypeChange(row) {
       let type = row[this.keys.type]
+      if (type) {
+        this.$set(row, '_typeError', false)
+      }
       this.$emit('typeChange', type)
       if (!row._shouldUpdateFileType || !type) {
         return
@@ -1022,6 +1052,32 @@ export default {
     addRow() {
       this.$emit('add-row')
     },
+    setSingleTypeForEmptyRows() {
+      if (this.readonly || this.typeOptions.length !== 1) {
+        return
+      }
+
+      let type = this.typeOptions[0].type
+      this.tableData.forEach((row) => {
+        let isEmptyRow = !row[this.keys.url] && !row[this.keys.name] && !row._name
+        if (isEmptyRow && !row[this.keys.type]) {
+          // 新增行可能由业务侧异步写入，通过监听数据确保唯一附件类型仍能自动带出。
+          this.$set(row, this.keys.type, type)
+          this.$set(row, '_typeError', false)
+        }
+      })
+    },
+    handleUploadClick(event, row) {
+      if (row[this.keys.type]) {
+        return
+      }
+
+      // 文件选择窗口打开前完成类型校验，避免用户选完文件后才收到错误提示。
+      event.preventDefault()
+      event.stopPropagation()
+      this.$set(row, '_typeError', true)
+      this.$message.warning($lc('请先选择附件类型'))
+    },
     downRows() {
       if (!this.selectionList.length) {
         return this.$message({
@@ -1304,4 +1360,16 @@ export default {
   color: #fff !important;
   background: #42b983 !important;
 }
+
+.file-upload-table__type-cell {
+  align-items: flex-start;
+}
+
+.file-upload-table__type-content {
+  width: calc(100% - 16px);
+}
+
+.file-upload-table__type-error .el-input__inner {
+  border-color: var(--color-danger);
+}
 </style>

package/src/i18n.json

@@ -9364,5 +9364,17 @@
     "th": "กลับไปยังขั้นตอนก่อนหน้า",
     "vi": "Quay lại bước trước",
     "ja": "前のステップに戻る"
+  },
+  "请先选择附件类型": {
+    "en": "Please select an attachment type",
+    "th": "โปรดเลือกประเภทไฟล์แนบ",
+    "vi": "Vui lòng chọn loại tệp đính kèm",
+    "ja": "添付ファイルの種類を選択してください"
+  },
+  "上传后自动带出": {
+    "en": "Automatically filled after upload",
+    "th": "กรอกโดยอัตโนมัติหลังอัปโหลด",
+    "vi": "Tự động điền sau khi tải lên",
+    "ja": "アップロード後に自動入力されます"
   }
 }