wui-components-v2 1.1.82 → 1.1.83

package/api/page.ts

@@ -112,3 +112,24 @@ export function deleteData(sourceId: string, code: string) {
     method: 'DELETE',
   })
 }
+
+// 关联字段联动：通过 relValueField 下选中值请求默认值
+// relValueField 下存在 extRefPageId 时请求 /v3/ltmpl/top-data，
+// 否则请求 /v3/dtmpl/data
+// topData 参数: { top: 1, code: 上一个表单拿到的值, sourceId: extRefPageId }
+// dtmplData 参数: { code: 选中值, sourceId: 参数来源字段 sourceId }
+export function topData(params: { top: number; code: any; sourceId: string }) {
+  return req({
+    url: `/v3/ltmpl/top-data`,
+    method: 'GET',
+    data: params,
+  })
+}
+
+export function dtmplData(params: { top: number; code: any; sourceId: string }) {
+  return req({
+    url: `/v3/dtmpl/data`,
+    method: 'GET',
+    data: params,
+  })
+}

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

@@ -6,13 +6,14 @@ import type { Enums, Fields, Groups } from '../../type'
 import WuiSelectPopup from '../wui-select-popup/wui-select-popup.vue'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
 import { useCompanyFieldFilter } from '../../composables/useCompanyFieldFilter'
+import { useFormFieldValues } from '../../composables/useFormFieldValues'
 import customSelectPicker from '../custom-select-picker/custom-select-picker.vue'
 import CustomDatePicker from '../custom-date-picker/custom-date-picker.vue'
 import addAddressPage from '../add-address-page/add-address-page.vue'
 import userChoose from '../user-choose/user-choose.vue'
 import { generateHighResolutionID } from '../../utils/index'
 import scanInput from '../scan-input/scan-input.vue'
-// import { enums } from '../../api/page'
+import { dtmplData, topData } from '../../api/page'
 defineOptions({
   name: 'FormControl',
 })
@@ -153,14 +154,215 @@ const shouldMonitor = computed(() => {
     .map((innerItem: any) => ({
       id: innerItem.sourceId,
       title: innerItem.title,
-      relValueField: innerItem.relValueField.id,
-      relValueField3: innerItem.relValueField3.id,
+      relValueField: innerItem.relValueField?.id,
+      relValueField3: innerItem.relValueField3?.id,
     }))
   console.log('shouldMonitor:', newList)
   return newList
 })
 //-e
 
