Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb339ccc49 | ||
|
|
8f9dfd40e0 | ||
|
|
ee35b47f69 | ||
|
|
bc54b475cf | ||
|
|
4b51d31e9f |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "shrimp-server",
|
"name": "shrimp-server",
|
||||||
"version": "0.6.3",
|
"version": "0.6.8",
|
||||||
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
|
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
|
||||||
"main": "dist/main/index.js",
|
"main": "dist/main/index.js",
|
||||||
"types": "dist/main/index.d.ts",
|
"types": "dist/main/index.d.ts",
|
||||||
|
|||||||
+5
-2
@@ -278,9 +278,11 @@ export interface IFieldConfig {
|
|||||||
rules?: IFieldRule[] // 通用验证规则(前后端共用)
|
rules?: IFieldRule[] // 通用验证规则(前后端共用)
|
||||||
/** tab 类型专用:每个 type 对应的子字段配置 */
|
/** tab 类型专用:每个 type 对应的子字段配置 */
|
||||||
tabs?: { key: any; label: ILabel; fields: IFieldConfig[] }[]
|
tabs?: { key: any; label: ILabel; fields: IFieldConfig[] }[]
|
||||||
/** tab 类型专用:自定义序列化(export 列 / `${key}_label` 用),默认 JSON.stringify */
|
/** tab 类型专用:展示文本(表格列 `${key}_label`),给人看、可有损好看,默认 JSON.stringify */
|
||||||
|
format?: (value: any) => string
|
||||||
|
/** tab 类型专用:export 序列化,须与 parse 可逆(机器往返),默认 JSON.stringify */
|
||||||
stringify?: (value: any) => string
|
stringify?: (value: any) => string
|
||||||
/** tab 类型专用:自定义反序列化(import 还原对象),默认 JSON.parse */
|
/** tab 类型专用:import 反序列化,须与 stringify 可逆,默认 JSON.parse */
|
||||||
parse?: (text: string) => any
|
parse?: (text: string) => any
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,6 +320,7 @@ export interface IPageResult<T> {
|
|||||||
page: number // 当前页码
|
page: number // 当前页码
|
||||||
pageSize: number // 每页数量
|
pageSize: number // 每页数量
|
||||||
totalPages: number // 总页数
|
totalPages: number // 总页数
|
||||||
|
refs?: Record<string, Record<string, any>> // relation 显示名字典: { moduleKey: { id: 显示名 } },前端显示时查名,替代逐行 _label
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============== 数据源查询协议 ==============
|
// ============== 数据源查询协议 ==============
|
||||||
|
|||||||
@@ -60,8 +60,8 @@ export const defaultTypeHandlers: Record<string, IFieldTypeHandler> = {
|
|||||||
}
|
}
|
||||||
return value
|
return value
|
||||||
},
|
},
|
||||||
// 本体原样下发对象(不再 stringify);展示文本走 _label
|
// 本体原样下发对象(不再 stringify);展示文本走 _label,用 format(给人看,可有损)
|
||||||
resLabel: (value, field) => (field.stringify ?? JSON.stringify)(value),
|
resLabel: (value, field) => (field.format ?? JSON.stringify)(value),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,22 +230,45 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
|
|
||||||
private async prepareResponseItems(items: any[]): Promise<any[]> {
|
private async prepareResponseItems(items: any[]): Promise<any[]> {
|
||||||
if (items.length === 0) return items
|
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)))
|
return Promise.all(items.map(item => this.processResItem(item)))
|
||||||
}
|
}
|
||||||
|
|
||||||
private async prepareResponseItem(item: any): Promise<any> {
|
private async prepareResponseItem(item: any): Promise<any> {
|
||||||
if (!item) return item
|
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)
|
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 {
|
private excludeKeys(item: any, keys: string[]): any {
|
||||||
if (keys.length === 0) return item
|
if (keys.length === 0) return item
|
||||||
const result = { ...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)
|
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 {
|
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
|
||||||
const { keyword, page, pageSize, sortBy, sortOrder, filter, ownerId } = query || {}
|
const { keyword, page, pageSize, sortBy, sortOrder, filter, ownerId } = query || {}
|
||||||
const p = page || 1
|
const p = page || 1
|
||||||
@@ -285,6 +300,11 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
const stringLikeTypes = new Set(['string', 'textarea'])
|
const stringLikeTypes = new Set(['string', 'textarea'])
|
||||||
const where: Record<string, IShrimpCondition> = {}
|
const where: Record<string, IShrimpCondition> = {}
|
||||||
for (const [key, value] of Object.entries(filter)) {
|
for (const [key, value] of Object.entries(filter)) {
|
||||||
|
// _id 始终放行精确过滤(单项查看/relation 跳转用),无需配 filterable
|
||||||
|
if (key === '_id') {
|
||||||
|
if (value != null && value !== '') where['_id'] = { eq: value }
|
||||||
|
continue
|
||||||
|
}
|
||||||
const field = filterableFields.get(key)
|
const field = filterableFields.get(key)
|
||||||
if (!field) continue
|
if (!field) continue
|
||||||
if (value == null) continue
|
if (value == null) continue
|
||||||
@@ -339,6 +359,7 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
const result = await this.dataSource.list(shrimpQuery)
|
const result = await this.dataSource.list(shrimpQuery)
|
||||||
result.list = await this.prepareResponseItems(result.list)
|
result.list = await this.prepareResponseItems(result.list)
|
||||||
result.list = result.list.map(item => this.filterHidden(item))
|
result.list = result.list.map(item => this.filterHidden(item))
|
||||||
|
result.refs = await this.buildRefs(result.list)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,13 +416,15 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
delete shrimpQuery.limit
|
delete shrimpQuery.limit
|
||||||
const result = await this.dataSource.list(shrimpQuery)
|
const result = await this.dataSource.list(shrimpQuery)
|
||||||
result.list = await this.prepareResponseItems(result.list)
|
result.list = await this.prepareResponseItems(result.list)
|
||||||
// 导出是"给人看"的边界:把带 resLabel 的结构化字段(如 tab)用其字符串文本替换对象本体,
|
// 导出是机器往返的边界:结构化字段(如 tab)用可逆的 stringify 序列化(默认 JSON),
|
||||||
// 列保持可读,且能被 import 的 reqFilter(parse)原样还原;去掉额外的 _label 列。
|
// import 端的 reqFilter(parse) 能原样还原;展示用的 _label 不进导出,去掉。
|
||||||
const labelFields = this.fields.filter(f => this.getTypeHandler(f)?.resLabel)
|
const labelFields = this.fields.filter(f => this.getTypeHandler(f)?.resLabel)
|
||||||
return result.list.map(item => {
|
return result.list.map(item => {
|
||||||
const row = this.filterHidden(item)
|
const row = this.filterHidden(item)
|
||||||
for (const f of labelFields) {
|
for (const f of labelFields) {
|
||||||
if (row[`${f.key}_label`] !== undefined) row[f.key] = row[`${f.key}_label`]
|
if (row[f.key] !== undefined && typeof row[f.key] === "object") {
|
||||||
|
row[f.key] = (f.stringify ?? JSON.stringify)(row[f.key])
|
||||||
|
}
|
||||||
delete row[`${f.key}_label`]
|
delete row[`${f.key}_label`]
|
||||||
}
|
}
|
||||||
return row
|
return row
|
||||||
|
|||||||
Reference in New Issue
Block a user