trithuc-mvc-react 3.0.6 → 3.0.8

package/components/DataManagement/DataTable.jsx

@@ -15,7 +15,6 @@ import { TableRowRender } from "./TableRowRender";
 import TableToolbar from "./TableToolbar";
 import { useDataTable } from "./hooks";
 const defaultQueryOptions = {
-  keepPreviousData: true, // Giữ dữ liệu cũ trong khi tải dữ liệu mới
   staleTime: 1000 * 60 * 1, // Thời gian dữ liệu có thể sử dụng lại trước khi gọi lại API
   cacheTime: 1000 * 60 * 30, // Thời gian dữ liệu được lưu trong cache trước khi bị xóa
   refetchOnWindowFocus: true, // Tự động lấy lại dữ liệu khi người dùng quay lại tab

package/components/DataManagement/FilterGod.jsx

@@ -181,8 +181,8 @@ export const FilterGod = ({ tableName, filters, elementSize = "small", setPage =
                 );
               }
               return (
-                <Grid key={field} md={size?.md} xs={size?.xs} sm={size?.sm}>
-                  <FilterElement name={field} {...rest} setPage={setPage} />
+                <Grid key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <FilterElement name={field.toString()} {...rest} setPage={setPage} />
                 </Grid>
               );
             })}

package/components/DataManagement/index.jsx

@@ -27,7 +27,7 @@ DataManagement.propTypes = {
   filters: PropTypes.arrayOf(
     PropTypes.shape({
       field: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]).isRequired,
-      label: PropTypes.string,
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]), // Hỗ trợ cả chuỗi và mảng chuỗi
       placeHolder: PropTypes.string,
       type: PropTypes.oneOf([
         "text",
@@ -46,6 +46,7 @@ DataManagement.propTypes = {
       onChangeAfter: PropTypes.func
     })
   ).isRequired,
+
   editorFields: PropTypes.array,
   validationSchema: PropTypes.object,
   disableStatus: PropTypes.bool,

package/hooks/usePermission.js

@@ -10,10 +10,8 @@ const usePermission = (tableName) => {
     throw new Error("usePermission must be used within a PermissionProvider");
   }
   const { permissionMap, setPermission } = context;
-
   const permission = permissionMap[tableName];
