Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e04d01a80c | ||
|
|
eb339ccc49 |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "shrimp-server",
|
"name": "shrimp-server",
|
||||||
"version": "0.6.7",
|
"version": "0.6.9",
|
||||||
"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",
|
||||||
|
|||||||
@@ -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 查名。
|
* 整页一次性、按模块各查一次 $in,去重;替代逐行注入 ${key}_label。前端显示时按 id 查名。
|
||||||
*/
|
*/
|
||||||
private async buildRefs(rows: any[]): Promise<Record<string, Record<string, any>>> {
|
private async buildRefs(rows: any[]): Promise<Record<string, Record<string, any>>> {
|
||||||
const relFields = this.getRelationFields()
|
if (rows.length === 0) return {}
|
||||||
if (relFields.length === 0 || rows.length === 0) return {}
|
|
||||||
const buckets = new Map<string, { labelKey: string; ids: Set<string> }>()
|
const buckets = new Map<string, { labelKey: string; ids: Set<string> }>()
|
||||||
for (const row of rows) {
|
const add = (moduleKey: string, labelKey: string, id: any) => {
|
||||||
for (const f of relFields) {
|
let b = buckets.get(moduleKey)
|
||||||
const v = row[f.key]
|
if (!b) buckets.set(moduleKey, (b = { labelKey, ids: new Set() }))
|
||||||
if (v == null) continue
|
b.ids.add(String(id))
|
||||||
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)))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
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>> = {}
|
const refs: Record<string, Record<string, any>> = {}
|
||||||
for (const [moduleKey, b] of buckets) {
|
for (const [moduleKey, b] of buckets) {
|
||||||
const dict: Record<string, any> = {}
|
const dict: Record<string, any> = {}
|
||||||
@@ -269,6 +267,20 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|||||||
return refs
|
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 {
|
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 }
|
||||||
@@ -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))
|
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 {
|
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
|
||||||
@@ -300,6 +308,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
|
||||||
|
|||||||
Reference in New Issue
Block a user