improved multi column filter #855

packages/datalib/src/GridDisplay.ts

@@ -214,14 +214,14 @@ export abstract class GridDisplay {
     }
 
     if (this.baseTableOrView && this.config.multiColumnFilter) {
-      try {
+      const orCondition: CompoudCondition = {
-        const condition = parseFilter(this.config.multiColumnFilter, 'string');
+        conditionType: 'or',
-        if (condition) {
+        conditions: [],
-          const orCondition: CompoudCondition = {
+      };
-            conditionType: 'or',
+      for (const column of this.baseTableOrView.columns) {
-            conditions: [],
+        try {
-          };
+          const condition = parseFilter(this.config.multiColumnFilter, getFilterType(column.dataType));
-          for (const column of this.baseTableOrView.columns) {
+          if (condition) {
             orCondition.conditions.push(
               _.cloneDeepWith(condition, (expr: Expression) => {
                 if (expr.exprType == 'placeholder') {
@@ -230,12 +230,13 @@ export abstract class GridDisplay {
               })
             );
           }
-          if (orCondition.conditions.length > 0) {
+        } catch (err) {
-            conditions.push(orCondition);
+          // skip for this column
-          }
+          continue;
         }
-      } catch (err) {
+      }
-        console.warn(err.message);
+      if (orCondition.conditions.length > 0) {
+        conditions.push(orCondition);
       }
     }
 
@@ -482,6 +483,7 @@ export abstract class GridDisplay {
     this.setConfig(cfg => ({
       ...cfg,
       filters: {},
+      multiColumnFilter: null,
     }));
     this.reload();
   }