trithuc-mvc-react 2.9.7 → 2.9.8

package/components/DataManagement/FilterGod.jsx

@@ -6,6 +6,7 @@ import { useDataTable } from "./hooks";
 
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import AccordionDetails from "@mui/material/AccordionDetails";
+import moment from "moment";
 import { DateRangePicker } from "../date";
 
 export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }) => {
@@ -43,15 +44,22 @@ export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }
                     <DateRangePicker
                       label={label}
                       onChange={(value) => {
-                        setDataSearch({
-                          ...dataSearch,
-                          [field[0]]: value[0],
-                          [field[1]]: value[1]
-                        });
-                        setPage(0);
+                        const [fromDate, toDate] = value || []; // Destructure value để đảm bảo xử lý null/undefined
+                        const formattedFromDate = fromDate ? moment(fromDate).format("YYYY-MM-DD HH:mm:ss.SSS") : null;
+                        const formattedToDate = toDate ? moment(toDate).format("YYYY-MM-DD HH:mm:ss.SSS") : null;
+
+                        // Kiểm tra nếu field hợp lệ trước khi cập nhật
+                        if (field?.[0] && field?.[1]) {
+                          setDataSearch({
+                            ...dataSearch,
+                            [field[0]]: formattedFromDate,
+                            [field[1]]: formattedToDate
+                          });
+                          setPage(0);
+                        }
                       }}
                       size={elementSize}
-                      value={[dataSearch?.[field[0]], dataSearch?.[field[1]]]}
+                      value={[dataSearch?.[field?.[0]] || null, dataSearch?.[field?.[1]] || null]}
                     />
                   </Grid>
                 );

package/components/DataManagement/index.jsx

@@ -26,7 +26,7 @@ DataManagement.propTypes = {
   selectedField: PropTypes.string,
   filters: PropTypes.arrayOf(
     PropTypes.shape({
-      field: PropTypes.string,
+      field: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]).isRequired,
       label: PropTypes.string,
       placeHolder: PropTypes.string,
       type: PropTypes.oneOf([
@@ -39,12 +39,13 @@ DataManagement.propTypes = {
         "radio",
         "switch",
         "search",
+        "select",
+        "date-range",
         "default"
       ]),
-      onChangeAfter: PropTypes.func,
-      filters: PropTypes.array
+      onChangeAfter: PropTypes.func
     })
-  ),
+  ).isRequired,
   editorFields: PropTypes.array,
   validationSchema: PropTypes.object,
   disableStatus: PropTypes.bool,

package/hooks/usePermission.js

@@ -17,7 +17,6 @@ const usePermission = (tableName) => {
     if (permission) {
       if (permission.TrangThaiXuLy !== undefined && permission.ObjTrangThai) {
         const status = permission.ObjTrangThai.find((t) => t.StatusId === permission.TrangThaiXuLy) || {};
-
         return {
           canEdit: status.Edit ?? false,
           canDelete: status.Delete ?? false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "2.9.7",
+  "version": "2.9.8",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -38,13 +38,13 @@
     "@mui/icons-material": "^5.15.12",
     "@mui/lab": "^5.0.0-alpha.142",
     "@mui/material": "^5.15.12",
-    "@mui/x-date-pickers": "^7.22.1",
+    "@mui/x-date-pickers": "^6.10.2",
     "@mui/x-tree-view": "^7.22.1",
+    "material-ui-confirm": "^3.0.9",
     "react": ">=16",
     "react-dom": ">=16",
+    "react-hook-form": "^7.45.2",
     "react-query": "^3.39.3",
-    "react-toastify": "^10.0.6",
-    "material-ui-confirm": "^3.0.9",
-    "react-hook-form": "^7.45.2"
+    "react-toastify": "^10.0.6"
   }
 }