@dolusoft/vue3-datatable 1.8.12 → 1.8.14

package/dist/vue3-datatable.cjs

@@ -3146,14 +3146,32 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const handleClearAllFilters = () => {
+      var _a;
       Object.keys(filterInputs.value).forEach((key) => {
         filterInputs.value[key] = "";
       });
       Object.keys(columnConditions.value).forEach((key) => {
         columnConditions.value[key] = "";
       });
+      if ((_a = props.all) == null ? void 0 : _a.columns) {
+        props.all.columns.forEach((col) => {
+          if (col.filter) {
+            col.value = "";
+            col.condition = "";
+          }
+        });
+      }
       emit("clearAllFilters");
     };
+    const hasAnyActiveFilterLocal = vue.computed(() => {
+      const hasInputValue = Object.values(filterInputs.value).some(
+        (val) => val !== "" && val !== null && val !== void 0
+      );
+      const hasConditionValue = Object.values(columnConditions.value).some(
+        (val) => val !== "" && val !== null && val !== void 0
+      );
+      return hasInputValue || hasConditionValue;
+    });
     vue.watch(
       () => {
         var _a;
@@ -3256,9 +3274,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
               key: 0,
               type: "button",
               class: vue.normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: vue.withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_6$1, 10, _hoisted_4$1)) : vue.createCommentVNode("", true)
@@ -3281,9 +3299,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
               key: 0,
               type: "button",
               class: vue.normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: vue.withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_10$1, 10, _hoisted_8$1)) : vue.createCommentVNode("", true)
@@ -3306,9 +3324,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
               key: 0,
               type: "button",
               class: vue.normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: vue.withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_14$1, 10, _hoisted_12$1)) : vue.createCommentVNode("", true)
@@ -3820,12 +3838,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const col = props.columns.find((d) => d.isUnique);
       return (col == null ? void 0 : col.field) || null;
     });
-    const hasAnyActiveFilter = vue.computed(() => {
-      if (!props.columns) return false;
-      return props.columns.some((col) => {
+    const hasAnyActiveFilter = vue.ref(false);
+    const updateHasAnyActiveFilter = () => {
+      hasAnyActiveFilter.value = props.columns.some((col) => {
         return col.value !== void 0 && col.value !== null && col.value !== "";
       });
-    });
+    };
     const rowKeys = vue.computed(() => {
       if (!uniqueKey.value) return null;
       return new Map(
@@ -4192,6 +4210,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       selectAll(false);
       filterRows();
+      updateHasAnyActiveFilter();
     };
     vue.watch(() => props.rows, changeRows);
     const setPageSize = (pagesize) => {
@@ -4257,6 +4276,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const filterChange = () => {
       selectAll(false);
+      updateHasAnyActiveFilter();
       if (props.isServerMode) {
         if (currentPage.value === 1) {
           changeForServer("filter", true);
@@ -4420,13 +4440,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const clearAllFilters = () => {
-      var _a2;
       for (const col of props.columns) {
         if (col.filter) {
           col.value = "";
-          col.condition = ((_a2 = col.type) == null ? void 0 : _a2.toLowerCase()) === "string" ? "Contains" : "Equal";
+          col.condition = "";
         }
       }
+      updateHasAnyActiveFilter();
       filterChange();
       emit("clearAllFilters");
     };

package/dist/vue3-datatable.js

@@ -3145,14 +3145,32 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       });
     };
     const handleClearAllFilters = () => {
+      var _a;
       Object.keys(filterInputs.value).forEach((key) => {
         filterInputs.value[key] = "";
       });
       Object.keys(columnConditions.value).forEach((key) => {
         columnConditions.value[key] = "";
       });
+      if ((_a = props.all) == null ? void 0 : _a.columns) {
+        props.all.columns.forEach((col) => {
+          if (col.filter) {
+            col.value = "";
+            col.condition = "";
+          }
+        });
+      }
       emit("clearAllFilters");
     };
+    const hasAnyActiveFilterLocal = computed(() => {
+      const hasInputValue = Object.values(filterInputs.value).some(
+        (val) => val !== "" && val !== null && val !== void 0
+      );
+      const hasConditionValue = Object.values(columnConditions.value).some(
+        (val) => val !== "" && val !== null && val !== void 0
+      );
+      return hasInputValue || hasConditionValue;
+    });
     watch(
       () => {
         var _a;
@@ -3255,9 +3273,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               type: "button",
               class: normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_6$1, 10, _hoisted_4$1)) : createCommentVNode("", true)
@@ -3280,9 +3298,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               type: "button",
               class: normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_10$1, 10, _hoisted_8$1)) : createCommentVNode("", true)
@@ -3305,9 +3323,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               type: "button",
               class: normalizeClass(["bh-clear-all-button", {
-                "bh-clear-all-button--active": props.hasAnyActiveFilter
+                "bh-clear-all-button--active": hasAnyActiveFilterLocal.value
               }]),
-              disabled: !props.hasAnyActiveFilter,
+              disabled: !hasAnyActiveFilterLocal.value,
               onClick: withModifiers(handleClearAllFilters, ["stop"]),
               title: "Clear all filters"
             }, _hoisted_14$1, 10, _hoisted_12$1)) : createCommentVNode("", true)
@@ -3819,12 +3837,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const col = props.columns.find((d) => d.isUnique);
       return (col == null ? void 0 : col.field) || null;
     });
-    const hasAnyActiveFilter = computed(() => {
-      if (!props.columns) return false;
-      return props.columns.some((col) => {
+    const hasAnyActiveFilter = ref(false);
+    const updateHasAnyActiveFilter = () => {
+      hasAnyActiveFilter.value = props.columns.some((col) => {
         return col.value !== void 0 && col.value !== null && col.value !== "";
       });
-    });
+    };
     const rowKeys = computed(() => {
       if (!uniqueKey.value) return null;
       return new Map(
@@ -4191,6 +4209,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       selectAll(false);
       filterRows();
+      updateHasAnyActiveFilter();
     };
     watch(() => props.rows, changeRows);
     const setPageSize = (pagesize) => {
@@ -4256,6 +4275,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const filterChange = () => {
       selectAll(false);
+      updateHasAnyActiveFilter();
       if (props.isServerMode) {
         if (currentPage.value === 1) {
           changeForServer("filter", true);
@@ -4419,13 +4439,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const clearAllFilters = () => {
-      var _a2;
       for (const col of props.columns) {
         if (col.filter) {
           col.value = "";
-          col.condition = ((_a2 = col.type) == null ? void 0 : _a2.toLowerCase()) === "string" ? "Contains" : "Equal";
+          col.condition = "";
         }
       }
+      updateHasAnyActiveFilter();
       filterChange();
       emit("clearAllFilters");
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolusoft/vue3-datatable",
-  "version": "1.8.12",
+  "version": "1.8.14",
   "description": "Vue3 Datatable - fully customizable & easy to use datatable library",
   "private": false,
   "type": "module",