|
|
@@ -68,9 +68,27 @@ export class ShrimpTableModule<T, P extends ITableCrudProto<T> = ITableCrudProto
|
|
|
|
return ShrimpTableModule.typeHandlers.get(field.type)
|
|
|
|
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> {
|
|
|
|
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) {
|
|
|
|
if (field.required && isEmpty) {
|
|
|
|
return field.rules?.find(r => r.required)?.message || { t: 'shrimp.fieldRequired', params: { field: field.label } }
|
|
|
|
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 拼进可见文案。
|
|
|
|
// 出错只发字段名(label) + i18n key 的 message,不把开发用的 path 拼进可见文案。
|
|
|
|
// path 仍递归往下传(供将来 inline 标红按结构化方式携带,不在这里塞进 message)。
|
|
|
|
// path 仍递归往下传(供将来 inline 标红按结构化方式携带,不在这里塞进 message)。
|
|
|
|
if (err) throw new ShrimpError(err)
|
|
|
|
if (err) throw new ShrimpError(err)
|
|
|
|
|
|
|
|
// 空的复合(走到这必是非必填)→ 不下钻校验子:整个结构缺席,里面的 required 不该触发
|
|
|
|
|
|
|
|
if (this.isEmptyValue(field, value)) return
|
|
|
|
for (const child of this.childrenOf(field, value)) {
|
|
|
|
for (const child of this.childrenOf(field, value)) {
|
|
|
|
await this.validateNode(child.field, child.value, [...path, child.key], rootItem)
|
|
|
|
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 {
|
|
|
|
private collectOne(f: IFieldConfig, v: any, add: (moduleKey: string, labelKey: string, id: any) => void): void {
|
|
|
|
if (v == null) return
|
|
|
|
if (v == null) return
|
|
|
|
if (f.type === "relation" && f.relation) {
|
|
|
|
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") {
|
|
|
|
} else if (f.type === ShrimpFieldTypes.Tab && Array.isArray(f.tabs) && typeof v === "object") {
|
|
|
|
const branch = f.tabs.find(t => t.key === v.type)
|
|
|
|
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)
|
|
|
|
if (branch) for (const c of branch.fields) this.collectOne(c, v[c.key], add)
|
|
|
|