trithuc-mvc-react 2.8.1 → 2.8.3

package/components/DataManagement/DataTable.jsx

@@ -288,16 +288,16 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
         </Table>
       </TableContainer>
 
-      <Grid container>
+      <Grid2 container>
         {!hasTabpanel && (
-          <Grid item alignSelf={"center"} sx={{ pl: 2 }}>
+          <Grid2 item alignSelf={"center"} sx={{ pl: 2 }}>
             <Typography variant="body1">
               Tổng số lượng: <span>{total}</span>
             </Typography>
           </Grid>
         )}
 
-        <Grid item xs>
+        <Grid2 item xs>
           <TablePaginationCustom
             count={total}
             rowsPerPage={rowsPerPage}

package/components/DataManagement/DataTableSM.jsx

@@ -289,16 +289,16 @@ const DataTableSM = ({ multipleActions = [], page, setPage = () => {}, disableEd
         </Table>
       </TableContainer>
 
-      <Grid container>
+      <Grid2 container>
         {!hasTabpanel && (
-          <Grid item alignSelf={"center"} sx={{ pl: 2 }}>
+          <Grid2 item alignSelf={"center"} sx={{ pl: 2 }}>
             <Typography variant="body1">
               Tổng số lượng: <span>{total}</span>
             </Typography>
           </Grid>
         )}
 
-        <Grid item xs>
+        <Grid2 item xs>
           <TablePaginationCustom
             count={total}
             rowsPerPage={rowsPerPage}

package/components/DataManagement/EditorForm.jsx

@@ -1,18 +1,18 @@
-import { Box, useTheme, useMediaQuery } from "@mui/material";
+import { Box, useMediaQuery, useTheme } from "@mui/material";
 import { FormProvider, useForm } from "react-hook-form";
-import Grid from "@mui/material/Unstable_Grid2"; // Grid version 2
+
 import PropTypes from "prop-types";
 
-import { useEffect } from "react";
 import moment from "moment/moment";
+import { useEffect } from "react";
 
+import { URL_APPLICATION, URL_APPLICATION_API } from "@/constants";
+import { yupResolver } from "@hookform/resolvers/yup";
 import { useMutation, useQueryClient } from "react-query";
-import { saveDataToTable } from "../../api";
 import { toast } from "react-toastify";
-import { useDataTable } from "./hooks";
+import { saveDataToTable } from "../../api";
 import FormField from "./FormField";
-import { URL_APPLICATION ,URL_APPLICATION_API } from "@/constants";
-import { yupResolver } from "@hookform/resolvers/yup";
+import { useDataTable } from "./hooks";
 EditorForm.propTypes = {
   fields: PropTypes.array
 };
@@ -96,7 +96,7 @@ function EditorForm({ fields, submitRef }) {
       if (status) {
         if (URL_APPLICATION_API) {
           toast.success(message);
-        }else{
+        } else {
           toast.success(Id == 0 ? "Thêm thành công!" : "Cập nhật thành công!");
         }
         queryClient.invalidateQueries(tableName);
@@ -166,7 +166,7 @@ function EditorForm({ fields, submitRef }) {
   return (
     <FormProvider {...methods}>
       <Box component={"form"} onSubmit={methods.handleSubmit(onSubmit, onValid)}>
-        <Grid container spacing={2}>
+        <Grid2 container spacing={2}>
           {fields.map(
             ({
               field,
@@ -185,7 +185,7 @@ function EditorForm({ fields, submitRef }) {
               ...rest
             }) => {
               return (
-                <Grid item md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>
+                <Grid2 item md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>
                   <FormField
                     type={type}
                     label={label}

package/components/DataManagement/FilterGod.jsx

@@ -1,4 +1,4 @@
-import { Accordion, AccordionSummary, Box, Slider, Typography } from "@mui/material";
+import { Accordion, AccordionSummary, Box, Grid2, Slider, Typography } from "@mui/material";
 import { useFormContext } from "react-hook-form";
 
 import { FilterElement } from "./FilterElement";
@@ -30,7 +30,7 @@ export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }
           <Typography variant="h6">Tìm kiếm</Typography>
         </AccordionSummary>
         <AccordionDetails>
-          <Grid container spacing={1}>
+          <Grid2 container spacing={1}>
             {filters.map(({ field, size, ...rest }) => {
               if (rest.type === "date-range") {
                 let label = ["Từ ngày", "Đến ngày"];
@@ -39,7 +39,7 @@ export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }
                   label = field.label;
                 }
                 return (
-                  <Grid key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <Grid2 key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
                     <DateRangePicker
                       label={label}
                       onChange={(value) => {
@@ -59,7 +59,7 @@ export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }
 
               if (rest.type === "slider-range") {
                 return (
-                  <Grid key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <Grid2 key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
                     <Slider
                       onChange={(e, value) => {
                         setDataSearch({
@@ -80,7 +80,7 @@ export const FilterGod = ({ filters, elementSize = "small", setPage = () => {} }
                 );
               }
               return (
-                <Grid key={field} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                <Grid2 key={field} md={size?.md} xs={size?.xs} sm={size?.sm}>
                   <FilterElement name={field} {...rest} setPage={setPage} />
                 </Grid>
               );

package/package.json

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