Skip to content

[elsa] typeFilter对入参o的属性增加空指针校验 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeCasterX merged 1 commit into from
Apr 29, 2025
Merged

[elsa] typeFilter对入参o的属性增加空指针校验 #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...k/elsa/fit-elsa-react/src/components/variableAggregation/VariableAggregationInputForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,19 @@ const VariableItem = ({variable, variables, shapeStatus}) => {
}

// 只有一个已引用变量，并且变量是自身，也可以换类型.
if (referencedVariables.length === 1) {
if (referencedVariables[0].id === variable.id) {
if (referencedVariables.length === 1 && referencedVariables[0].id === variable.id) {
return true;
}
}

// o所代表的observable已被引用了，不可再次引用.
if (referencedVariables.some(r => r.referenceId === o.observableId)) {
return false;
}

return o.type.toUpperCase() === referencedVariables[0]?.type?.toUpperCase() ?? DATA_TYPES.STRING.toUpperCase();
const defaultType = DATA_TYPES?.STRING?.toUpperCase() ?? "STRING"; // 防御性兜底
const oType = o?.type?.toUpperCase() ?? defaultType;
const refType = referencedVariables[0]?.type?.toUpperCase() ?? defaultType;
return oType === refType;
};

// 删除变量.
Expand Down