+//-s subRelValueField 联动
+// 当当前项存在 relValueField 且其下存在 subRelValueField 时，
+// 通过 relValueField 下的 sourceId（无则回退到 id）获取表单对应选中值，
+// 将其作为参数请求接口 /aa，并把返回值作为默认值赋给当前项
+// 以下类型的字段不参与 subRelValueField 联动监听
+const EXCLUDE_CONTROL_TYPES = [
+  'relselect',
+  'refselect',
+  'entity-select',
+  'relselect-extdis',
+  'relselectvalue',
+  'entity-select-value',
+  'table-entity-select',
+  'lab-tree-select',
+  'tree-entity-select',
+  'ltree-entity-select',
+  'ltree-entity-select-value',
+  'tree-entity-select-value',
+]
+// 三类关联字段：relValueField（默认值）、relMaxValueField（最大值）、relMinValueField（最小值）
+// assignment 决定把接口返回值赋到哪：value→当前项值，max→item.max，min→item.min
+const REL_FIELD_CONFIG = [
+  { key: 'relValueField', assignment: 'value' },
+  { key: 'relMaxValueField', assignment: 'max' },
+  { key: 'relMinValueField', assignment: 'min' },
+]
+const subRelMonitor = computed(() =>
+  fields.value
+    // 仅当字段类型（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)
+    )
+)
+const { setFieldValue, getFieldValue } = useFormFieldValues()
+// 把本表单每个字段的选中值同步到跨表单共享存储，
+// 供后续表单通过 relValueField.sourceId 读取上一个表单的选中值
+watch(
+  () => model.value,
+  val => {
+    for (const key in val) {
+      if (Object.prototype.hasOwnProperty.call(val, key)) {
+        setFieldValue(key, val[key])
+      }
+    }
+  },
+  { deep: true }
+)
+
+// 输入裁剪：对设置了 min/max 的字段，输入值超出范围时自动纠正到边界
+const fieldConstraints = computed(() => {
+  const map: Record<string, { min?: number; max?: number }> = {}
+  for (const item of fields.value) {
+    const rawMin = item.min
+    const rawMax = item.max
+    const min = rawMin !== undefined && rawMin !== null && rawMin !== '' ? Number(rawMin) : undefined
+    const max = rawMax !== undefined && rawMax !== null && rawMax !== '' ? Number(rawMax) : undefined
+    if (min !== undefined || max !== undefined) {
+      map[item.sourceId] = { min, max }
+    }
+  }
+  return map
+})
+watch(
+  () => model.value,
+  val => {
+    for (const sourceId in fieldConstraints.value) {
+      const { min, max } = fieldConstraints.value[sourceId]
+      const v = (val as any)[sourceId]
+      if (v === undefined || v === null || v === '') continue
+      const num = Number(v)
+      if (isNaN(num)) continue
+      let fixed = num
+      if (min !== undefined && num < min) fixed = min
+      if (max !== undefined && num > max) fixed = max
+      if (fixed !== num) {
+        ;(model.value as any)[sourceId] = fixed
+        console.log('[subRel] 裁剪输入', sourceId, '从', v, '→', fixed, '(min=', min, 'max=', max, ')')
+      }
+    }
+  },
+  { deep: true }
+)
+
+console.log('[subRel] 命中联动项:', subRelMonitor.value)
+const lastSubRelSnapshot = ref<Record<string, any>>({})
+watch(
+  () => {
+    const snapshot: Record<string, any> = {}
+    subRelMonitor.value.forEach((m: any) => {
+      // 取值优先级：本表单 model > 跨页面存储 > props.entity（兜底）
+      const local = model.value[m.paramSourceId]
+      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
+              : undefined
+      console.log(`[subRel] 来源取值 ${m.monitorKey} sourceId=${m.paramSourceId} | local=`, local, '| store=', fromStore, '| props.entity=', fromEntity, '=> 采用', finalVal)
+      snapshot[m.monitorKey] = finalVal
+    })
+    return snapshot
+  },
+  async newVal => {
+    for (const m of subRelMonitor.value as any[]) {
+      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)
+      // 仅在选中值存在且发生变化时请求，避免无意义重复调用
+      if (val !== undefined && val !== null && val !== '' && val !== prev) {
+        try {
+          let api: any
+          let apiName: string
+          let param: any
+          if (m.useA) {
+            api = topData
+            apiName = '/v3/ltmpl/top-data'
+            param = { top: 1, code: val, sourceId: m.extRefPageId }
+          } else {
+            api = dtmplData
+            apiName = '/v3/dtmpl/data'
+            param = { top: 1, code: val, sourceId: m.paramSourceId }
+          }
+          console.log('[subRel] >>> 发起请求', apiName, '参数=', param)
+          const res = await api(param)
+          // =========================================================
+          // 【赋值点】接口返回结构：
+          // { entities: [ { fieldMap: { sourceId: 值, ... } } ] }
+          // 需从 entities[0].fieldMap[目标sourceId] 取出真正要填的值
+          // =========================================================
+          console.log('[subRel] <<< 接口返回 res =', res)
+          const entity = (res as any)?.entities?.[0]
+          const fieldMap = entity?.fieldMap || {}
+          console.log('[subRel] fieldMap =', fieldMap)
+          // 用 subRelValueField.sourceId 作为 key 从 fieldMap 取出默认值
+          const value = fieldMap[m.valueSourceKey]
+          console.log('[subRel] 用 key', m.valueSourceKey, '从 fieldMap 取出值 =', value)
+          if (value !== undefined && value !== null) {
+            // 根据 assignment 决定赋值位置：
+            // value → 当前项默认值(model[sourceId])；max → item.max；min → item.min
+            if (m.assignment === 'max') {
+              // 双写：拷贝对象立即更新模板；原始对象在 filteredFields 重算后保留
+              m.item.max = value
+              m.rawItem.max = value
+              console.log('[subRel] ✓ 已设置最大值 item.max =', value, '(sourceId=', m.itemSourceId, ')')
+            } else if (m.assignment === 'min') {
+              m.item.min = value
+              m.rawItem.min = value
+              console.log('[subRel] ✓ 已设置最小值 item.min =', value, '(sourceId=', m.itemSourceId, ')')
+            } else {
+              model.value[m.itemSourceId] = value
+              console.log('[subRel] ✓ 已赋值默认值 model[', m.itemSourceId, '] =', value)
+            }
+          } else {
+            console.warn('[subRel] ⚠ fieldMap 中未找到 key', m.valueSourceKey, '，未赋值')
+          }
+        } catch (e) {
+          console.error('[subRel] 关联默认值请求失败:', e)
+        }
+      } else {
+        // 没进请求分支：常见原因是 val 为空（跨页面没取到值）或值未变化
+        console.warn('[subRel] ✗ 未发起请求 ——',
+          val === undefined || val === null || val === ''
+            ? `参数来源值 val 为空（跨页面存储未取到 sourceId=${m.paramSourceId} 的值）`
+            : `值未发生变化（prev=${prev}）`)
+      }
+    }
+  },
+  { immediate: true }
+)
+//-e subRelValueField 联动
+
 // 存储变化后的数据，{ [fieldKey]: newValue, ... }
 const changedData = ref<Record<string, any>>({})
 const initialModel = ref<Record<string, any>>({})
