mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 11:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-09-04 13:19:02 +00:00
commit 43c6888634
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx
View File

@ -107,7 +107,7 @@ export function Result(props) {
let v; let v;
try { try {
v = evaluate(expression, scope); v = evaluate(expression, scope);
v = toDbType(v, dataType); v = v && toDbType(v, dataType);
} catch (error) { } catch (error) {
v = null; v = null;
} }

2
packages/plugins/@nocobase/plugin-field-formula/src/utils/index.ts
View File

@ -151,7 +151,7 @@ export const DataTypeTransformers = {
}; };
export function toDbType(value: any, type: string) { export function toDbType(value: any, type: string) {
if (value == null || (!value && type === 'date')) { if (value == null) {
return null; return null;
} }