ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(plugin-workflow): fix variable type check (#2492)

Browse Source 
* fix(plugin-workflow): fix variable type check

* fix(plugin-workflow): fix node job button style
This commit is contained in:
Junyi 2023-08-20 16:45:46 +07:00 committed by GitHub
parent 95e1cd390b
commit a59ed4ee17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/plugins/workflow/src/client/nodes/aggregate.tsx
View File

@ -20,8 +20,9 @@ import { BaseTypeSets, defaultFieldNames, nodesOptions, triggerOptions } from '.
function matchToManyField(field, appends): boolean { function matchToManyField(field, appends): boolean {
const fieldPrefix = `${field.name}.`; const fieldPrefix = `${field.name}.`;
return ( return (
['hasMany', 'belongsToMany'].includes(field.type) && (['hasOne', 'belongsTo'].includes(field.type) &&
(appends ? appends.includes(field.name) || appends.some((item) => item.startsWith(fieldPrefix)) : true) (appends ? appends.includes(field.name) || appends.some((item) => item.startsWith(fieldPrefix)) : true)) ||
['hasMany', 'belongsToMany'].includes(field.type)
); );
} }

2
packages/plugins/workflow/src/client/nodes/index.tsx
View File

@ -265,6 +265,8 @@ export function JobButton() {
border: 2px solid #d9d9d9; border: 2px solid #d9d9d9;
border-radius: 50%; border-radius: 50%;
cursor: not-allowed; cursor: not-allowed;
width: 24px;
height: 24px;
`, `,
)} )}
/> />

11
packages/plugins/workflow/src/client/variable.tsx
View File

@ -165,13 +165,12 @@ function getNextAppends(field, appends: string[]) {
function filterTypedFields({ fields, types, appends, compile, getCollectionFields }) { function filterTypedFields({ fields, types, appends, compile, getCollectionFields }) {
return fields.filter((field) => { return fields.filter((field) => {
const match = types?.length ? types.some((type) => matchFieldType(field, type, appends)) : true; if (types?.length) {
return types.some((type) => matchFieldType(field, type, appends));
}
if (isAssociationField(field)) { if (isAssociationField(field)) {
const nextAppends = getNextAppends(field, appends); const nextAppends = getNextAppends(field, appends);
const included = appends.includes(field.name); const included = appends.includes(field.name);
if (match) {
return included;
} else {
return ( return (
(nextAppends.length || included) && (nextAppends.length || included) &&
filterTypedFields({ filterTypedFields({
@ -184,9 +183,7 @@ function filterTypedFields({ fields, types, appends, compile, getCollectionField
}).length }).length
); );
} }
} else { return true;
return match;
}
}); });
} }