@wx-design/components 1.1.19 → 1.1.20

package/es/index.mjs

@@ -17909,7 +17909,7 @@ const EC = "$__table_id", SC = "$__table_parent", bs = (e, t) => {
     row: d,
     ...u
   }) => {
-    var x, b, O;
+    var x, b, O, D;
     if (typeof t.filterMethod == "function")
       return t.filterMethod({
         option: c,
@@ -17923,25 +17923,25 @@ const EC = "$__table_id", SC = "$__table_parent", bs = (e, t) => {
         ...u
       });
     const f = A(() => {
-      var D, v, g, E;
-      return (D = t == null ? void 0 : t.headerFilterConfig) != null && D.extendFromColumnEditor ? ko(
+      var v, g, E, w;
+      return (v = t == null ? void 0 : t.headerFilterConfig) != null && v.extendFromColumnEditor ? ko(
         // @ts-ignore
-        t.editorProps || ((v = t.editRender) == null ? void 0 : v.editorProps) || {},
-        ((g = t.headerFilterConfig) == null ? void 0 : g.editorProps) || {}
-      ) : (E = t == null ? void 0 : t.headerFilterConfig) == null ? void 0 : E.editorProps;
+        t.editorProps || ((g = t.editRender) == null ? void 0 : g.editorProps) || {},
+        ((E = t.headerFilterConfig) == null ? void 0 : E.editorProps) || {}
+      ) : (w = t == null ? void 0 : t.headerFilterConfig) == null ? void 0 : w.editorProps;
     }), p = c.data ?? c.value;
     if (typeof p < "u" && t.field) {
-      let D = ((O = d[((b = f.value) == null ? void 0 : b.effectValueField) || t.field]) == null ? void 0 : O.toString().toLowerCase()) || "";
+      let v = ((O = d[((b = f.value) == null ? void 0 : b.effectValueField) || t.field]) == null ? void 0 : O.toString().toLowerCase()) || "";
       if (Array.isArray(p)) {
-        for (let v of p)
-          if (D.includes(v == null ? void 0 : v.toString().toLowerCase()))
+        for (let g of p)
+          if (v.includes(g == null ? void 0 : g.toString().toLowerCase()))
             return !0;
-        if (t.sabCellType === Nn.DatePciker && p.length === 2) {
-          let [v, g] = p;
-          return v = new Date(v), g = new Date(g), D = new Date(D), D >= v && D <= g;
+        if ((t.sabCellType === Nn.DatePciker || ((D = t.headerFilterConfig) == null ? void 0 : D.sabCellType) === Nn.DatePciker) && p.length === 2) {
+          let [g, E] = p;
+          return g = new Date(g), E = new Date(E), v = new Date(v), v >= g && v <= E;
         }
       }
-      return D.includes(p == null ? void 0 : p.toString().toLowerCase());
+      return v.includes(p == null ? void 0 : p.toString().toLowerCase());
     }
     return !0;
   };