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

formview - filtering by expanded columns

Browse Source
This commit is contained in:
Jan Prochazka
2021-01-24 08:37:32 +01:00
parent df74dd114b
commit ac59665be4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/web/src/formview/FormViewFilters.js
View File

@@ -86,17 +86,18 @@ export default function FormViewFilters(props) {
{baseTable.primaryKey.columns.map(col => (
<PrimaryKeyFilterEditor key={col.columnName} baseTable={baseTable} column={col} formDisplay={formDisplay} />
))}
{allFilterNames.map(columnName => {
const column = baseTable.columns.find(x => x.columnName == columnName);
{allFilterNames.map(uniqueName => {
const column = formDisplay.columns.find(x => x.uniqueName == uniqueName)
// const column = baseTable.columns.find(x => x.columnName == columnName);
if (!column) return null;
return (
<ColumnWrapper key={columnName}>
<ColumnWrapper key={uniqueName}>
<ColumnNameWrapper>
<ColumnLabel {...column} />
<InlineButton
square
onClick={() => {
formDisplay.removeFilter(column.columnName);
formDisplay.removeFilter(column.uniqueName);
}}
>
<FontIcon icon="icon delete" />
@@ -104,8 +105,8 @@ export default function FormViewFilters(props) {
</ColumnNameWrapper>
<DataFilterControl
filterType={getFilterType(column.dataType)}
filter={filters[column.columnName]}
setFilter={value => formDisplay.setFilter(column.columnName, value)}
filter={filters[column.uniqueName]}
setFilter={value => formDisplay.setFilter(column.uniqueName, value)}
/>
</ColumnWrapper>
);