t20-common-lib 0.15.19 → 0.15.21

package/package.json

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

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

@@ -1,12 +0,0 @@
-/**
- * 电子档案 / 附件相关接口（与 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

@@ -1,242 +0,0 @@
-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 && 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 && 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/components/Amount.vue

@@ -58,7 +58,7 @@ export default {
   watch: {},
   methods: {
     changeFn(val) {
-      this.$emit('change', val)
+      this.$emit('change')
     }
   }
 }

package/packages/dynamic-form/src/components/AmountRange.vue

@@ -51,9 +51,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${val},${this._value2 || this._value2===0?this._value2 : ''}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${val},${this._value2 || this._value2===0?this._value2 : ''}`);
       },
     },
     _value2: {
@@ -64,9 +62,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${this._value1},${val || val===0?val : ''}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${this._value1},${val || val===0?val : ''}`);
       },
     },
   },

package/packages/dynamic-form/src/components/CheckboxGroup.vue

@@ -51,7 +51,6 @@ export default {
       set(value) {
         this.changeTime(value);
         this.$emit("input", value || []);
-        this.$emit("change", value || []);
       },
     },
   },

package/packages/dynamic-form/src/components/DMY.vue

@@ -79,9 +79,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${val}${this.value2}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${val}${this.value2}`);
       },
     },
     value2: {
@@ -94,9 +92,7 @@ export default {
         return "D";
       },
       set(val) {
-        const nextValue = `${this.value1}${val}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${this.value1}${val}`);
       },
     },
   },

package/packages/dynamic-form/src/components/Date.vue

@@ -30,7 +30,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/DateRange.vue

@@ -38,7 +38,6 @@ export default {
   methods: {
     changeTime(val) {
       this.$emit("input", val ? `${val[0]},${val[1]}` : '');
-      this.$emit("change", val ? `${val[0]},${val[1]}` : '');
     },
   },
   watch: {

package/packages/dynamic-form/src/components/Input.vue

@@ -34,7 +34,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/InputNumber.vue

@@ -30,7 +30,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
     _dNum() {

package/packages/dynamic-form/src/components/InputNumberRange.vue

@@ -24,7 +24,6 @@ export default {
     changeTime() {
       this.$emit("update:label", this.startValue + "~" + this.endValue);
       this.$emit("input", [this.startValue, this.endValue]);
-      this.$emit("change", [this.startValue, this.endValue]);
     },
   },
   watch: {

package/packages/dynamic-form/src/components/RadioGroup.vue

@@ -41,7 +41,6 @@ export default {
         let res = (this.items.options || []).find(row => row.value == value)
         this.$emit(`update:label`, res?.label)
         this.$emit('input', value)
-        this.$emit('change', value)
       }
     },
     _options: {

package/packages/dynamic-form/src/components/Rate.vue

@@ -39,7 +39,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/Select.vue

@@ -23,6 +23,7 @@
       :key="item.value + items.prop"
       :label="item.label | $l"
       :value="item.value"
+      :disabled="isOptionDisabled(item)"
     >
       {{labelKey ? item._label : item.label | $l}}
     </el-option>
@@ -57,6 +58,14 @@ export default {
         return {};
       },
     },
+    formData: {
+      type: Object,
+      default: () => ({})
+    },
+    groupProp: {
+      type: String,
+      default: ''
+    },
     label: {
       type: String,
       defalut: "",
@@ -91,6 +100,9 @@ export default {
     // 判断数据类型，格式化回显数据
     valueType() {
       return typeof this.value
+    },
+    optionDisableConfig() {
+      return this.items?.props?.optionDisable || {}
     }
   },
   watch: {
@@ -193,6 +205,44 @@ export default {
     clearFn() {
       this.options = this.optionsCopy
     },
+    /**
+     * 从 formData 读取控制字段值。
+     * 支持两种写法：
+     * - "group.field"（推荐）
+     * - "field"（默认读取当前 groupProp 下字段）
+     */
+    getControlValue(controlField) {
+      if (!controlField || !this.formData) return undefined
+      const path = String(controlField).split('.')
+      if (path.length >= 2) {
+        let cur = this.formData
+        for (let i = 0; i < path.length; i++) {
+          if (cur == null) return undefined
+          cur = cur[path[i]]
+        }
+        return cur
+      }
+      return this.groupProp ? this.formData?.[this.groupProp]?.[controlField] : this.formData?.[controlField]
+    },
+    /**
+     * 下拉项禁用规则（声明式）：
+     * items.props.optionDisable = {
+     *   controlField: 'groupA.ctrlType' 或 'ctrlType',
+     *   map: { 'A': ['v1', 'v2'], 'B': ['v3'] },
+     *   defaultDisabledValues: []
+     * }
+     */
+    isOptionDisabled(option) {
+      const cfg = this.optionDisableConfig
+      const controlField = cfg.controlField
+      const map = cfg.map || {}
+      const defaultDisabledValues = cfg.defaultDisabledValues || []
+      if (!controlField) return false
+      const controlValue = this.getControlValue(controlField)
+      const disabledValues = map[controlValue] || defaultDisabledValues
+      if (!Array.isArray(disabledValues)) return false
+      return disabledValues.some(v => String(v) === String(option?.value))
+    },
     changVariable(val){
       if (!val) {
         return val || "";

package/packages/dynamic-form/src/components/Switch.vue

@@ -25,7 +25,6 @@ export default {
       set(value) {
         this.$emit(`update:label`, value==1? this.$l('是'): this.$l('否'));
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/Textarea.vue

@@ -42,7 +42,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

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

@@ -78,8 +78,8 @@
       </N20-anchor-item>
     </N20-anchor>
     <div slot="footer">
-      <el-button type="primary" @click="submit('submit')">{{ $lc('提交') }}</el-button>
-      <el-button @click="submit('save')">{{ $lc('保存') }}</el-button>
+      <el-button type="primary" @click="submit('SUBMIT')">{{ $lc('提交') }}</el-button>
+      <el-button @click="submit('SAVE')">{{ $lc('保存') }}</el-button>
     </div>
   </T20-Form-Page>
 </template>
@@ -445,10 +445,10 @@ export default {
       })
     },
     // 第一步仅做模板渲染校验，提交逻辑后续步骤再扩展
-    async submit() {
+    async submit(operate) {
       const valid = await this.$refs.dynamicForms.validate()
       if (!valid) return
-      const payload = { formData: this.formData }
+      const payload = { formData: this.formData, operate }
       if (this.needFile) {
         payload.fileUploadTableData = (this.fileUploadTableData || []).filter(t => t.beid)
       }