-
-  const { canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport } = useMemo(() => {
+  const { canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport, canExportWord } = useMemo(() => {
     if (permission) {
       if (permission.TrangThaiXuLy !== undefined && permission.ObjTrangThai) {
         const status = permission.ObjTrangThai.find((t) => t.StatusId === permission.TrangThaiXuLy) || {};
@@ -25,7 +23,8 @@ const usePermission = (tableName) => {
           canCreate: status.Create ?? false,
           canAction: status.Action ?? false,
           canView: status.View ?? false,
-          canImport: status.ImportFile ?? false
+          canImport: status.ImportFile ?? false,
+          canExportWord: status.ExportWord ?? false
         };
       } else {
         return {
@@ -36,7 +35,8 @@ const usePermission = (tableName) => {
           canCreate: permission.Create ?? false,
           canAction: permission.Action ?? false,
           canView: permission.View ?? false,
-          canImport: permission.ImportFile ?? false
+          canImport: permission.ImportFile ?? false,
+          canExportWord: permission.ExportWord ?? false
         };
       }
     } else {
@@ -49,7 +49,8 @@ const usePermission = (tableName) => {
         canCreate: false,
         canAction: false,
         canView: false,
-        canImport: false
+        canImport: false,
+        canExportWord: false
       };
     }
   }, [permission]);
@@ -58,6 +59,18 @@ const usePermission = (tableName) => {
     setPermission({ ...permissionMap, [tableName]: permission });
   };
 
-  return { permission, set, canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport };
+  return {
+    permission,
+    set,
+    canEdit,
+    canDelete,
+    canDeleteMulti,
+    canSave,
+    canCreate,
+    canAction,
+    canView,
+    canImport,
+    canExportWord
+  };
 };
 export default usePermission;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -13,12 +13,12 @@
   },
   "description": "",
   "dependencies": {
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.13.0",
+    "@emotion/react": "^11.13.5",
+    "@emotion/styled": "^11.13.5",
     "@hookform/resolvers": "^3.9.1",
     "@iconify/react": "^5.0.2",
     "axios": "^1.7.7",
-    "date-fns": "^2.17.0",
+    "date-fns": "^3.6.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "prop-types": "^15.8.1",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "eslint": "^9.14.0",
+    "eslint": "^9.15.0",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",
@@ -35,15 +35,16 @@
     "react-dom": "^18.3.1"
   },
   "peerDependencies": {
-    "@mui/icons-material": "^5.15.12",
     "@mui/lab": "^5.0.0-alpha.142",
     "@mui/material": "^5.15.12",
-    "@mui/x-date-pickers": "^6.10.2",
+    "@mui/system": "^5.15.12",
+    "@mui/icons-material": "^5.15.12",
     "@mui/x-tree-view": "^7.22.1",
-    "material-ui-confirm": "^3.0.9",
+    "@mui/x-date-pickers": "^6.19.6",
+    "material-ui-confirm": "^3.0.16",
     "react": ">=16",
     "react-dom": ">=16",
-    "react-hook-form": "^7.45.2",
+    "react-hook-form": "^7.53.2",
     "react-query": "^3.39.3",
     "react-toastify": "^10.0.6",
     "dayjs": "^1.11.13"

package/utils/storage.js

@@ -3,9 +3,11 @@ import moment from "moment";
 
 // Khóa bí mật để mã hóa và giải mã MD5 https://zozo.vn/ws/tools/md5encode
 const secretKey = "b0dc70c6a34c0555ac9c63907617f5a5"; // Bạn nên lưu trữ key này an toàn
-
+export const encryptPassword = (data) => {
+  return btoa(data); // Mã hóa chuỗi sang Base64
+};
 // Hàm mã hóa dữ liệu
-const encryptData = (data) => {
+export const encryptData = (data) => {
   if (!data) {
     return null;
   }
@@ -18,7 +20,7 @@ const encryptData = (data) => {
   }
 };
 
-const decryptData = (ciphertext) => {
+export const decryptData = (ciphertext) => {
   if (!ciphertext) {
     return null;
   }
@@ -38,7 +40,6 @@ const decryptData = (ciphertext) => {
   }
 };
 
-
 export const storeUserData = (data) => {
   if (!data) return;
 
@@ -52,7 +53,8 @@ export const storeUserData = (data) => {
     email: data?.Email,
     FullName: data?.FullName,
     Avatar: data?.Avatar,
-    Navigate: data?.Navigate
+    Navigate: data?.Navigate,
+    PhoneNumber: data?.PhoneNumber
   };
 
   // Mã hóa và lưu user object vào localStorage
@@ -63,21 +65,44 @@ export const storeSetCachedSidebarTops = (data) => {
   if (!data) return;
   // Mã hóa và lưu
   const encryptedData = encryptData(data);
-  localStorage.setItem("cachedSidebarTops",encryptedData);
+  localStorage.setItem("cachedSidebarTops", encryptedData);
 };
 export const storeGetCachedSidebarTops = () => {
   const encryptedData = localStorage.getItem("cachedSidebarTops");
   if (!encryptedData) return null;
-// console.log("encryptedData",encryptedData);
+  // console.log("encryptedData",encryptedData);
   // Giải mã dữ liệu khi lấy ra từ localStorage
   return decryptData(encryptedData);
 };
 export const storeSetCurrentInfor = (data) => {
   if (!data) return;
-  // Mã hóa và lưu
-  const encryptedData = encryptData(data);
-  localStorage.setItem("GetCurrentInfor",encryptedData);
+
+  const storedUserInfo = storeGetCurrentInfor();
+  const storedThamSo = storedUserInfo?.ThamSoHeThong?.find((item) => item.TenThamSo === "DEFAULT_ROWS_PER_PAGE");
+  const newThamSo = data?.ThamSoHeThong?.find((item) => item.TenThamSo === "DEFAULT_ROWS_PER_PAGE");
+
+  // Kiểm tra và cập nhật nếu thông tin mới từ API
+  if (newThamSo) {
+    const isUpdated = !storedThamSo || new Date(newThamSo.ModifiedDate) > new Date(storedThamSo?.ModifiedDate);
+    if (isUpdated) {
+      // Xóa dữ liệu `rowsPerPage` cũ từ localStorage nếu cần
+      Object.keys(localStorage).forEach((key) => {
+        if (key.endsWith("rowsPerPage")) {
+          localStorage.removeItem(key);
+        }
+      });
+    }
+  }
+
+  // Mã hóa dữ liệu và lưu vào localStorage
+  try {
+    const encryptedData = encryptData(data);
+    localStorage.setItem("GetCurrentInfor", encryptedData);
+  } catch (error) {
+    console.error("Error encrypting or saving data to localStorage:", error);
+  }
 };
+
 export const storeGetUser = () => {
   const encryptedData = localStorage.getItem("user");
   if (!encryptedData) return null;
@@ -105,10 +130,10 @@ export const storeGetToken = () => {
 
   try {
     const decryptedToken = decryptData(encryptedData);
-    if (!decryptedToken || typeof decryptedToken !== 'string') {
+    if (!decryptedToken || typeof decryptedToken !== "string") {
       throw new Error("Decrypted token is null or not a valid string.");
     }
-    return decryptedToken;  // Không cần JSON.parse nếu đã là chuỗi hợp lệ
+    return decryptedToken; // Không cần JSON.parse nếu đã là chuỗi hợp lệ
   } catch (error) {
     console.log("Error decrypting token:", error);
     return null;
@@ -122,15 +147,21 @@ export const storeGetCurrentInfor = () => {
   // Giải mã dữ liệu khi lấy ra từ localStorage
   return decryptData(encryptedData);
 };
+export const storeGetThamSoHeThongObj = (TenThamSo) => {
+  const encryptedData = localStorage.getItem("GetCurrentInfor");
+  if (!encryptedData) return "";
 
+  const getCurrentInfor = decryptData(encryptedData) || {};
+  return getCurrentInfor?.ThamSoHeThong?.find((item) => item.TenThamSo === TenThamSo) || "";
+};
 export const storeGetThamSoHeThong = (TenThamSo) => {
   const encryptedData = localStorage.getItem("GetCurrentInfor");
   if (!encryptedData) return "";
 
-  const getCurrentInfor =decryptData(encryptedData) || {};
+  const getCurrentInfor = decryptData(encryptedData) || {};
   return getCurrentInfor?.ThamSoHeThong?.find((item) => item.TenThamSo === TenThamSo)?.GiaTri || "";
 };
-export const storeGetcolor= () => {
+export const storeGetcolor = () => {
   const encryptedData = localStorage.getItem("color");
   if (!encryptedData) return "defaultColor";
   return decryptData(encryptedData);
@@ -138,7 +169,7 @@ export const storeGetcolor= () => {
 export const storeSetcolor = (data) => {
   if (!data) return;
   const encryptedData = encryptData(data);
-  localStorage.setItem("color",encryptedData);
+  localStorage.setItem("color", encryptedData);
 };
 export const storeGetlanguage = () => {
   const encryptedData = localStorage.getItem("language");
@@ -148,7 +179,7 @@ export const storeGetlanguage = () => {
 export const storeSetlanguage = (data) => {
   if (!data) return;
   const encryptedData = encryptData(data);
-  localStorage.setItem("language",encryptedData);
+  localStorage.setItem("language", encryptedData);
 };
 export const storeGetlanguageVersion = () => {
   const encryptedData = localStorage.getItem("languageVersion");
@@ -158,7 +189,7 @@ export const storeGetlanguageVersion = () => {
 export const storeSetlanguageVersion = (data) => {
   if (!data) return;
   const encryptedData = encryptData(data);
-  localStorage.setItem("languageVersion",encryptedData);
+  localStorage.setItem("languageVersion", encryptedData);
 };
 export const storeGetlanguageData = () => {
   const encryptedData = localStorage.getItem("languageData");
@@ -168,11 +199,14 @@ export const storeGetlanguageData = () => {
 export const storeSetlanguageData = (data) => {
   if (!data) return;
   const encryptedData = encryptData(data);
-  localStorage.setItem("languageData",encryptedData);
+  localStorage.setItem("languageData", encryptedData);
 };
-export const storeGetlanguageSystemKey = (TypeKey,SystemKey,TypeLanguage) => {
+export const storeGetlanguageSystemKey = (TypeKey, SystemKey, TypeLanguage) => {
   const encryptedData = localStorage.getItem("languageData");
   if (!encryptedData) return null;
-  const languageData =decryptData(encryptedData) || {};
-  return languageData?.find((item) => item.TypeKey === TypeKey && item.SystemKey === SystemKey && item.TypeLanguage === TypeLanguage)?.Description || "";
-};
+  const languageData = decryptData(encryptedData) || {};
+  return (
+    languageData?.find((item) => item.TypeKey === TypeKey && item.SystemKey === SystemKey && item.TypeLanguage === TypeLanguage)
+      ?.Description || ""
+  );
+};