diff --git a/packages/datalib/src/GridConfig.ts b/packages/datalib/src/GridConfig.ts index 39433a74a..650e88217 100644 --- a/packages/datalib/src/GridConfig.ts +++ b/packages/datalib/src/GridConfig.ts @@ -29,7 +29,6 @@ export interface GridConfig extends GridConfigColumns { isFormView?: boolean; formViewRecordNumber?: number; formFilterColumns: string[]; - formColumnFilterText?: string; multiColumnFilter?: string; searchInColumns?: string; } diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index 612cecb54..64a85ddfc 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -459,7 +459,7 @@ setConfig(x => ({ ...x, // @ts-ignore - formColumnFilterText: (x.formColumnFilterText || '') + event.key, + searchInColumns: (x.searchInColumns || '') + event.key, })); } else { // @ts-ignore @@ -473,7 +473,7 @@ if (event.keyCode == keycodes.escape) { setConfig(x => ({ ...x, - formColumnFilterText: '', + searchInColumns: '', })); } @@ -541,7 +541,7 @@ columnIndex = incrementFunc(columnIndex); while ( isInRange(columnIndex) && - !filterName(display.config.formColumnFilterText, display.formColumns[columnIndex].columnName) + !filterName(display.config.searchInColumns, display.formColumns[columnIndex].columnName) ) { columnIndex = incrementFunc(columnIndex); } @@ -549,7 +549,7 @@ columnIndex = firstInRange; while ( isInRange(columnIndex) && - !filterName(display.config.formColumnFilterText, display.formColumns[columnIndex].columnName) + !filterName(display.config.searchInColumns, display.formColumns[columnIndex].columnName) ) { columnIndex = incrementFunc(columnIndex); } @@ -572,7 +572,7 @@ case keycodes.rightArrow: return moveCurrentCell(currentCell[0], currentCell[1] + 1); case keycodes.upArrow: - if (currentCell[1] % 2 == 0 && display.config.formColumnFilterText) { + if (currentCell[1] % 2 == 0 && display.config.searchInColumns) { return findFilteredColumn( x => x - 1, x => x >= 0, @@ -583,7 +583,7 @@ return moveCurrentCell(currentCell[0] - 1, currentCell[1]); case keycodes.downArrow: - if (currentCell[1] % 2 == 0 && display.config.formColumnFilterText) { + if (currentCell[1] % 2 == 0 && display.config.searchInColumns) { return findFilteredColumn( x => x + 1, x => x < display.formColumns.length, @@ -631,8 +631,8 @@ data-row={rowIndex} data-col={chunkIndex * 2} style={rowHeight > 1 ? `height: ${rowHeight}px` : undefined} - class:columnFiltered={display.config.formColumnFilterText && - filterName(display.config.formColumnFilterText, col.columnName)} + class:columnFiltered={display.config.searchInColumns && + filterName(display.config.searchInColumns, col.columnName)} class:isSelected={currentCell[0] == rowIndex && currentCell[1] == chunkIndex * 2} bind:this={domCells[`${rowIndex},${chunkIndex * 2}`]} > diff --git a/packages/web/src/formview/FormViewFilters.svelte b/packages/web/src/formview/FormViewFilters.svelte index 2fa0721fb..deab9bc4c 100644 --- a/packages/web/src/formview/FormViewFilters.svelte +++ b/packages/web/src/formview/FormViewFilters.svelte @@ -39,12 +39,12 @@
{ if (e.keyCode == keycodes.escape) { setConfig(x => ({ ...x, - formColumnFilterText: '', + searchInColumns: '', })); } }} @@ -52,7 +52,7 @@ setConfig(x => ({ ...x, // @ts-ignore - formColumnFilterText: e.target.value, + searchInColumns: e.target.value, }))} />