mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-19 04:56:00 +00:00
UX fix
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
export let groupFunc = undefined;
|
||||
export let onDropOnGroup = undefined;
|
||||
export let emptyGroupNames = [];
|
||||
export let isExpandedOnlyBySearch = false;
|
||||
export let isExpandedBySearch = false;
|
||||
|
||||
export let collapsedGroupNames = writable([]);
|
||||
export let onChangeFilteredList = undefined;
|
||||
@@ -79,8 +79,8 @@
|
||||
$: groups = groupFunc ? extendGroups(_.groupBy(listGrouped, 'group'), emptyGroupNames) : null;
|
||||
|
||||
$: listLimited =
|
||||
isExpandedOnlyBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list;
|
||||
$: isListLimited = isExpandedOnlyBySearch && listLimited.length < filtered.length;
|
||||
isExpandedBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list;
|
||||
$: isListLimited = isExpandedBySearch && listLimited.length < filtered.length;
|
||||
</script>
|
||||
|
||||
{#if groupFunc}
|
||||
|
||||
@@ -63,10 +63,13 @@
|
||||
{#if (isExpanded || isExpandedBySearch) && subItemsComponent}
|
||||
<div class="subitems">
|
||||
<svelte:component
|
||||
this={subItemsComponent(data, { isExpandedOnlyBySearch: isExpandedBySearch && !isExpanded })}
|
||||
this={subItemsComponent(data, {
|
||||
isExpandedBySearch,
|
||||
})}
|
||||
{data}
|
||||
{filter}
|
||||
{passProps}
|
||||
{isExpandedBySearch}
|
||||
isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
export let passProps;
|
||||
|
||||
export let isExpandedOnlyBySearch;
|
||||
export let isExpandedBySearch;
|
||||
|
||||
$: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id });
|
||||
$: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || [];
|
||||
@@ -24,5 +25,5 @@
|
||||
module={databaseAppObject}
|
||||
{passProps}
|
||||
{filter}
|
||||
{isExpandedOnlyBySearch}
|
||||
{isExpandedBySearch}
|
||||
/>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
export let data;
|
||||
export let filter;
|
||||
export let isExpandedOnlyBySearch;
|
||||
export let isExpandedBySearch;
|
||||
</script>
|
||||
|
||||
<AppObjectList
|
||||
@@ -17,5 +17,5 @@
|
||||
}))}
|
||||
module={procedureLineAppObject}
|
||||
{filter}
|
||||
{isExpandedOnlyBySearch}
|
||||
{isExpandedBySearch}
|
||||
/>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
export let data;
|
||||
export let filter;
|
||||
export let isExpandedOnlyBySearch;
|
||||
export let isExpandedBySearch;
|
||||
</script>
|
||||
|
||||
<AppObjectList
|
||||
@@ -17,5 +17,5 @@
|
||||
}))}
|
||||
module={columnAppObject}
|
||||
{filter}
|
||||
{isExpandedOnlyBySearch}
|
||||
{isExpandedBySearch}
|
||||
/>
|
||||
|
||||
@@ -269,9 +269,9 @@
|
||||
.map(x => ({ ...x, conid, database }))}
|
||||
module={databaseObjectAppObject}
|
||||
groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField, driver)}
|
||||
subItemsComponent={(data, { isExpandedOnlyBySearch }) =>
|
||||
subItemsComponent={(data, { isExpandedBySearch }) =>
|
||||
data.objectTypeField == 'procedures' || data.objectTypeField == 'functions'
|
||||
? filter && isExpandedOnlyBySearch
|
||||
? isExpandedBySearch
|
||||
? SubProcedureLineList
|
||||
: SubProcedureParamList
|
||||
: SubTableColumnList}
|
||||
|
||||
Reference in New Issue
Block a user