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

revert(tab): 撤回 v0.6.5 嵌套 relation 解析，回到 format 纯展示

Browse Source 
populateTabRelations / format 第二参是 tab 专属特例,太狭隘(object/array 同类问题未覆盖),
通用复合解析另当专门事做。嵌套关联名(如商品名)的展示需求改放业务侧(模块重写 list/get)。
框架只保留: format(同步纯展示) + stringify/parse(可逆往返)。
This commit is contained in:
wc24
2026-06-29 17:33:52 +08:00
parent bc54b475cf
commit ee35b47f69
3 changed files with 4 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "shrimp-server",
"version": "0.6.5",
"version": "0.6.6",
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
"main": "dist/main/index.js",
"types": "dist/main/index.d.ts",
src/IShrimpType.ts
+2 -3
View File
@@ -278,9 +278,8 @@ export interface IFieldConfig {
rules?: IFieldRule[] // 通用验证规则（前后端共用）
/** tab 类型专用：每个 type 对应的子字段配置 */
tabs?: { key: any; label: ILabel; fields: IFieldConfig[] }[]
/** tab 类型专用：展示文本(表格列 `${key}_label`)，给人看、可有损好看，默认 JSON.stringify。
* relLabels 是已解析的子 relation 名(`{childKey: 名 | 名[]}`)，单选为名、multiple 为名数组 */
format?: (value: any, relLabels?: Record<string, any>) => string
/** tab 类型专用：展示文本(表格列 `${key}_label`)，给人看、可有损好看，默认 JSON.stringify */
format?: (value: any) => string
/** tab 类型专用：export 序列化，须与 parse 可逆(机器往返)，默认 JSON.stringify */
stringify?: (value: any) => string
/** tab 类型专用：import 反序列化，须与 stringify 可逆，默认 JSON.parse */
src/Shrimp/ShrimpTableModule.ts
+1 -57
View File
@@ -61,8 +61,7 @@ export const defaultTypeHandlers: Record<string, IFieldTypeHandler> = {
return value
},
// 本体原样下发对象(不再 stringify)；展示文本走 _label，用 format(给人看,可有损)
// 第二参是已批量解析的子 relation 名(item.__tabRel[field.key])，让 format 能显示关联名而非 id
resLabel: (value, field, item) => (field.format ?? JSON.stringify)(value, item?.__tabRel?.[field.key]),
resLabel: (value, field) => (field.format ?? JSON.stringify)(value),
},
}
@@ -226,7 +225,6 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
result[`${field.key}_label`] = handler.resLabel(result[field.key], field, result)
}
}
delete result.__tabRel // 临时挂的子 relation 解析结果，不下发
return result
}
@@ -236,7 +234,6 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
if (populates.length > 0 && this.dataSource.populateItems) {
await this.dataSource.populateItems(items, populates, this.root.crudRegistry)
}
await this.populateTabRelations(items)
return Promise.all(items.map(item => this.processResItem(item)))
}
@@ -246,62 +243,9 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
if (populates.length > 0 && this.dataSource.populateItems) {
await this.dataSource.populateItems([item], populates, this.root.crudRegistry)
}
await this.populateTabRelations([item])
return this.processResItem(item)
}
/**
* 解析 tab 字段里 relation 子字段的名字，批量(每个关联模块一次 $in)，
* 挂到 item.__tabRel[fieldKey][childKey]，供该字段的 format 第二参使用。
* 不污染 tab 本体对象(避免回灌进库)，__tabRel 在 processResItem 末尾删除。
*/
private async populateTabRelations(items: any[]): Promise<void> {
const tabFields = this.fields.filter(f => f.type === ShrimpFieldTypes.Tab && Array.isArray(f.tabs))
if (tabFields.length === 0 || items.length === 0) return
const need = new Map<string, { labelKey: string; ids: Set<string> }>()
const refs: { item: any; fieldKey: string; childKey: string; moduleKey: string; multiple: boolean }[] = []
for (const item of items) {
for (const tf of tabFields) {
const val = item[tf.key]
if (!val || typeof val !== "object") continue
const tab = tf.tabs!.find(t => t.key === val.type)
if (!tab) continue
for (const child of tab.fields) {
if (child.type !== ShrimpFieldTypes.Relation || !child.relation || val[child.key] == null) continue
const { moduleKey, labelKey } = child.relation
let bucket = need.get(moduleKey)
if (!bucket) need.set(moduleKey, (bucket = { labelKey, ids: new Set() }))
const cv = val[child.key]
;(Array.isArray(cv) ? cv : [cv]).forEach((id: any) => id != null && bucket!.ids.add(String(id)))
refs.push({ item, fieldKey: tf.key, childKey: child.key, moduleKey, multiple: !!child.multiple })
}
}
}
if (refs.length === 0) return
const labelMaps = new Map<string, Map<string, any>>()
for (const [moduleKey, b] of need) {
const m = new Map<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 doc of res.list as any[]) m.set(String(doc._id), doc[b.labelKey])
}
labelMaps.set(moduleKey, m)
}
for (const ref of refs) {
const m = labelMaps.get(ref.moduleKey)!
const cv = ref.item[ref.fieldKey][ref.childKey]
const label = ref.multiple
? (Array.isArray(cv) ? cv.map((id: any) => m.get(String(id)) ?? null) : [])
: m.get(String(cv)) ?? null
const bag = (ref.item.__tabRel ||= {})
;(bag[ref.fieldKey] ||= {})[ref.childKey] = label
}
}
private excludeKeys(item: any, keys: string[]): any {
if (keys.length === 0) return item
const result = { ...item }