Skip to content

Commit 07d476d

Browse files
authored
Merge pull request #2355 from teableio/T1151-fix-conditional-lookup-filter-label
fix: issue T1151 correct conditional lookup filter table label
2 parents 2042c8e + a2923af commit 07d476d

File tree

1 file changed

+13
-1
lines changed
  • packages/sdk/src/components/filter/view-filter/custom-component

1 file changed

+13
-1
lines changed

packages/sdk/src/components/filter/view-filter/custom-component/FieldSelect.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,19 @@ export const FieldSelect = <T extends IConditionItemProperty = IViewFilterCondit
3333
return isFieldReferenceValue(candidate) ? candidate : undefined;
3434
}, [item?.value]);
3535

36-
const headingTableId = fieldReferenceValue?.tableId ?? fields[0]?.tableId;
36+
const headingTableId = useMemo(() => {
37+
const selectedField = fields.find((field) => field.id === value);
38+
if (selectedField?.tableId) {
39+
return selectedField.tableId;
40+
}
41+
const uniqueTableIds = new Set(
42+
fields.map((field) => field.tableId).filter((tableId) => Boolean(tableId))
43+
);
44+
if (uniqueTableIds.size === 1) {
45+
return Array.from(uniqueTableIds)[0] as string;
46+
}
47+
return undefined;
48+
}, [fields, value]);
3749

3850
const groupHeading = useMemo(() => {
3951
if (!fieldReferenceValue) {

0 commit comments

Comments
 (0)