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

feat(plugin-workflow): allow to select any path of a variable in condition node (#4571)

Browse Source
This commit is contained in:
Junyi 2024-06-05 23:28:06 +08:00 committed by GitHub
parent 15424f4c88
commit 361ebee130
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,13 @@ function Calculation({ calculator, operands = [], onChange }) {
flex-wrap: wrap;
`}
>
<Variable.Input value={operands[0]} onChange={leftOperandOnChange} scope={leftOptions} useTypedConstant />
<Variable.Input
changeOnSelect
value={operands[0]}
onChange={leftOperandOnChange}
scope={leftOptions}
useTypedConstant
/>
<Select
// @ts-ignore
role="button"
@ -193,7 +199,13 @@ function Calculation({ calculator, operands = [], onChange }) {
</Select.OptGroup>
))}
</Select>
<Variable.Input value={operands[1]} onChange={rightOperandOnChange} scope={rightOptions} useTypedConstant />
<Variable.Input
changeOnSelect
value={operands[1]}
onChange={rightOperandOnChange}
scope={rightOptions}
useTypedConstant
/>
</fieldset>
);
}
@ -391,6 +403,9 @@ export default class extends Instruction {
title: `{{t("Condition expression", { ns: "${NAMESPACE}" })}}`,
'x-decorator': 'FormItem',
'x-component': 'WorkflowVariableTextArea',
'x-component-props': {
changeOnSelect: true,
},
['x-validator'](value, rules, { form }) {
const { values } = form;
const { evaluate } = evaluators.get(values.engine);