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

perspective:removed filterInfos,using only filters

Browse Source
This commit is contained in:
Jan Prochazka
2022-08-07 16:48:27 +02:00
parent 3f9bd100e1
commit 6154b4c780
4 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packages/web/src/perspectives/PerspectiveFilters.svelte
View File

@@ -16,7 +16,7 @@
export let database;
export let driver;
$: allFilterNames = _.keys(config.filterInfos || {});
$: allFilterNames = _.keys(config.filters || {});
</script>
<ManagerInnerContainer width={managerSize} isFlex={allFilterNames.length == 0}>
@@ -27,28 +27,32 @@
</div>
{:else}
{#each allFilterNames as uniqueName}
<PerspectiveFiltersColumn
filterInfo={config.filterInfos[uniqueName]}
{uniqueName}
{conid}
{database}
{driver}
filter={config.filters[uniqueName]}
onSetFilter={value =>
setConfig(cfg => ({
...cfg,
filters: {
...cfg.filters,
[uniqueName]: value,
},
}))}
onRemoveFilter={value =>
setConfig(cfg => ({
...cfg,
filters: _.omit(cfg.filters, [uniqueName]),
filterInfos: _.omit(cfg.filterInfos, [uniqueName]),
}))}
/>
{@const node = root?.findNodeByUniqueName(uniqueName)}
{@const filterInfo = node?.filterInfo}
{#if filterInfo}
<PerspectiveFiltersColumn
{filterInfo}
{uniqueName}
{conid}
{database}
{driver}
filter={config.filters[uniqueName]}
onSetFilter={value =>
setConfig(cfg => ({
...cfg,
filters: {
...cfg.filters,
[uniqueName]: value,
},
}))}
onRemoveFilter={value =>
setConfig(cfg => ({
...cfg,
filters: _.omit(cfg.filters, [uniqueName]),
// filterInfos: _.omit(cfg.filterInfos, [uniqueName]),
}))}
/>
{/if}
{/each}
{/if}
</ManagerInnerContainer>

8
packages/web/src/perspectives/PerspectiveTable.svelte
View File

@@ -274,10 +274,10 @@
...cfg.filters,
[dataNode.uniqueName]: getFilterValueExpression(value, dataNode.column.dataType),
},
filterInfos: {
...cfg.filterInfos,
[dataNode.uniqueName]: dataNode.filterInfo,
},
// filterInfos: {
// ...cfg.filterInfos,
// [dataNode.uniqueName]: dataNode.filterInfo,
// },
}));
},
});

6
packages/web/src/perspectives/perspectiveMenu.ts
View File

@@ -78,9 +78,9 @@ export function getPerspectiveNodeMenu(props: PerspectiveNodeMenuProps) {
onClick: () =>
setConfig(cfg => ({
...cfg,
filterInfos: {
...cfg.filterInfos,
[node.uniqueName]: filterInfo,
filters: {
...cfg.filters,
[node.uniqueName]: '',
},
})),
},