diff --git a/packages/web/src/datagrid/DataGrid.svelte b/packages/web/src/datagrid/DataGrid.svelte index 6db0cd8cc..18c886bc1 100644 --- a/packages/web/src/datagrid/DataGrid.svelte +++ b/packages/web/src/datagrid/DataGrid.svelte @@ -159,7 +159,7 @@ - + {#if column} @@ -29,6 +35,13 @@ filterType={getFilterType(column.dataType)} filter={filters[column.uniqueName]} setFilter={value => formDisplay.setFilter(column.uniqueName, value)} + {driver} + {conid} + {database} + {schemaName} + {pureName} + columnName={column.uniquePath.length == 1 ? column.uniquePath[0] : null} + foreignKey={column.foreignKey} /> {/if} diff --git a/packages/web/src/formview/FormViewFilters.svelte b/packages/web/src/formview/FormViewFilters.svelte index 217868f84..d443d95de 100644 --- a/packages/web/src/formview/FormViewFilters.svelte +++ b/packages/web/src/formview/FormViewFilters.svelte @@ -2,7 +2,7 @@ import _ from 'lodash'; import ManagerInnerContainer from '../elements/ManagerInnerContainer.svelte'; -import keycodes from '../utility/keycodes'; + import keycodes from '../utility/keycodes'; import FormViewFilterColumn from './FormViewFilterColumn.svelte'; import PrimaryKeyFilterEditor from './PrimaryKeyFilterEditor.svelte'; @@ -10,12 +10,17 @@ import keycodes from '../utility/keycodes'; export let formDisplay; export let setConfig; + export let driver; + export let conid; + export let database; + export let schemaName; + export let pureName; + $: baseTable = formDisplay?.baseTable; $: formFilterColumns = formDisplay?.config?.formFilterColumns; $: filters = formDisplay?.config?.filters; $: allFilterNames = _.union(_.keys(filters || {}), formFilterColumns || []); -
@@ -53,6 +58,11 @@ import keycodes from '../utility/keycodes'; column={formDisplay.columns.find(x => x.uniqueName == uniqueName)} {formDisplay} {filters} + {driver} + {conid} + {database} + {schemaName} + {pureName} /> {/each}