@visns-studio/visns-components 1.7.3 → 1.7.5

package/.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

package/components/crm/visns-data-grid.jsx

@@ -155,7 +155,7 @@ const DataGrid = forwardRef(
                 const sqlResult = loadData(params, dSearch, ajaxSetting);
 
                 if (setFilterData && params.filterValue) {
-                    setFilterData([params.filterValue]);
+                    setFilterData(params.filterValue);
                 }
 
                 sqlResult.then((res) => {
@@ -189,9 +189,23 @@ const DataGrid = forwardRef(
             },
         }));
 
-        const handleFilterChange = (d) => {
+        const handleFilterChange = useCallback((d) => {
+            // d.forEach((filterValue) => {
+            //     if (filterValue.reset && filterValue.reset.length > 0) {
+            //         filterValue.reset.forEach((reset) => {
+            //             const existingIndex = d.findIndex(
+            //                 (f) => f.key === reset
+            //             );
+
+            //             if (existingIndex !== -1) {
+            //                 d[existingIndex].value = "";
+            //             }
+            //         });
+            //     }
+            // });
+
             setFilterValue(d);
-        };
+        }, []);
 
         const handleChangeSearch = (e) => {
             const { value } = e.target;
@@ -1179,6 +1193,10 @@ const DataGrid = forwardRef(
                                 }, "");
 
                                 if (value) {
+                                    if (Array.isArray(value)) {
+                                        value = value[0];
+                                    }
+
                                     if (Array.isArray(column.nameFrom)) {
                                         value = column.nameFrom
                                             .map((nf) => value[nf])
@@ -1576,6 +1594,7 @@ const DataGrid = forwardRef(
                         operator: column.filter.operator,
                         type: column.filter.type,
                         value: column.filter.value ? column.filter.value : "",
+                        reset: column.filter.reset ? column.filter.reset : [],
                     };
                 });
 
@@ -1599,13 +1618,11 @@ const DataGrid = forwardRef(
                             : {},
                         (res) => {
                             let filterName;
-
                             if (Array.isArray(column.id)) {
                                 const concatenatedIds = column.id.reduce(
                                     (acc, id) => acc + `${id}.`,
                                     ""
                                 );
-
                                 filterName = column.nameFrom
                                     ? concatenatedIds + column.nameFrom
                                     : concatenatedIds;
@@ -1614,11 +1631,9 @@ const DataGrid = forwardRef(
                                     ? column.id + column.nameFrom
                                     : column.id;
                             }
-
                             const filterIndex = filterDataSource.findIndex(
                                 (filter) => filter.id === filterName
                             );
-
                             if (filterIndex >= 0) {
                                 const updatedFilter = {
                                     ...filterDataSource[filterIndex],
@@ -1646,16 +1661,13 @@ const DataGrid = forwardRef(
                     let filterName = Array.isArray(column.id)
                         ? column.id.reduce((acc, id) => acc + `${id}.`, "")
                         : column.id;
-
                     if (column.nameFrom) {
                         filterName += column.nameFrom;
                     }
-
                     const newFilter = {
                         id: filterName,
                         dataset: column.filter.options,
                     };
-
                     setFilterDataSource((prevState) => [
                         ...prevState,
                         newFilter,
@@ -1740,7 +1752,9 @@ const DataGrid = forwardRef(
                         "-"
                     )}`}
                     minRowHeight={40}
-                    onFilterValueChange={setFilterValue}
+                    onFilterValueChange={(filterValue) => {
+                        handleFilterChange(filterValue);
+                    }}
                     onLimitChange={setLimit}
                     onRenderRow={onRenderRow}
                     pagination