@@ -351,6 +553,8 @@ console.log('clearValueMap', clearValueMap)
             <wd-input
               v-model="model[item.sourceId]"
               type="number"
+              :min="Number(item.min || 0)"
+              :max="Number(item.max || Infinity)"
               :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
               :placeholder="`请输入${item.title}`"

package/components/wui-tabbar/wui-tabbar.vue

@@ -26,7 +26,14 @@ const { activeTabbar, getTabbarItemValue, setTabbarItemActive, tabbarList } = us
 
 function handleTabbarChange({ value }: { value: string }) {
   setTabbarItemActive(value)
-  router.pushTab({ name: value })
+  const item = tabbarList.value.find(item => item.name === value)
+  if (item && item.query && item.pagePath) {
+    const params = Object.entries(item.query).map(([k, v]) => `${k}=${v}`).join('&')
+    uni.navigateTo({ url: `/${item.pagePath}?${params}` })
+  }
+  else {
+    router.pushTab({ name: value })
+  }
 }
 
 onMounted(() => {

package/composables/useFormFieldValues.ts

@@ -0,0 +1,73 @@
+/**
+ * 跨表单、跨页面共享字段选中值。
+ * 按 sourceId 存储，供后续表单/页面通过 relValueField.sourceId
+ * 读取上一个表单/页面的选中值。
+ * 使用本地持久化存储（uni.setStorageSync / localStorage），
+ * 跨组件实例、跨页面、跨路由均有效，不依赖 JS 实例是否重建。
+ */
+const STORAGE_KEY = 'FORM_FIELD_VALUES'
+
+function readStore(): Record<string, any> {
+  try {
+    // uni-app 环境
+    if (typeof uni !== 'undefined' && uni.getStorageSync) {
+      return uni.getStorageSync(STORAGE_KEY) || {}
+    }
+  } catch (e) {
+    // ignore
+  }
+  try {
+    // H5 / 浏览器回退
+    if (typeof localStorage !== 'undefined') {
+      const raw = localStorage.getItem(STORAGE_KEY)
+      return raw ? JSON.parse(raw) : {}
+    }
+  } catch (e) {
+    // ignore
+  }
+  return {}
+}
+
+function writeStore(data: Record<string, any>) {
+  try {
+    if (typeof uni !== 'undefined' && uni.setStorageSync) {
+      uni.setStorageSync(STORAGE_KEY, data)
+      return
+    }
+  } catch (e) {
+    // ignore
+  }
+  try {
+    if (typeof localStorage !== 'undefined') {
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(data))
+    }
+  } catch (e) {
+    // ignore
+  }
+}
+
+export function useFormFieldValues() {
+  function setFieldValue(sourceId: string, value: any) {
+    if (sourceId == null) return
+    const data = readStore()
+    data[sourceId] = value
+    writeStore(data)
+    console.log('[store] set', sourceId, '=', value)
+  }
+  function getFieldValue(sourceId: string) {
+    if (sourceId == null) return undefined
+    const v = readStore()[sourceId]
+    console.log('[store] get', sourceId, '=>', v, '| 当前完整存储:', readStore())
+    return v
+  }
+  function removeFieldValue(sourceId: string) {
+    if (sourceId == null) return
+    const data = readStore()
+    delete data[sourceId]
+    writeStore(data)
+  }
+  function clearAll() {
+    writeStore({})
+  }
+  return { setFieldValue, getFieldValue, removeFieldValue, clearAll }
+}

package/composables/useTabbar.ts

@@ -8,6 +8,8 @@ export interface TabbarItem {
   icon: string
   activeIcon?: string // 激活状态自定义图标路径
   inactiveIcon?: string // 未激活状态自定义图标路径
+  query?: Record<string, string> // 跳转时携带的 URL 参数
+  pagePath?: string // 页面路径，配合 query 使用
 }
 export function useTabbar(tabbarItems: TabbarItem[]) {
   const tabbarList = ref<TabbarItem[]>([...tabbarItems])

package/package.json

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