From 6ea54a5b0ac4cb2b90081521911377d37aaa8959 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Mon, 16 Dec 2024 17:01:05 +0100 Subject: [PATCH] tokenized column search --- packages/web/src/datagrid/ColumnManager.svelte | 1 + packages/web/src/datagrid/ColumnManagerRow.svelte | 3 ++- packages/web/src/elements/ColumnLabel.svelte | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/web/src/datagrid/ColumnManager.svelte b/packages/web/src/datagrid/ColumnManager.svelte index ee889e90e..76031e8ac 100644 --- a/packages/web/src/datagrid/ColumnManager.svelte +++ b/packages/web/src/datagrid/ColumnManager.svelte @@ -235,6 +235,7 @@ {columnIndex} {allowChangeChangeSetStructure} isSelected={selectedColumns.includes(column.uniqueName) || currentColumnUniqueName == column.uniqueName} + {filter} on:click={() => { if (domFocusField) domFocusField.focus(); selectedColumns = [column.uniqueName]; diff --git a/packages/web/src/datagrid/ColumnManagerRow.svelte b/packages/web/src/datagrid/ColumnManagerRow.svelte index 864f6c60d..b5340d991 100644 --- a/packages/web/src/datagrid/ColumnManagerRow.svelte +++ b/packages/web/src/datagrid/ColumnManagerRow.svelte @@ -15,6 +15,7 @@ export let conid; export let database; export let isDynamicStructure; + export let filter = undefined; export let tableInfo; export let setTableInfo; @@ -83,7 +84,7 @@ }} /> {/if} - + {#if allowChangeChangeSetStructure && !isDynamicStructure} diff --git a/packages/web/src/elements/ColumnLabel.svelte b/packages/web/src/elements/ColumnLabel.svelte index 14d74c972..9e5443ba9 100644 --- a/packages/web/src/elements/ColumnLabel.svelte +++ b/packages/web/src/elements/ColumnLabel.svelte @@ -11,6 +11,7 @@ import { openDatabaseObjectDetail } from '../appobj/DatabaseObjectAppObject.svelte'; import FontIcon from '../icons/FontIcon.svelte'; + import TokenizedFilteredText from '../widgets/TokenizedFilteredText.svelte'; import Link from './Link.svelte'; export let notNull = false; @@ -25,6 +26,7 @@ export let conid = undefined; export let database = undefined; export let iconOverride = undefined; + export let filter = undefined; $: icon = iconOverride || getColumnIcon($$props, forceIcon); @@ -33,7 +35,7 @@ {#if icon} {/if} - {headerText || columnName} + {#if extInfo} {extInfo} {/if}