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

Merge branch 'main' into next
Some checks failed
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) Has been cancelled
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-07-31 01:56:42 +00:00
commit 1bfbb7ff83
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-workflow/src/client/nodes/calculation.tsx
View File

@ -45,7 +45,7 @@ export default class extends Instruction {
['x-validator'](value, rules, { form }) { ['x-validator'](value, rules, { form }) {
const { values } = form; const { values } = form;
const { evaluate } = evaluators.get(values.engine) as Evaluator; const { evaluate } = evaluators.get(values.engine) as Evaluator;
const exp = value.trim().replace(/{{([^{}]+)}}/g, ' 1 '); const exp = value.trim().replace(/{{([^{}]+)}}/g, ' "1" ');
try { try {
evaluate(exp); evaluate(exp);
return ''; return '';

2
packages/plugins/@nocobase/plugin-workflow/src/client/nodes/condition.tsx
View File

@ -409,7 +409,7 @@ export default class extends Instruction {
['x-validator'](value, rules, { form }) { ['x-validator'](value, rules, { form }) {
const { values } = form; const { values } = form;
const { evaluate } = evaluators.get(values.engine); const { evaluate } = evaluators.get(values.engine);
const exp = value.trim().replace(/{{([^{}]+)}}/g, ' 1 '); const exp = value.trim().replace(/{{([^{}]+)}}/g, ' "1" ');
try { try {
evaluate(exp); evaluate(exp);
return ''; return '';