fix:BUG541 ユーザーフィールド未選択の際、Contains条件の不具合対応

This commit is contained in:
xiaozhe.ma
2024-08-27 11:45:32 +09:00
parent c482b9ff5f
commit e492659dbf
2 changed files with 28 additions and 7 deletions

View File

@@ -512,13 +512,13 @@ export class ConditionTree {
const valueArray=sortArray(value);
switch (operator) {
case Operator.Equal:
return targetArray.every((v, i) => v === valueArray[i]);
return targetArray.length===valueArray.length && targetArray.every((v, i) => v === valueArray[i]);
case Operator.NotEqual:
return !targetArray.every((v, i) => v === valueArray[i]);
return targetArray.length!==valueArray.length || !targetArray.every((v, i) => v === valueArray[i]);
case Operator.Contains:
return valueArray.every(v => targetArray.includes(v));
return valueArray.length>0 && valueArray.every(v => targetArray.includes(v));
case Operator.NotContains:
return !valueArray.every(v => targetArray.includes(v));
return valueArray.length===0 || !valueArray.every(v => targetArray.includes(v));
default:
return false;
}