Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19afdf3615 | ||
|
|
31b723839e | ||
|
|
1f48a02083 | ||
|
|
0f2b4d6428 | ||
|
|
06aec7f0dc | ||
|
|
172c49816e |
Generated
+6
-6
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"name": "shrimp-server",
|
||||
"version": "0.7.3",
|
||||
"version": "0.7.4",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "shrimp-server",
|
||||
"version": "0.7.3",
|
||||
"version": "0.7.4",
|
||||
"dependencies": {
|
||||
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.3"
|
||||
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bcrypt": "^5.0.0",
|
||||
@@ -3374,10 +3374,10 @@
|
||||
}
|
||||
},
|
||||
"node_modules/shrimp-server": {
|
||||
"version": "0.7.3",
|
||||
"resolved": "git+http://git.zeromvc.com/wc24/shrimp-server.git#24afc42de98f3fc5cebd178cd83707b7cde4da47",
|
||||
"version": "0.7.4",
|
||||
"resolved": "git+http://git.zeromvc.com/wc24/shrimp-server.git#a8cd07f8511487186732dfd884121f7acb77f5c0",
|
||||
"dependencies": {
|
||||
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.2"
|
||||
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"bcrypt": "^5 || ^6",
|
||||
|
||||
+1
-4
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "shrimp-server",
|
||||
"version": "0.7.4",
|
||||
"version": "0.7.12",
|
||||
"description": "Shrimp 框架后端 — 声明式字段驱动的 Node.js 管理后台框架(Express + Mongoose + JWT)",
|
||||
"main": "dist/main/index.js",
|
||||
"types": "dist/main/index.d.ts",
|
||||
@@ -55,8 +55,5 @@
|
||||
"tsx": "^4.7.0",
|
||||
"typescript": "^5.3.0",
|
||||
"vitest": "^1.4.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"shrimp-server": "git+http://git.zeromvc.com/wc24/shrimp-server.git#v0.7.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,9 +68,27 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
return ShrimpTableModule.typeHandlers.get(field.type)
|
||||
}
|
||||
|
||||
/** 按类型递归判定"空":tab=没选type / object=所有子字段都空 / array=无元素或所有元素都空(多维递归)/ 标量=null|'' / 空数组 */
|
||||
private isEmptyValue(field: IFieldConfig, value: any): boolean {
|
||||
if (value === undefined || value === null) return true
|
||||
switch (field.type) {
|
||||
case ShrimpFieldTypes.Tab:
|
||||
return typeof value !== "object" || value.type == null
|
||||
case ShrimpFieldTypes.Object:
|
||||
if (typeof value !== "object" || !Array.isArray(field.fields)) return true
|
||||
return field.fields.every(f => this.isEmptyValue(f, value[f.key]))
|
||||
case ShrimpFieldTypes.Array:
|
||||
if (!Array.isArray(value) || value.length === 0) return true
|
||||
return field.item ? value.every(el => this.isEmptyValue(field.item!, el)) : false
|
||||
default:
|
||||
// 标量/relation/select:'' 或空数组(multiple)算空;0、false 不算空
|
||||
return value === "" || (Array.isArray(value) && value.length === 0)
|
||||
}
|
||||
}
|
||||
|
||||
/** 前置验证 */
|
||||
private async validateField(field: IFieldConfig, value: any, item: Record<string, any>): Promise<ILabel | null> {
|
||||
const isEmpty = value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)
|
||||
const isEmpty = this.isEmptyValue(field, value)
|
||||
|
||||
if (field.required && isEmpty) {
|
||||
return field.rules?.find(r => r.required)?.message || { t: 'shrimp.fieldRequired', params: { field: field.label } }
|
||||
@@ -196,6 +214,8 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
// 出错只发字段名(label) + i18n key 的 message,不把开发用的 path 拼进可见文案。
|
||||
// path 仍递归往下传(供将来 inline 标红按结构化方式携带,不在这里塞进 message)。
|
||||
if (err) throw new ShrimpError(err)
|
||||
// 空的复合(走到这必是非必填)→ 不下钻校验子:整个结构缺席,里面的 required 不该触发
|
||||
if (this.isEmptyValue(field, value)) return
|
||||
for (const child of this.childrenOf(field, value)) {
|
||||
await this.validateNode(child.field, child.value, [...path, child.key], rootItem)
|
||||
}
|
||||
@@ -272,7 +292,8 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
private collectOne(f: IFieldConfig, v: any, add: (moduleKey: string, labelKey: string, id: any) => void): void {
|
||||
if (v == null) return
|
||||
if (f.type === "relation" && f.relation) {
|
||||
;(Array.isArray(v) ? v : [v]).forEach((id: any) => id != null && add(f.relation!.moduleKey, f.relation!.labelKey, id))
|
||||
// 跳过空串:可选 Relation 常存 "",混进 { _id: { $in } } 会让 Mongoose 转 ObjectId 抛 CastError、整页 500。
|
||||
;(Array.isArray(v) ? v : [v]).forEach((id: any) => id != null && id !== "" && 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) for (const c of branch.fields) this.collectOne(c, v[c.key], add)
|
||||
@@ -297,6 +318,19 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
return this.excludeKeys(item, ["__v", ...this.fields.filter(f => f.hidden).map(f => f.key)])
|
||||
}
|
||||
|
||||
/** 递归收集标了 filterable 的字段 → 点路径(object 子 / tab 分支子)。array 暂不下钻(后续) */
|
||||
private collectFilterablePaths(fields: IFieldConfig[], base: string[], out: Map<string, IFieldConfig>): void {
|
||||
for (const f of fields) {
|
||||
const path = [...base, f.key]
|
||||
if (f.filterable) out.set(path.join("."), f)
|
||||
if (f.type === ShrimpFieldTypes.Tab && Array.isArray(f.tabs)) {
|
||||
for (const t of f.tabs) this.collectFilterablePaths(t.fields, path, out)
|
||||
} else if (f.type === ShrimpFieldTypes.Object && Array.isArray(f.fields)) {
|
||||
this.collectFilterablePaths(f.fields, path, out)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private buildQuery(query?: IPageQuery & any): IShrimpQuery {
|
||||
const { keyword, page, pageSize, sortBy, sortOrder, filter, ownerId } = query || {}
|
||||
const p = page || 1
|
||||
@@ -307,7 +341,9 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
||||
}
|
||||
|
||||
if (filter && typeof filter === 'object') {
|
||||
const filterableFields = new Map(this.fields.filter(f => f.filterable).map(f => [f.key, f]))
|
||||
// filterable 路径(含 object/tab 嵌套叶子,点路径如 condition.level)→ 白名单。点路径本就是 mongoose 嵌套查询,翻译逻辑不变
|
||||
const filterableFields = new Map<string, IFieldConfig>()
|
||||
this.collectFilterablePaths(this.fields, [], filterableFields)
|
||||
const stringLikeTypes = new Set(['string', 'textarea'])
|
||||
const where: Record<string, IShrimpCondition> = {}
|
||||
for (const [key, value] of Object.entries(filter)) {
|
||||
|
||||
@@ -34,6 +34,7 @@ describe("crudRegistry 自动登记", () => {
|
||||
await productCrud.add({ code: "P001", tagIds: [t1._id, t2._id] } as any)
|
||||
|
||||
const result = await productModule.list({})
|
||||
expect((result.list[0] as any).tagIds_label).toEqual(["热门", "促销"])
|
||||
// _label 逐行机制已退场:relation 显示名走整页 refs 字典(refs[moduleKey][id])
|
||||
expect((result as any).refs?.tag).toEqual({ [t1._id]: "热门", [t2._id]: "促销" })
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user