trithuc-mvc-react 3.2.8 → 3.3.0

package/components/DataManagement/DataTable.jsx

@@ -81,6 +81,7 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
         toast.success("Thay đổi trạng thái thành công !");
       }
       queryClient.invalidateQueries({ queryKey: [tableName] });
+      queryClient.invalidateQueries({ queryKey: [tableName, "CountAllTrangThaiXuly"] });
     },
     onError: (error) => {
       if (error.response && error.response.data) {
@@ -105,6 +106,7 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
       }
 
       queryClient.invalidateQueries({ queryKey: [tableName] });
+      queryClient.invalidateQueries({ queryKey: [tableName, "CountAllTrangThaiXuly"] });
     },
     onError: (error) => {
       if (error.response && error.response.data) {
@@ -157,24 +159,6 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
     }
     setOpenDialog(false); // Đóng dialog sau khi chọn
   };
-  // const handleDelete = (id) => {
-  //   confirm({
-  //     description: "Bạn có chắc chắn muốn xóa bản ghi này không?",
-  //     title: "Xác nhận",
-  //     cancellationText: "Hủy",
-  //     confirmationText: "Xóa"
-  //   })
-  //     .then(() => {
-  //       deleteMutation.mutate({
-  //         id,
-  //         tableName
-  //       });
-  //     })
-  //     .finally(() => {
-  //       // Đảm bảo phần hủy thao tác được xử lý trong finally
-  //       toast.info("Đã hủy thao tác xóa.");
-  //     });
-  // };
 
   const handleChangeStatus = (Id) => {
     changeStatusMutation.mutate({
@@ -268,23 +252,6 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
     }
     setOpenDeleteMultipleDialog(false); // Đóng Dialog sau khi chọn
   };
-  // const handleDeleteMultiple = () => {
-  //   confirm({
-  //     description: `Bạn có chắc chắn muốn xóa ${selectedItems?.length} bản ghi này không?`,
-  //     title: "Xác nhận",
-  //     cancellationText: "Hủy",
-  //     confirmationText: "Đồng ý"
-  //   })
-  //     .then(() => {
-  //       deleteMultipleMutation.mutate({
-  //         tableName,
-  //         ids: selectedItems
-  //       });
-  //     })
-  //     .catch(() => {
-  //       toast.info("Đã hủy thao tác xóa.");
-  //     });
-  // };
   const theme = useTheme();
   const downXL = useMediaQuery(theme.breakpoints.down("xl"));
 

package/components/DataManagement/ExportExcelButton.jsx

@@ -1,6 +1,6 @@
 import { URL_APPLICATION, URL_APPLICATION_API } from "@/constants";
 import { Download } from "@mui/icons-material";
-import { Button, IconButton, Tooltip, useMediaQuery, useTheme } from "@mui/material";
+import { Button, IconButton, Tooltip, Typography, useMediaQuery, useTheme } from "@mui/material";
 import { toast } from "react-toastify";
 import { exportExcel } from "../../api";
 
@@ -27,9 +27,19 @@ const ExportExcelButton = ({ tableName, data, size = "small" }) => {
       onClick={() => {
         handleExportExcel(tableName, data);
       }}
-      sx={{ ml: 0.5, mr: 0.5, minWidth: "73px" }}
+      sx={{ ml: 0.5, mr: 0.5, minWidth: "73px", textTransform: "none" }}
     >
-      Excel
+      <Typography
+        noWrap
+        sx={{
+          width: "100%",
+          fontSize: "clamp(0.75rem, 1.5vw, 1rem)",
+          textAlign: "center",
+          textTransform: "none" // ✅ Đảm bảo chữ gốc giữ nguyên
+        }}
+      >
+        Excel
+      </Typography>
     </Button>
   ) : (
     <Button
@@ -39,9 +49,19 @@ const ExportExcelButton = ({ tableName, data, size = "small" }) => {
       onClick={() => {
         handleExportExcel(tableName, data);
       }}
-      sx={{ ml: 0.5, mr: 0.5, minWidth: "73px" }}
+      sx={{ ml: 0.5, mr: 0.5, minWidth: "73px", textTransform: "none" }}
     >
-      Excel
+      <Typography
+        noWrap
+        sx={{
+          width: "100%",
+          fontSize: "clamp(0.75rem, 1.5vw, 1rem)",
+          textAlign: "center",
+          textTransform: "none" // ✅ Đảm bảo chữ gốc giữ nguyên
+        }}
+      >
+        Excel
+      </Typography>
     </Button>
   );
 };

package/components/DataManagement/FilterGod.jsx

@@ -152,7 +152,7 @@ export const FilterGod = ({ tableName, filters, filterButtons, elementSize = "sm
                 );
 
                 return (
-                  <Grid container key={field.toString()} size={{ ...size }}>
+                  <Grid sx={{ mb: "5px" }} container key={field.toString()} size={{ ...size }}>
                     <Grid size={{ xs: 12, md: 6 }}>{renderDatePicker(field[0], label1, field[1], "max")}</Grid>
                     <Grid size={{ xs: 12, md: 6 }}>{renderDatePicker(field[1], label2, field[0], "min")}</Grid>
                   </Grid>
@@ -161,7 +161,7 @@ export const FilterGod = ({ tableName, filters, filterButtons, elementSize = "sm
 
               if (rest.type === "slider-range") {
                 return (
-                  <Grid key={field.toString()} size={{ ...size }}>
+                  <Grid sx={{ mb: "5px" }} key={field.toString()} size={{ ...size }}>
                     <Slider
                       onChange={(e, value) => {
                         setDataSearch({
@@ -182,7 +182,7 @@ export const FilterGod = ({ tableName, filters, filterButtons, elementSize = "sm
                 );
               }
               return (
-                <Grid key={field.toString()} size={{ ...size }}>
+                <Grid sx={{ mb: "5px" }} key={field.toString()} size={{ ...size }}>
                   <FilterElement name={field.toString()} label={label} placeholder={placeHolder} {...rest} setPage={setPage} />
                 </Grid>
               );

package/components/DataManagement/index.jsx

@@ -108,7 +108,7 @@ function DataManagement({
     }
   },
   defaultRowsPerPage = 5,
-  titleAddButton = "Thêm",
+  titleAddButton = "Thêm mới",
   thongKe,
   bieuDo,
   disableHead = false
@@ -413,10 +413,21 @@ function DataManagement({
                     sx={{
                       ml: 0.5,
                       mr: 0.5,
-                      minWidth: "73px"
+                      minWidth: "73px",
+                      textTransform: "none" // ✅ Không viết hoa tự động
                     }}
                   >
-                    {titleAddButton}
+                    <Typography
+                      noWrap
+                      sx={{
+                        width: "100%",
+                        fontSize: "clamp(0.75rem, 1.5vw, 1rem)",
+                        textAlign: "center",
+                        textTransform: "none" // ✅ Đảm bảo chữ gốc giữ nguyên
+                      }}
+                    >
+                      {titleAddButton}
+                    </Typography>
                   </Button>
                 )}
               </Box>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "3.2.8",
+  "version": "3.3.0",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"