t20-common-lib 0.15.9 → 0.15.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.9",
+  "version": "0.15.11",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/dynamic-form/api/fileApi.js

@@ -0,0 +1,12 @@
+/**
+ * 电子档案 / 附件相关接口（与 Demo DynamicForm 一致）
+ */
+import service from '../../../src/utils/request'
+
+export function getByBussValue(data = {}) {
+  return service.post(`/api/neams/eamsattachfile/getByBussValue`, data)
+}
+
+export function getUploadedFile(data = {}) {
+  return service.post(`/api/neams/eamsbaserecord/queryList`, data)
+}

package/packages/dynamic-form/mixins/fileUpload.js

@@ -0,0 +1,241 @@
+import axios from 'axios'
+import { getByBussValue, getUploadedFile } from '../api/fileApi'
+
+function randomString(num) {
+  num = num || 32
+  const t = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'
+  const a = t.length
+  let n = ''
+  for (let i = 0; i < num; i++) n += t.charAt(Math.floor(Math.random() * a))
+  return n
+}
+
+function getBearerToken() {
+  return sessionStorage.getItem('token') || ''
+}
+
+export const fileUploadTableMixin = {
+  data() {
+    return {
+      fileUploadTableData: [],
+      fileAction: () => {},
+      seeTypes: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc)$/i,
+      dataPorp: {
+        fileAccept: '.rar,.zip,.doc,.docx,.pdf,image/*,.xls,.xlsx',
+        typeOptions: [],
+        multiple: false
+      },
+      mapdata: {}
+    }
+  },
+  methods: {
+    addRow() {
+      this.fileUploadTableData.splice(0, 0, {
+        id: 'n' + Math.random(),
+        type: '',
+        name: '',
+        time: '',
+        user: '',
+        _fileData: {}
+      })
+    },
+    downRows(rows) {
+      if (!rows || rows.length === 0) return this.$message.error('请选择数据')
+      const token = getBearerToken()
+      rows.map(item => {
+        axios({
+          method: 'POST',
+          url: '/api/neams/eamsbaserecord/downloadFile',
+          responseType: 'blob',
+          headers: {
+            charset: 'utf-8',
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+            timestamp: Date.now(),
+            OperationDesc: 'yYarJp',
+            requestKey: randomString(16)
+          },
+          data: { beid: item.beid }
+        })
+          .then(response => {
+            const resp = response.data
+            if (resp.type === 'application/octet-stream') {
+              if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                const blob = new Blob([resp], { type: 'application/zip' })
+                window.navigator.msSaveOrOpenBlob(blob, item.name)
+              } else {
+                const blob = new Blob([resp], { type: 'application/zip' })
+                const url = window.URL.createObjectURL(blob)
+                const link = document.createElement('a')
+                link.href = url
+                link.download = item.name
+                link.click()
+                URL.revokeObjectURL(url)
+              }
+            } else {
+              this.$message.error((this.$t && this.$t('common_w_0094')) || '下载失败' + '!')
+            }
+          })
+          .catch(error => this.$message.error(error))
+      })
+    },
+    deleteRows(rows) {
+      rows.forEach(row => {
+        const index = this.fileUploadTableData.findIndex(r => r.id === row.id)
+        if (index > -1 && !row.notBeDelete) {
+          this.fileUploadTableData.splice(index, 1)
+          this.$message.success('删除成功')
+        }
+      })
+    },
+    uploadRequest(options, row) {
+      const token = getBearerToken()
+      const { file } = options
+      const data = new FormData()
+      data.append('file', file)
+      data.append(
+        'data',
+        JSON.stringify({
+          syscode: this.uploadParam.syscode,
+          appno: this.uploadParam.appno,
+          bussValue: this.mapdata[row.type],
+          attno: row.type,
+          bussId: this.uploadParam?.paymentTemplate === 'REQUEST_PAYOUT' ? '' : this.uploadParam.bussId,
+          cltno: JSON.parse(sessionStorage.getItem('userInfo') || '{}').cltNo,
+          memo: file.name,
+          recordname: file.name,
+          fileSize: file.size
+        })
+      )
+      data.append('date', '2022-01-01 00:00:00' + ',2099-12-31 23:59:59')
+      return new Promise((resolve, reject) => {
+        axios
+          .post(`/api/neams/eamsbaserecord/batchSavejson`, data, {
+            headers: {
+              'Content-Type': 'multipart/form-data',
+              charset: 'utf-8',
+              timestamp: Date.now(),
+              Authorization: `Bearer ${token}`,
+              requestKey: randomString(16),
+              OperationDesc: 'yYarJp'
+            },
+            loading: false,
+            noMsg: true
+          })
+          .then(({ data: res }) => resolve(res))
+          .catch(err => reject(err))
+      })
+    },
+    getByBussValueFn() {
+      this.mapdata = {}
+      if (!this.uploadParam || !this.uploadParam.bussValue) return
+      if (this.uploadParam.bussValue.split(',').length > 1) {
+        this.dataPorp.typeOptions = []
+        this.uploadParam.bussValue.split(',').map(item => {
+          getByBussValue({
+            bussValue: item
+          }).then(res => {
+            res &&
+              res.map(t => {
+                this.dataPorp.typeOptions.push({
+                  ...t,
+                  type: t.attno,
+                  label: t.attname
+                })
+                this.mapdata[t.attno] = item
+              })
+          })
+        })
+        return
+      }
+      getByBussValue({
+        bussValue: this.uploadParam.bussValue
+      }).then(res => {
+        this.dataPorp.typeOptions = (res.data || []).map(item => {
+          item.type = item.attno
+          item.label = item.attname
+          this.mapdata[item.attno] = this.uploadParam.bussValue
+          return item
+        })
+      })
+    },
+    getUploadedFiles() {
+      if (!this.uploadParam) return
+      if (this.uploadParam.bussValue && this.uploadParam.bussValue.includes(',')) {
+        this.uploadParam.bussValue.split(',').map(async t => {
+          const rr = await getUploadedFile({
+            bussId: this.uploadParam?.bussId,
+            bussValue: t
+          })
+          const data = rr && rr.data != null ? rr.data : rr
+          this.fileUploadTableData = this.fileUploadTableData.concat(
+            (data || []).map(item => ({
+              id: item.beid,
+              beid: item.beid,
+              type: item.attno,
+              name: item.recordname,
+              time: item.updatetime,
+              user: item.creator,
+              url: item.filepath
+            }))
+          )
+        })
+        return
+      }
+      getUploadedFile({
+        bussValue: this.uploadParam.bussValue,
+        bussId: this.uploadParam.bussId
+      }).then(res => {
+        const list = res && res.data != null ? res.data : res
+        this.fileUploadTableData =
+          (list || []).map(item => {
+            item.type = item.attno
+            item.name = item.memo || item.recordname
+            item.time = item.uploadtime
+            item.user = item.creator
+            item.url = `/api/neams/eamsbaserecord/download/${item.beid}`
+            item._name = item.memo
+            return item
+          }) || []
+      })
+    },
+    onSuccess(file, row) {
+      const _fileData = file.response
+      this.$set(row, 'id', _fileData.data)
+      this.$set(row, 'bussValue', this.mapdata[row.type])
+      let userName = ''
+      try {
+        const raw = sessionStorage.getItem('User_Info') || sessionStorage.getItem('userInfo')
+        if (raw) userName = JSON.parse(raw).userName || ''
+      } catch (e) {
+        userName = ''
+      }
+      this.$set(row, 'user', userName)
+      this.$set(row, 'archiveId', _fileData.data)
+      this.$set(row, 'beid', _fileData.data)
+    },
+    onRemove(file) {
+      if (file.status === 'success') {
+        const { beid } = file.response
+        const i = this.fileUploadTableData.findIndex(d => d.id === beid)
+        if (i !== -1) this.fileUploadTableData.splice(i, 1)
+      }
+    }
+  },
+  watch: {
+    uploadParam: {
+      immediate: true,
+      deep: true,
+      handler() {
+        if (!this.needFile) return
+        if (!this.uploadParam) return
+        if (this.uploadParam.bussValue) {
+          this.getByBussValueFn()
+        }
+        if (this.uploadParam.bussId) {
+          this.getUploadedFiles()
+        }
+      }
+    }
+  }
+}

