removed misleading WidgetColumnBarItrem.show attr

This commit is contained in:
Jan Prochazka
2023-03-13 20:18:13 +01:00
parent a45782098a
commit 00bf1e64a1
3 changed files with 11 additions and 10 deletions

View File

@@ -165,7 +165,7 @@
> >
<div class="left" slot="1"> <div class="left" slot="1">
<WidgetColumnBar> <WidgetColumnBar>
<WidgetColumnBarItem title="Columns" name="columns" height="45%" show={!isFormView}> <WidgetColumnBarItem title="Columns" name="columns" height="45%" skip={isFormView}>
<ColumnManager {...$$props} {managerSize} {isJsonView} {isDynamicStructure} bind:this={domColumnManager} /> <ColumnManager {...$$props} {managerSize} {isJsonView} {isDynamicStructure} bind:this={domColumnManager} />
</WidgetColumnBarItem> </WidgetColumnBarItem>
@@ -173,7 +173,7 @@
title="Filters" title="Filters"
name="filters" name="filters"
height={showReferences && display?.hasReferences && !isFormView ? '15%' : '30%'} height={showReferences && display?.hasReferences && !isFormView ? '15%' : '30%'}
show={display?.filterable} skip={!display?.filterable}
collapsed={isDetailView} collapsed={isDetailView}
> >
<FormViewFilters <FormViewFilters
@@ -192,7 +192,7 @@
name="references" name="references"
height="30%" height="30%"
collapsed={isDetailView} collapsed={isDetailView}
show={showReferences && display?.hasReferences} skip={!(showReferences && display?.hasReferences)}
> >
<ReferenceManager {...$$props} {managerSize} /> <ReferenceManager {...$$props} {managerSize} />
</WidgetColumnBarItem> </WidgetColumnBarItem>

View File

@@ -50,9 +50,11 @@
title={driver?.databaseEngineTypes?.includes('document') ? 'Collections' : 'Tables, views, functions'} title={driver?.databaseEngineTypes?.includes('document') ? 'Collections' : 'Tables, views, functions'}
name="dbObjects" name="dbObjects"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
show={conid && skip={!(
conid &&
(database || singleDatabase) && (database || singleDatabase) &&
(driver?.databaseEngineTypes?.includes('sql') || driver?.databaseEngineTypes?.includes('document'))} (driver?.databaseEngineTypes?.includes('sql') || driver?.databaseEngineTypes?.includes('document'))
)}
> >
<SqlObjectList {conid} {database} /> <SqlObjectList {conid} {database} />
</WidgetColumnBarItem> </WidgetColumnBarItem>
@@ -61,7 +63,7 @@
title={'Keys'} title={'Keys'}
name="dbObjects" name="dbObjects"
storageName="dbObjectsWidget" storageName="dbObjectsWidget"
show={conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue')} skip={!(conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue'))}
> >
<DbKeysTree {conid} {database} /> <DbKeysTree {conid} {database} />
</WidgetColumnBarItem> </WidgetColumnBarItem>

View File

@@ -12,7 +12,6 @@
export let title; export let title;
export let name; export let name;
export let skip = false; export let skip = false;
export let show = true;
export let height = null; export let height = null;
export let collapsed = null; export let collapsed = null;
@@ -32,12 +31,12 @@
{ {
collapsed, collapsed,
height, height,
skip: skip || !show, skip,
}, },
dynamicProps dynamicProps
); );
$: updateWidgetItemDefinition(widgetItemIndex, { collapsed: !visible, height, skip: skip || !show }); $: updateWidgetItemDefinition(widgetItemIndex, { collapsed: !visible, height, skip });
$: setInitialSize(height, $widgetColumnBarHeight); $: setInitialSize(height, $widgetColumnBarHeight);
@@ -67,7 +66,7 @@
$: collapsible = $dynamicProps.visibleItemsCount != 1 || !visible; $: collapsible = $dynamicProps.visibleItemsCount != 1 || !visible;
</script> </script>
{#if !skip && show} {#if !skip}
<WidgetTitle clickable={collapsible} on:click={collapsible ? () => (visible = !visible) : null}>{title}</WidgetTitle> <WidgetTitle clickable={collapsible} on:click={collapsible ? () => (visible = !visible) : null}>{title}</WidgetTitle>
{#if visible} {#if visible}