diff --git a/packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx b/packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx index 1af2fbbdac..52a88dc8da 100644 --- a/packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx +++ b/packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx @@ -107,7 +107,7 @@ export function Result(props) { let v; try { v = evaluate(expression, scope); - v = toDbType(v, dataType); + v = v && toDbType(v, dataType); } catch (error) { v = null; } diff --git a/packages/plugins/@nocobase/plugin-field-formula/src/utils/index.ts b/packages/plugins/@nocobase/plugin-field-formula/src/utils/index.ts index 6f031db95f..c0dc020f7d 100644 --- a/packages/plugins/@nocobase/plugin-field-formula/src/utils/index.ts +++ b/packages/plugins/@nocobase/plugin-field-formula/src/utils/index.ts @@ -151,7 +151,7 @@ export const DataTypeTransformers = { }; export function toDbType(value: any, type: string) { - if (value == null || (!value && type === 'date')) { + if (value == null) { return null; }