wc24/shrimp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(refs): buildRefs 递归下钻 tab，覆盖嵌套 relation

Browse Source 
collectRefs 递归收集:relation 叶子直接收，tab 按 value.type 进选中分支继续下钻
(顺带覆盖 tab 套 tab)。refs 字典现含嵌套关联名(如 sellType.goods)，
为 tab 显示搬前端(子组件渲染 + relation 查 refs)铺好地基。
This commit is contained in:
wc24
2026-06-29 21:28:32 +08:00
parent eb339ccc49
commit e04d01a80c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Shrimp/ShrimpTableModule.ts
+24 -16
View File
@@ -239,23 +239,21 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
}
/**
* 顶层 relation 字段批量解析成 refs 字典: { moduleKey: { id: 显示名 } }。
* relation 字段(含 tab 分支里的嵌套 relation)批量解析成 refs 字典: { moduleKey: { id: 显示名 } }。
* 整页一次性、按模块各查一次 $in，去重；替代逐行注入 ${key}_label。前端显示时按 id 查名。
*/
private async buildRefs(rows: any[]): Promise<Record<string, Record<string, any>>> {
const relFields = this.getRelationFields()
if (relFields.length === 0 || rows.length === 0) return {}
if (rows.length === 0) return {}
const buckets = new Map<string, { labelKey: string; ids: Set<string> }>()
for (const row of rows) {
for (const f of relFields) {
const v = row[f.key]
if (v == null) continue
const { moduleKey, labelKey } = f.relation!
let b = buckets.get(moduleKey)
if (!b) buckets.set(moduleKey, (b = { labelKey, ids: new Set() }))
;(Array.isArray(v) ? v : [v]).forEach((id: any) => id != null && b!.ids.add(String(id)))
}
const add = (moduleKey: string, labelKey: string, id: any) => {
let b = buckets.get(moduleKey)
if (!b) buckets.set(moduleKey, (b = { labelKey, ids: new Set() }))
b.ids.add(String(id))
}
for (const row of rows) {
this.collectRefs(this.fields, (k) => row[k], add)
}
if (buckets.size === 0) return {}
const refs: Record<string, Record<string, any>> = {}
for (const [moduleKey, b] of buckets) {
const dict: Record<string, any> = {}
@@ -269,6 +267,20 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
return refs
}
/** 递归收集 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)
}
}
}
private excludeKeys(item: any, keys: string[]): any {
if (keys.length === 0) return item
const result = { ...item }
@@ -282,10 +294,6 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
return this.excludeKeys(item, this.fields.filter(f => f.hidden).map(f => f.key))
}
private getRelationFields(): IFieldConfig[] {
return this.fields.filter(f => f.type === "relation" && f.relation)
}
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
const { keyword, page, pageSize, sortBy, sortOrder, filter, ownerId } = query || {}
const p = page || 1