WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 90b5213

Browse files
committed
fix: array filterFns
1 parent b68ff00 commit 90b5213

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

packages/table-core/src/filterFns.ts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ const arrIncludes: FilterFn<any> = (
4747
columnId: string,
4848
filterValue: unknown
4949
) => {
50-
return row.getValue<unknown[]>(columnId)?.includes(filterValue)
50+
if (Array.isArray(row.getValue(columnId))) {
51+
return row.getValue<unknown[]>(columnId)?.includes(filterValue)
52+
}
53+
return filterValue === row.getValue(columnId)
5154
}
5255

5356
arrIncludes.autoRemove = (val: any) => testFalsey(val) || !val?.length
@@ -57,9 +60,12 @@ const arrIncludesAll: FilterFn<any> = (
5760
columnId: string,
5861
filterValue: unknown[]
5962
) => {
60-
return !filterValue.some(
61-
val => !row.getValue<unknown[]>(columnId)?.includes(val)
62-
)
63+
if (Array.isArray(row.getValue(columnId))) {
64+
return !filterValue.some(
65+
val => !row.getValue<unknown[]>(columnId)?.includes(val)
66+
)
67+
}
68+
return !filterValue.some(val => val !== row.getValue(columnId))
6369
}
6470

6571
arrIncludesAll.autoRemove = (val: any) => testFalsey(val) || !val?.length
@@ -69,9 +75,12 @@ const arrIncludesSome: FilterFn<any> = (
6975
columnId: string,
7076
filterValue: unknown[]
7177
) => {
72-
return filterValue.some(val =>
73-
row.getValue<unknown[]>(columnId)?.includes(val)
74-
)
78+
if (Array.isArray(row.getValue(columnId))) {
79+
return filterValue.some(val =>
80+
row.getValue<unknown[]>(columnId)?.includes(val)
81+
)
82+
}
83+
return filterValue.some(val => val === row.getValue(columnId))
7584
}
7685

7786
arrIncludesSome.autoRemove = (val: any) => testFalsey(val) || !val?.length

0 commit comments

Comments
 (0)