This commit is contained in:
SPRINX0\prochazka
2024-12-16 15:36:26 +01:00
parent 939f04ae62
commit 7e1ceb69ae
6 changed files with 15 additions and 11 deletions

View File

@@ -26,7 +26,7 @@
export let groupFunc = undefined; export let groupFunc = undefined;
export let onDropOnGroup = undefined; export let onDropOnGroup = undefined;
export let emptyGroupNames = []; export let emptyGroupNames = [];
export let isExpandedOnlyBySearch = false; export let isExpandedBySearch = false;
export let collapsedGroupNames = writable([]); export let collapsedGroupNames = writable([]);
export let onChangeFilteredList = undefined; export let onChangeFilteredList = undefined;
@@ -79,8 +79,8 @@
$: groups = groupFunc ? extendGroups(_.groupBy(listGrouped, 'group'), emptyGroupNames) : null; $: groups = groupFunc ? extendGroups(_.groupBy(listGrouped, 'group'), emptyGroupNames) : null;
$: listLimited = $: listLimited =
isExpandedOnlyBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list; isExpandedBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list;
$: isListLimited = isExpandedOnlyBySearch && listLimited.length < filtered.length; $: isListLimited = isExpandedBySearch && listLimited.length < filtered.length;
</script> </script>
{#if groupFunc} {#if groupFunc}

View File

@@ -63,10 +63,13 @@
{#if (isExpanded || isExpandedBySearch) && subItemsComponent} {#if (isExpanded || isExpandedBySearch) && subItemsComponent}
<div class="subitems"> <div class="subitems">
<svelte:component <svelte:component
this={subItemsComponent(data, { isExpandedOnlyBySearch: isExpandedBySearch && !isExpanded })} this={subItemsComponent(data, {
isExpandedBySearch,
})}
{data} {data}
{filter} {filter}
{passProps} {passProps}
{isExpandedBySearch}
isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded} isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded}
/> />
</div> </div>

View File

@@ -12,6 +12,7 @@
export let passProps; export let passProps;
export let isExpandedOnlyBySearch; export let isExpandedOnlyBySearch;
export let isExpandedBySearch;
$: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id }); $: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id });
$: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || []; $: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || [];
@@ -24,5 +25,5 @@
module={databaseAppObject} module={databaseAppObject}
{passProps} {passProps}
{filter} {filter}
{isExpandedOnlyBySearch} {isExpandedBySearch}
/> />

View File

@@ -8,7 +8,7 @@
export let data; export let data;
export let filter; export let filter;
export let isExpandedOnlyBySearch; export let isExpandedBySearch;
</script> </script>
<AppObjectList <AppObjectList
@@ -17,5 +17,5 @@
}))} }))}
module={procedureLineAppObject} module={procedureLineAppObject}
{filter} {filter}
{isExpandedOnlyBySearch} {isExpandedBySearch}
/> />

View File

@@ -6,7 +6,7 @@
export let data; export let data;
export let filter; export let filter;
export let isExpandedOnlyBySearch; export let isExpandedBySearch;
</script> </script>
<AppObjectList <AppObjectList
@@ -17,5 +17,5 @@
}))} }))}
module={columnAppObject} module={columnAppObject}
{filter} {filter}
{isExpandedOnlyBySearch} {isExpandedBySearch}
/> />

View File

@@ -269,9 +269,9 @@
.map(x => ({ ...x, conid, database }))} .map(x => ({ ...x, conid, database }))}
module={databaseObjectAppObject} module={databaseObjectAppObject}
groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField, driver)} groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField, driver)}
subItemsComponent={(data, { isExpandedOnlyBySearch }) => subItemsComponent={(data, { isExpandedBySearch }) =>
data.objectTypeField == 'procedures' || data.objectTypeField == 'functions' data.objectTypeField == 'procedures' || data.objectTypeField == 'functions'
? filter && isExpandedOnlyBySearch ? isExpandedBySearch
? SubProcedureLineList ? SubProcedureLineList
: SubProcedureParamList : SubProcedureParamList
: SubTableColumnList} : SubTableColumnList}