t20-common-lib 0.15.17 → 0.15.19

package/package.json

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

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

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

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

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

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

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

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

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

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

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

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

@@ -38,6 +38,7 @@ 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/Dialog.vue

@@ -118,7 +118,7 @@ export default {
     },
     async changeFn(val) {
       let item = Array.isArray(this.options) ? this.options.find(t => t.value == val) : {}
-      this.$emit('change', item || {})
+      this.$emit('change', val, item || {})
     },
     async init() {
       if (!this.items?.api?.apiUrl || !this.items?.api?.requestMethod) {

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

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

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

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

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

@@ -24,6 +24,7 @@ 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/LazySelect.vue

@@ -243,7 +243,7 @@ export default {
     },
     changeFn(val) {
       let item = this.options.find(t => t.value == val);
-      this.$emit("change", item)
+      this.$emit("change", val, item)
     },
     changVariable(val){
       if (val == '${inputValue}') return this.useDefaule ? (this.items?.api?.defaultInputValue || this.label ||this._value || "") : this.query;

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

@@ -41,6 +41,7 @@ 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,6 +39,7 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
+        this.$emit("change", value);
       },
     },
   },

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

@@ -129,7 +129,7 @@ export default {
     },
     changeTree(val) {
       let item = this.options.find(t => t[this.items?.api?.valueKey] == val)
-      this.$emit('change', item)
+      this.$emit('change', val, item)
     }
   }
 }

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

@@ -25,6 +25,7 @@ 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,6 +42,7 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
+        this.$emit("change", value);
       },
     },
   },

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

@@ -86,14 +86,8 @@
 
 <script>
 /**
- * 联动能力（由 linkageMethod / linkage 事件在页面侧编写逻辑）：
- * 1. A 控制 B 显隐 — setFieldShow
- * 2. A 控制 B 必填 — setFieldRequired
- * 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 为唯一数据源。
+ * fieldControlList：与 dynamicData 同时传入，仅在收到模版时按 fieldNo 与 elements[].prop
+ * 合并一次 isShow、showName→label、isRequired；之后渲染均以合并后的 mergedTemplateBase 为唯一数据源。
  */
 import { fileUploadTableMixin } from '../mixins/fileUpload'
 // 复用 Demo 中的字段组件，按模板的 elementType 动态渲染
@@ -124,11 +118,6 @@ export default {
       type: Object,
       default: () => ({})
     },
-    // 页面侧联动处理函数，由外部自由编排联动逻辑
-    linkageMethod: {
-      type: Function,
-      default: null
-    },
     /** 字段控制配置，与 dynamicData 一并传入；仅整合一次 */
     fieldControlList: {
       type: Array,
@@ -173,7 +162,7 @@ export default {
       runtimeTemplate: { units: [] },
       // 联动写入的 options / elementType：每次从 mergedTemplateBase 克隆后会合并回来，避免被重置清空
       linkageFieldOverrides: {},
-      // 避免联动写值导致 watch 循环触发
+      // 避免重建模板过程中 watch 循环触发
       isApplyingLinkage: false,
       // 模板字段类型 -> 组件名映射；后续扩展新组件时在这里补
       elementTypeChange: {
@@ -228,15 +217,10 @@ export default {
       deep: true,
       handler() {
         if (this.isApplyingLinkage) return
+        // 编辑场景下 value 可能由页面先行组装，等模板就绪后仅补齐缺失字段，不覆盖已传数据。
+        if (!this.formGroups.length) return
         this.ensureFormDataShape()
       }
-    },
-    formData: {
-      deep: true,
-      handler() {
-        if (this.isApplyingLinkage) return
-        this.applyFieldStates()
-      }
     }
   },
   methods: {
@@ -366,14 +350,11 @@ export default {
     },
     setFieldValue(groupProp, fieldProp, value) {
       const sourceFormData = this.formData && typeof this.formData === 'object' ? this.formData : {}
-      const groupData = {
-        ...(sourceFormData[groupProp] || {})
-      }
-      groupData[fieldProp] = value
-      this.formData = {
-        ...sourceFormData,
-        [groupProp]: groupData
+      if (!sourceFormData[groupProp] || typeof sourceFormData[groupProp] !== 'object' || Array.isArray(sourceFormData[groupProp])) {
+        this.$set(sourceFormData, groupProp, {})
       }
+      this.$set(sourceFormData[groupProp], fieldProp, value)
+      this.$emit('input', sourceFormData)
     },
     /**
      * 场景4：与 value 配套的展示字段（模板里的 nameProp），用于下拉等回显名称。
@@ -435,29 +416,6 @@ export default {
         })
       })
     },
-    buildLinkageApi() {
-      return {
-        formData: this.formData,
-        formGroups: this.formGroups,
-        getGroup: this.getGroup,
-        getField: this.getField,
-        setGroupShow: this.setGroupShow,
-        setFieldShow: this.setFieldShow,
-        setFieldRequired: this.setFieldRequired,
-        setFieldEditable: this.setFieldEditable,
-        setFieldValue: this.setFieldValue,
-        setFieldLabelValue: this.setFieldLabelValue,
-        setFieldOptions: this.setFieldOptions,
-        setFieldElementType: this.setFieldElementType
-      }
-    },
-    runExternalLinkage() {
-      const linkageApi = this.buildLinkageApi()
-      if (typeof this.linkageMethod === 'function') {
-        this.linkageMethod(linkageApi)
-      }
-      this.$emit('linkage', linkageApi)
-    },
     applyFieldStates() {
       if (!this.mergedTemplateBase?.units) return
       this.isApplyingLinkage = true
@@ -473,14 +431,13 @@ export default {
       })
       this.runtimeTemplate = nextTemplate
       this.applyLinkageOverrides()
-      this.runExternalLinkage()
       this.formGroups.forEach(group => {
         ;(group.elements || []).forEach(item => {
           this.setFieldRule(group.prop, item)
         })
       })
       this.$nextTick(() => {
-        // linkageMethod 过程中可能改写显隐/必填规则，统一清理校验态，避免联动触发页面校验提示。
+        // 模板重建后统一清理校验态，避免规则变化导致页面出现历史校验提示。
         if (this.$refs.dynamicForms && typeof this.$refs.dynamicForms.clearValidate === 'function') {
           this.$refs.dynamicForms.clearValidate()
         }