package/packages/dynamic-form/src/main.vue

@@ -52,6 +52,29 @@
           </template>
         </N20-anchor-item>
       </el-form>
+      <N20-anchor-item
+        v-if="needFile"
+        key="fileuploadtable"
+        id="fileuploadtable"
+        :title="$lc('附件信息')"
+      >
+        <N20-file-upload-table
+          v-if="!needFileDIY"
+          :action="fileAction"
+          :table-data="fileUploadTableData"
+          :see-types="seeTypes"
+          :show-batch-upload="false"
+          :data-porp="dataPorp"
+          :upload-http-request="uploadRequest"
+          :readonly="uploadReadOnly"
+          @on-success="onSuccess"
+          @on-remove="onRemove"
+          @add-row="addRow"
+          @down-rows="downRows"
+          @delete-rows="deleteRows"
+        />
+        <slot v-else name="fileUploadTable"></slot>
+      </N20-anchor-item>
     </N20-anchor>
     <div slot="footer">
       <el-button type="primary" @click="submit('submit')">{{ $lc('提交') }}</el-button>
@@ -68,7 +91,10 @@
  * 3. A 控制 B 可编辑 — setFieldEditable
  * 4. A 控制 B 值/名称回显或下拉项 — setFieldValue、setFieldLabelValue、setFieldOptions
  * 5. A 控制 B 渲染哪种组件 — setFieldElementType（须为 elementTypeChange 中已配置的枚举）
