t20-common-lib 0.15.18 → 0.15.20

package/package.json

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

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/main.vue

@@ -217,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: {
@@ -355,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），用于下拉等回显名称。