feat(relation): 用整页 refs 字典替代逐行 _label
list 响应新增 refs: { moduleKey: { id: 显示名 } },整页一次性按模块批量查、去重;
去掉 relation 的 populateItems→${key}_label 逐行注入。前端显示时按 id 查 refs。
tab 的 resLabel/_label 不动(留待复合那步)。这是嵌套引用的地基:collectRefs 以后加
tab 的 children() 下钻即可覆盖任意深度。
This commit is contained in:
@@ -230,22 +230,45 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
|
||||
private async prepareResponseItems(items: any[]): Promise<any[]> {
|
||||
if (items.length === 0) return items
|
||||
const populates = this.getRelationPopulates()
|
||||
if (populates.length > 0 && this.dataSource.populateItems) {
|
||||
await this.dataSource.populateItems(items, populates, this.root.crudRegistry)
|
||||
}
|
||||
return Promise.all(items.map(item => this.processResItem(item)))
|
||||
}
|
||||
|
||||
private async prepareResponseItem(item: any): Promise<any> {
|
||||
if (!item) return item
|
||||
const populates = this.getRelationPopulates()
|
||||
if (populates.length > 0 && this.dataSource.populateItems) {
|
||||
await this.dataSource.populateItems([item], populates, this.root.crudRegistry)
|
||||
}
|
||||
return this.processResItem(item)
|
||||
}
|
||||
|
||||
/**
|
||||
* 顶层 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 {}
|
||||
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 refs: Record<string, Record<string, any>> = {}
|
||||
for (const [moduleKey, b] of buckets) {
|
||||
const dict: Record<string, any> = {}
|
||||
const crud = this.root.crudRegistry.get(moduleKey)
|
||||
if (crud && b.ids.size > 0) {
|
||||
const res = await crud.list({ where: { _id: { in: Array.from(b.ids) } }, limit: b.ids.size })
|
||||
for (const d of res.list as any[]) dict[String(d._id)] = d[b.labelKey]
|
||||
}
|
||||
refs[moduleKey] = dict
|
||||
}
|
||||
return refs
|
||||
}
|
||||
|
||||
private excludeKeys(item: any, keys: string[]): any {
|
||||
if (keys.length === 0) return item
|
||||
const result = { ...item }
|
||||
@@ -263,14 +286,6 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
return this.fields.filter(f => f.type === "relation" && f.relation)
|
||||
}
|
||||
|
||||
private getRelationPopulates(): IShrimpPopulate[] {
|
||||
return this.getRelationFields().map(f => ({
|
||||
key: f.key,
|
||||
moduleKey: f.relation!.moduleKey,
|
||||
labelKey: f.relation!.labelKey,
|
||||
}))
|
||||
}
|
||||
|
||||
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
|
||||
const { keyword, page, pageSize, sortBy, sortOrder, filter, ownerId } = query || {}
|
||||
const p = page || 1
|
||||
@@ -339,6 +354,7 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
const result = await this.dataSource.list(shrimpQuery)
|
||||
result.list = await this.prepareResponseItems(result.list)
|
||||
result.list = result.list.map(item => this.filterHidden(item))
|
||||
result.refs = await this.buildRefs(result.list)
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user