form view columns filter

packages/datalib/src/GridConfig.ts

@@ -33,6 +33,7 @@ export interface GridConfig extends GridConfigColumns {
   formViewKey?: { [uniqueName: string]: string };
   formViewKeyRequested?: { [uniqueName: string]: string };
   formFilterColumns: string[];
+  formColumnFilterText?: string;
 }
 
 export interface GridCache {

packages/web/src/formview/FormView.svelte

@@ -152,9 +152,12 @@
   function isDataCell(cell) {
     return cell[1] % 2 == 1;
   }
+
 </script>
 
 <script lang="ts">
+  import { filterName } from 'dbgate-datalib';
+
   import _ from 'lodash';
 
   import { getContext } from 'svelte';
@@ -210,7 +213,10 @@
 
   $: rowCount = Math.floor((wrapperHeight - 22) / (rowHeight + 2));
 
-  $: columnChunks = _.chunk(formDisplay.columns, rowCount) as any[][];
+  $: columnChunks = _.chunk(
+    formDisplay.columns.filter(x => filterName(formDisplay.config.formColumnFilterText, x.columnName)),
+    rowCount
+  ) as any[][];
 
   $: rowCountInfo = getRowCountInfo(rowCountBefore, allRowCount);
 
@@ -380,10 +386,24 @@
         (event.keyCode >= keycodes.n0 && event.keyCode <= keycodes.n9) ||
         event.keyCode == keycodes.dash)
     ) {
-      // @ts-ignore
+      if (currentCell[1] % 2 == 0) {
-      event.preventDefault();
+        setConfig(x => ({
-      dispatchInsplaceEditor({ type: 'show', text: event.key, cell: currentCell });
+          ...x,
-      // console.log('event', event.nativeEvent);
+          // @ts-ignore
+          formColumnFilterText: (x.formColumnFilterText || '') + event.key,
+        }));
+      } else {
+        // @ts-ignore
+        event.preventDefault();
+        dispatchInsplaceEditor({ type: 'show', text: event.key, cell: currentCell });
+      }
+    }
+
+    if (event.keyCode == keycodes.escape) {
+      setConfig(x => ({
+        ...x,
+        formColumnFilterText: '',
+      }));
     }
 
     if (event.keyCode == keycodes.f2) {
@@ -441,6 +461,7 @@
   function handleSetFormView(rowData, column) {
     openReferenceForm(rowData, column, conid, database);
   }
+
 </script>
 
 <div class="outer">
@@ -594,4 +615,5 @@
     right: 40px;
     bottom: 20px;
   }
+
 </style>

packages/web/src/formview/FormViewFilters.svelte

@@ -2,19 +2,46 @@
   import _ from 'lodash';
 
   import ManagerInnerContainer from '../elements/ManagerInnerContainer.svelte';
+import keycodes from '../utility/keycodes';
   import FormViewFilterColumn from './FormViewFilterColumn.svelte';
   import PrimaryKeyFilterEditor from './PrimaryKeyFilterEditor.svelte';
 
   export let managerSize;
   export let formDisplay;
+  export let setConfig;
 
   $: baseTable = formDisplay?.baseTable;
   $: formFilterColumns = formDisplay?.config?.formFilterColumns;
   $: filters = formDisplay?.config?.filters;
 
   $: allFilterNames = _.union(_.keys(filters || {}), formFilterColumns || []);
+
 </script>
 
+<div class="m-1">
+  <div>Column filter</div>
+  <div class="flex">
+    <input
+      type="text"
+      value={formDisplay?.config?.formColumnFilterText || ''}
+      on:keydown={e => {
+        if (e.keyCode == keycodes.escape) {
+          setConfig(x => ({
+            ...x,
+            formColumnFilterText: '',
+          }));
+        }
+      }}
+      on:input={e =>
+        setConfig(x => ({
+          ...x,
+          // @ts-ignore
+          formColumnFilterText: e.target.value,
+        }))}
+    />
+  </div>
+</div>
+
 {#if baseTable?.primaryKey}
   <ManagerInnerContainer width={managerSize}>
     {#each baseTable.primaryKey.columns as col}