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

fix(plugin-workflow): fix foreignkey in variable (#1740)

Browse Source
This commit is contained in:
Junyi 2023-04-21 09:52:13 +07:00 committed by GitHub
parent 673c246eed
commit 5d2724583c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ export function filterTypedFields(fields, types, depth = 1) {
return fields; return fields;
} }
return fields.filter((field) => { return fields.filter((field) => {
if (isAssociationField(field) && depth && filterTypedFields(useNormallizedFields(field.target), types, depth - 1).length) { if (isAssociationField(field) && depth && filterTypedFields(useNormalizedFields(field.target), types, depth - 1).length) {
return true; return true;
} }
return types.some((type) => matchFieldType(field, type)); return types.some((type) => matchFieldType(field, type));
@ -130,7 +130,7 @@ export function useWorkflowVariableOptions(types?) {
return options; return options;
} }
function useNormallizedFields(collectionName) { function useNormalizedFields(collectionName) {
const compile = useCompile(); const compile = useCompile();
const { getCollection } = useCollectionManager(); const { getCollection } = useCollectionManager();
const collection = getCollection(collectionName); const collection = getCollection(collectionName);
@ -153,6 +153,7 @@ function useNormallizedFields(collectionName) {
const foreignKeyField = foreignKeyFields.find(f => f.name === field.foreignKey); const foreignKeyField = foreignKeyFields.find(f => f.name === field.foreignKey);
if (foreignKeyField) { if (foreignKeyField) {
otherFields.splice(i, 0, { otherFields.splice(i, 0, {
...field,
...foreignKeyField, ...foreignKeyField,
uiSchema: { uiSchema: {
...field.uiSchema, ...field.uiSchema,
@ -192,7 +193,7 @@ function useNormallizedFields(collectionName) {
export function useCollectionFieldOptions(options): VariableOption[] { export function useCollectionFieldOptions(options): VariableOption[] {
const { fields, collection, types, depth = 1 } = options; const { fields, collection, types, depth = 1 } = options;
const compile = useCompile(); const compile = useCompile();
const normalizedFields = fields ?? useNormallizedFields(collection); const normalizedFields = fields ?? useNormalizedFields(collection);
const result: VariableOption[] = filterTypedFields(normalizedFields, types, depth) const result: VariableOption[] = filterTypedFields(normalizedFields, types, depth)
.filter(field => !isAssociationField(field) || depth) .filter(field => !isAssociationField(field) || depth)
.map(field => { .map(field => {