fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-06 22:19:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

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 '';