MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 22:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix friendLog filters

Browse Source
This commit is contained in:
Natsumi
2025-10-15 10:01:07 +11:00
parent 87ac7d7f9a
commit 751aff34ad
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/DataTable.vue
View File

@@ -109,9 +109,8 @@
if (cellValue === undefined || cellValue === null) return false;
if (Array.isArray(filter.value)) {
return filter.value.some((val) =>
String(cellValue).toLowerCase().includes(String(val).toLowerCase())
);
// assume filter dropdown multi select
return filter.value.some((val) => String(cellValue).toLowerCase() === String(val).toLowerCase());
} else {
return String(cellValue).toLowerCase().includes(String(filter.value).toLowerCase());
}
@@ -122,7 +121,12 @@
if (filters.value && Array.isArray(filters.value) && filters.value.length > 0) {
filters.value.forEach((filter) => {
if (filter.value && (!Array.isArray(filter.value) || filter.value.length > 0)) {
if (!filter.value) {
return;
}
if (filter.filterFn) {
result = result.filter((row) => filter.filterFn(row, filter));
} else if (!Array.isArray(filter.value) || filter.value.length > 0) {
result = result.filter((row) => applyFilter(row, filter));
}
});

4
src/stores/friend.js
View File

@@ -65,9 +65,7 @@ export const useFriendStore = defineStore('Friend', () => {
filters: [
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
value: []
},
{
prop: 'displayName',

4
src/stores/notification.js
View File

@@ -59,9 +59,7 @@ export const useNotificationStore = defineStore('Notification', () => {
filters: [
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
value: []
},
{
prop: ['senderUsername', 'message'],

8
src/stores/photon.js
View File

@@ -98,9 +98,7 @@ export const usePhotonStore = defineStore('Photon', () => {
},
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
value: []
}
],
tableProps: {
@@ -123,9 +121,7 @@ export const usePhotonStore = defineStore('Photon', () => {
},
{
prop: 'type',
value: [],
filterFn: (row, filter) =>
filter.value.some((v) => v === row.type)
value: []
}
],
tableProps: {

3
src/views/Moderation/Moderation.vue
View File

@@ -114,8 +114,7 @@
const filters = ref([
{
prop: 'type',
value: [],
filterFn: (row, filter) => filter.value.some((v) => v === row.type)
value: []
},
{
prop: ['sourceDisplayName', 'targetDisplayName'],