+ *
+ * fieldControlList：与 dynamicData 同时传入，仅在收到模版时按 fieldNo 与 elements[].prop 合并一次 isShow、showName→label、isRequired；之后渲染均以合并后的 mergedTemplateBase 为唯一数据源。
  */
+import { fileUploadTableMixin } from '../mixins/fileUpload'
 // 复用 Demo 中的字段组件，按模板的 elementType 动态渲染
 const context = require.context('./components/', true, /\.vue$/)
 const demoComponents = {}
@@ -82,6 +108,7 @@ export default {
   components: {
     ...demoComponents
   },
+  mixins: [fileUploadTableMixin],
   props: {
     title: {
       type: String,
@@ -100,6 +127,36 @@ export default {
     linkageMethod: {
       type: Function,
       default: null
+    },
+    /** 字段控制配置，与 dynamicData 一并传入；仅整合一次 */
+    fieldControlList: {
+      type: Array,
+      default: () => []
+    },
+    /** 是否展示附件锚点（默认关闭，不影响现有用法） */
+    needFile: {
+      type: Boolean,
+      default: false
+    },
+    /** true 时使用 fileUploadTable 插槽自定义附件区 */
+    needFileDIY: {
+      type: Boolean,
+      default: true
+    },
+    /** 电子档案 / 上传参数，与 Demo DynamicForm uploadParam 一致 */
+    uploadParam: {
+      type: Object,
+      default: () => ({
+        syscode: '060000000',
+        appno: '060500000',
+        bussValue: 'invest_041001001',
+        attno: 'invest_002',
+        bussId: null
+      })
+    },
+    uploadReadOnly: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -109,9 +166,11 @@ export default {
       // 右侧锚点当前定位项
       action: '',
       formAttrs: {},
+      // dynamicData + fieldControlList 合并后的模版快照；applyFieldStates 均从此克隆，不再直接用原始 dynamicData
+      mergedTemplateBase: null,
       // 运行时模板（动态表单渲染与联动状态都基于它）
       runtimeTemplate: { units: [] },
-      // 联动写入的 options / elementType：每次从 dynamicData 克隆模板后会合并回来，避免被重置清空
+      // 联动写入的 options / elementType：每次从 mergedTemplateBase 克隆后会合并回来，避免被重置清空
       linkageFieldOverrides: {},
       // 避免联动写值导致 watch 循环触发
       isApplyingLinkage: false,
@@ -205,10 +264,40 @@ export default {
         this.$emit('input', { ...this.formData })
       }
     },
+    /**
+     * 将 fieldControlList 合并进模版克隆（fieldNo 对应 elements[].prop）
+     */
+    mergeFieldControlIntoTemplate(templateClone) {
+      const list = this.fieldControlList
+      if (!templateClone?.units || !Array.isArray(list) || list.length === 0) return templateClone
+      const byFieldNo = Object.create(null)
+      list.forEach(row => {
+        if (row && row.fieldNo != null && row.fieldNo !== '') byFieldNo[row.fieldNo] = row
+      })
+      ;(templateClone.units || []).forEach(group => {
+        ;(group.elements || []).forEach(item => {
+          if (!item.prop) return
+          const cfg = byFieldNo[item.prop]
+          if (!cfg) return
+          if (cfg.isShow !== undefined && cfg.isShow !== null) {
+            item.isShow = this.templateShowOrEditable(cfg.isShow)
+          }
+          if (cfg.showName != null && String(cfg.showName).trim() !== '') {
+            item.label = cfg.showName
+          }
+          if (cfg.isRequired !== undefined && cfg.isRequired !== null) {
+            item.isRequired = this.templateRequired(cfg.isRequired)
+          }
+        })
+      })
+      return templateClone
+    },
     // 基于模板初始化：分组锚点、默认值、必填规则
     initializeFromTemplate() {
       this.linkageFieldOverrides = {}
-      this.runtimeTemplate = JSON.parse(JSON.stringify(this.dynamicData || { units: [] }))
+      const raw = JSON.parse(JSON.stringify(this.dynamicData || { units: [] }))
+      this.mergedTemplateBase = this.mergeFieldControlIntoTemplate(raw)
+      this.runtimeTemplate = JSON.parse(JSON.stringify(this.mergedTemplateBase))
       this.action = this.formGroups.length > 0 ? this.formGroups[0].prop : ''
       this.ensureFormDataShape()
       this.formGroups.forEach(group => {
@@ -328,7 +417,7 @@ export default {
       const prev = this.linkageFieldOverrides[groupProp][fieldProp] || {}
       this.$set(this.linkageFieldOverrides[groupProp], fieldProp, { ...prev, ...patch })
     },
-    /** 模板每次从 dynamicData 克隆后，把联动里改过的 options / elementType 写回对应字段 */
+    /** 模板每次从 mergedTemplateBase 克隆后，把联动里改过的 options / elementType 写回对应字段 */
     applyLinkageOverrides() {
       Object.keys(this.linkageFieldOverrides || {}).forEach(groupProp => {
         const fields = this.linkageFieldOverrides[groupProp]
@@ -369,9 +458,9 @@ export default {
       this.$emit('linkage', linkageApi)
     },
     applyFieldStates() {
-      if (!this.dynamicData?.units) return
+      if (!this.mergedTemplateBase?.units) return
       this.isApplyingLinkage = true
-      const nextTemplate = JSON.parse(JSON.stringify(this.dynamicData))
+      const nextTemplate = JSON.parse(JSON.stringify(this.mergedTemplateBase))
       this.rules = {}
       ;(nextTemplate.units || []).forEach(group => {
         group.isShow = this.templateShowOrEditable(group.isShow)
@@ -401,9 +490,11 @@ export default {
     async submit() {
       const valid = await this.$refs.dynamicForms.validate()
       if (!valid) return
-      this.$emit('submit', {
-        formData: this.formData
-      })
+      const payload = { formData: this.formData }
+      if (this.needFile) {
+        payload.fileUploadTableData = (this.fileUploadTableData || []).filter(t => t.beid)
+      }
+      this.$emit('submit', payload)
     }
   }
 }