wui-components-v2 1.1.83 → 1.1.84

package/components/form-control/form-control.vue

@@ -193,31 +193,26 @@ const subRelMonitor = computed(() =>
     // 仅当字段类型（extControlType）不在排除列表中才参与联动监听
     .filter((item: any) => !EXCLUDE_CONTROL_TYPES.includes(item.extControlType))
     .flatMap((item: any) =>
-      REL_FIELD_CONFIG
-        .map(({ key, assignment }) => {
-          const rel = (item as any)[key]
-          // subRelValueField：兼容嵌套在 rel 字段下，或 item 同级（仅 relValueField 兼容同级）
-          const subRel =
-            rel?.subRelValueField ||
-            (key === 'relValueField' ? (item as any).subRelValueField : undefined)
-          if (!rel || !subRel) return null
-          // 找到原始字段对象（props.fieldGroup.fields 中）：filteredFields 每次重算会浅拷贝生成新对象，
-          // 只改拷贝对象会在重算时丢失 max/min，因此同时持有原始对象引用，双写以保证不丢值
-          const rawItem =
-            (props.fieldGroup?.fields || []).find((f: any) => f.sourceId === item.sourceId) || item
-          return {
-            monitorKey: `${item.sourceId}__${key}`, // 唯一键，避免多 rel 字段共用 paramSourceId 相互干扰
-            item, // filteredFields 中的拷贝对象，直接改可立即触发模板更新
-            rawItem, // 原始字段对象，改它可在 filteredFields 重算后保留 max/min
-            itemSourceId: item.sourceId,
-            assignment, // 'value' | 'max' | 'min'
-            valueSourceKey: subRel.sourceId, // 从接口返回 fieldMap 取值所用的 key
-            paramSourceId: rel.sourceId || rel.id, // 请求参数来源字段
-            useA: !!rel.extRefPageId,
-            extRefPageId: rel.extRefPageId,
-          }
-        })
-        .filter((m: any) => m && m.paramSourceId && m.valueSourceKey)
+      REL_FIELD_CONFIG.map(({ key, assignment }) => {
+        const rel = (item as any)[key]
+        // subRelValueField：兼容嵌套在 rel 字段下，或 item 同级（仅 relValueField 兼容同级）
+        const subRel = rel?.subRelValueField || (key === 'relValueField' ? (item as any).subRelValueField : undefined)
+        if (!rel || !subRel) return null
+        // 找到原始字段对象（props.fieldGroup.fields 中）：filteredFields 每次重算会浅拷贝生成新对象，
+        // 只改拷贝对象会在重算时丢失 max/min，因此同时持有原始对象引用，双写以保证不丢值
+        const rawItem = (props.fieldGroup?.fields || []).find((f: any) => f.sourceId === item.sourceId) || item
+        return {
+          monitorKey: `${item.sourceId}__${key}`, // 唯一键，避免多 rel 字段共用 paramSourceId 相互干扰
+          item, // filteredFields 中的拷贝对象，直接改可立即触发模板更新
+          rawItem, // 原始字段对象，改它可在 filteredFields 重算后保留 max/min
+          itemSourceId: item.sourceId,
+          assignment, // 'value' | 'max' | 'min'
+          valueSourceKey: subRel.sourceId, // 从接口返回 fieldMap 取值所用的 key
+          paramSourceId: rel.sourceId || rel.id, // 请求参数来源字段
+          useA: !!rel.extRefPageId,
+          extRefPageId: rel.extRefPageId,
+        }
+      }).filter((m: any) => m && m.paramSourceId && m.valueSourceKey)
     )
 )
 const { setFieldValue, getFieldValue } = useFormFieldValues()
@@ -281,11 +276,23 @@ watch(
       const fromStore = getFieldValue(m.paramSourceId)
       const fromEntity = (props.entity as any)?.[m.paramSourceId]
       const finalVal =
-        local !== undefined && local !== '' ? local
-          : fromStore !== undefined && fromStore !== '' ? fromStore
-            : fromEntity !== undefined && fromEntity !== '' ? fromEntity
+        local !== undefined && local !== ''
+          ? local
+          : fromStore !== undefined && fromStore !== ''
+            ? fromStore
+            : fromEntity !== undefined && fromEntity !== ''
+              ? fromEntity
               : undefined
-      console.log(`[subRel] 来源取值 ${m.monitorKey} sourceId=${m.paramSourceId} | local=`, local, '| store=', fromStore, '| props.entity=', fromEntity, '=> 采用', finalVal)
+      console.log(
+        `[subRel] 来源取值 ${m.monitorKey} sourceId=${m.paramSourceId} | local=`,
+        local,
+        '| store=',
+        fromStore,
+        '| props.entity=',
+        fromEntity,
+        '=> 采用',
+        finalVal
+      )
       snapshot[m.monitorKey] = finalVal
     })
     return snapshot
@@ -295,10 +302,18 @@ watch(
       const val = newVal[m.monitorKey]
       const prev = lastSubRelSnapshot.value[m.monitorKey]
       lastSubRelSnapshot.value[m.monitorKey] = val
-      console.log('[subRel] 处理', m.monitorKey,
-        '| assignment=', m.assignment,
-        '| 参数来源sourceId=', m.paramSourceId,
-        '| 取到的值val=', val, '| 上次值prev=', prev)
+      console.log(
+        '[subRel] 处理',
+        m.monitorKey,
+        '| assignment=',
+        m.assignment,
+        '| 参数来源sourceId=',
+        m.paramSourceId,
+        '| 取到的值val=',
+        val,
+        '| 上次值prev=',
+        prev
+      )
       // 仅在选中值存在且发生变化时请求，避免无意义重复调用
       if (val !== undefined && val !== null && val !== '' && val !== prev) {
         try {
@@ -308,11 +323,11 @@ watch(
           if (m.useA) {
             api = topData
             apiName = '/v3/ltmpl/top-data'
-            param = { top: 1, code: val, sourceId: m.extRefPageId }
+            param = { top: 1, secondCriterion: val, sourceId: m.extRefPageId }
           } else {
             api = dtmplData
             apiName = '/v3/dtmpl/data'
-            param = { top: 1, code: val, sourceId: m.paramSourceId }
+            param = { top: 1, secondCriterion: val, sourceId: m.paramSourceId }
           }
           console.log('[subRel] >>> 发起请求', apiName, '参数=', param)
           const res = await api(param)
@@ -352,10 +367,12 @@ watch(
         }
       } else {
         // 没进请求分支：常见原因是 val 为空（跨页面没取到值）或值未变化
-        console.warn('[subRel] ✗ 未发起请求 ——',
+        console.warn(
+          '[subRel] ✗ 未发起请求 ——',
           val === undefined || val === null || val === ''
             ? `参数来源值 val 为空（跨页面存储未取到 sourceId=${m.paramSourceId} 的值）`
-            : `值未发生变化（prev=${prev}）`)
+            : `值未发生变化（prev=${prev}）`
+        )
       }
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.83",
+  "version": "1.1.84",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",