feat(composite): 新增 object/array 字段类型(refs 下钻 + 类型常量/配置)
- ShrimpFieldTypes 加 Object/Array - IFieldConfig 加 fields(object 嵌套字段) + item(array 元素配置,递归) - collectRefs 重构成 collectOne(单字段+值),加 object(遍历 fields)/array(遍历元素套 item) 分支 → refs 下钻覆盖 object/array 里的嵌套 relation。 显示/编辑组件在 shrimp-admin。第一版从简:无 min/max、无排序、无递归校验引擎。
This commit is contained in:
@@ -246,7 +246,7 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
b.ids.add(String(id))
|
||||
}
|
||||
for (const row of rows) {
|
||||
this.collectRefs(this.fields, (k) => row[k], add)
|
||||
for (const f of this.fields) this.collectOne(f, row[f.key], add)
|
||||
}
|
||||
if (buckets.size === 0) return {}
|
||||
const refs: Record<string, Record<string, any>> = {}
|
||||
@@ -263,16 +263,18 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
}
|
||||
|
||||
/** 递归收集 relation 引用:relation 叶子直接收;tab 按 value.type 进选中分支继续下钻(覆盖嵌套/tab套tab) */
|
||||
private collectRefs(fields: IFieldConfig[], valueOf: (key: string) => any, add: (moduleKey: string, labelKey: string, id: any) => void): void {
|
||||
for (const f of fields) {
|
||||
const v = valueOf(f.key)
|
||||
if (v == null) continue
|
||||
if (f.type === "relation" && f.relation) {
|
||||
;(Array.isArray(v) ? v : [v]).forEach((id: any) => id != null && add(f.relation!.moduleKey, f.relation!.labelKey, id))
|
||||
} else if (f.type === ShrimpFieldTypes.Tab && Array.isArray(f.tabs) && typeof v === "object") {
|
||||
const branch = f.tabs.find(t => t.key === v.type)
|
||||
if (branch) this.collectRefs(branch.fields, (k) => v[k], add)
|
||||
}
|
||||
/** 单个 (字段,值) 收集 relation 引用,递归复合(tab/object/array)。array 的 item 无 key —— 元素即值 */
|
||||
private collectOne(f: IFieldConfig, v: any, add: (moduleKey: string, labelKey: string, id: any) => void): void {
|
||||
if (v == null) return
|
||||
if (f.type === "relation" && f.relation) {
|
||||
;(Array.isArray(v) ? v : [v]).forEach((id: any) => id != null && add(f.relation!.moduleKey, f.relation!.labelKey, id))
|
||||
} else if (f.type === ShrimpFieldTypes.Tab && Array.isArray(f.tabs) && typeof v === "object") {
|
||||
const branch = f.tabs.find(t => t.key === v.type)
|
||||
if (branch) for (const c of branch.fields) this.collectOne(c, v[c.key], add)
|
||||
} else if (f.type === ShrimpFieldTypes.Object && Array.isArray(f.fields) && typeof v === "object") {
|
||||
for (const c of f.fields) this.collectOne(c, v[c.key], add)
|
||||
} else if (f.type === ShrimpFieldTypes.Array && f.item && Array.isArray(v)) {
|
||||
for (const el of v) this.collectOne(f.item, el, add)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user