dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 13:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lisgt matcher refactor

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-12-16 13:08:59 +01:00
parent a20b4b3339
commit c46c9a4e16
10 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/web/src/appobj/AppObjectList.svelte
View File

@@ -29,21 +29,12 @@
export let collapsedGroupNames = writable([]);
export let onChangeFilteredList;
$: filtered = !groupFunc
? list.filter(data => {
const matcher = module.createMatcher && module.createMatcher(data, passProps?.searchSettings);
if (matcher && !matcher(filter)) return false;
return true;
})
: null;
$: matcher = module.createMatcher && module.createMatcher(filter, passProps?.searchSettings);
$: childMatcher = module.createChildMatcher && module.createChildMatcher(filter, passProps?.searchSettings);
$: childrenMatched = !groupFunc
? list.filter(data => {
const matcher = module.createChildMatcher && module.createChildMatcher(data, passProps?.searchSettings);
if (matcher && !matcher(filter)) return false;
return true;
})
: null;
$: filtered = !groupFunc ? list.filter(data => !matcher || matcher(data)) : null;
$: childrenMatched = !groupFunc ? list.filter(data => !childMatcher || childMatcher(data)) : null;
// let filtered = [];
@@ -62,8 +53,7 @@
$: listGrouped = groupFunc
? _.compact(
(list || []).map(data => {
const matcher = module.createMatcher && module.createMatcher(data, passProps?.searchSettings);
const isMatched = matcher && !matcher(filter) ? false : true;
const isMatched = matcher && !matcher(data) ? false : true;
const group = groupFunc(data);
return { group, data, isMatched };
})