From ee35b47f690f31315a21710c9bcdf6a2e5e5f930 Mon Sep 17 00:00:00 2001 From: wc24 Date: Mon, 29 Jun 2026 17:33:52 +0800 Subject: [PATCH] =?UTF-8?q?revert(tab):=20=E6=92=A4=E5=9B=9E=20v0.6.5=20?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=20relation=20=E8=A7=A3=E6=9E=90=EF=BC=8C?= =?UTF-8?q?=E5=9B=9E=E5=88=B0=20format=20=E7=BA=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit populateTabRelations / format 第二参是 tab 专属特例,太狭隘(object/array 同类问题未覆盖), 通用复合解析另当专门事做。嵌套关联名(如商品名)的展示需求改放业务侧(模块重写 list/get)。 框架只保留: format(同步纯展示) + stringify/parse(可逆往返)。 --- package.json | 2 +- src/IShrimpType.ts | 5 ++- src/Shrimp/ShrimpTableModule.ts | 58 +-------------------------------- 3 files changed, 4 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index 5d56a7a..366e6d2 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/IShrimpType.ts b/src/IShrimpType.ts index 2e0ff48..b39a766 100644 --- a/src/IShrimpType.ts +++ b/src/IShrimpType.ts @@ -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 + /** tab 类型专用：展示文本(表格列 `${key}_label`)，给人看、可有损好看，默认 JSON.stringify */ + format?: (value: any) => string /** tab 类型专用：export 序列化，须与 parse 可逆(机器往返)，默认 JSON.stringify */ stringify?: (value: any) => string /** tab 类型专用：import 反序列化，须与 stringify 可逆，默认 JSON.parse */ diff --git a/src/Shrimp/ShrimpTableModule.ts b/src/Shrimp/ShrimpTableModule.ts index 2cea745..9c50537 100644 --- a/src/Shrimp/ShrimpTableModule.ts +++ b/src/Shrimp/ShrimpTableModule.ts @@ -61,8 +61,7 @@ export const defaultTypeHandlers: Record = { 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 = 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 = 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 = 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 { - 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 }>() - 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>() - for (const [moduleKey, b] of need) { - const m = new Map() - 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 }