trithuc-mvc-react 2.8.5 → 2.8.7

package/components/DataManagement/DataTable.jsx

@@ -1,19 +1,19 @@
-import { Grid2, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
-import TablePaginationCustom from "../table/TablePagination";
+import { Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
 import { useEffect, useMemo, useState } from "react";
+import TablePaginationCustom from "../table/TablePagination";
 
-import { TableHead } from "./TableHead";
+import { useConfirm } from "material-ui-confirm";
 import { useMutation, useQuery, useQueryClient } from "react-query";
+import { toast } from "react-toastify";
 import { changeStatusDataToTable, deleteDataFromTable, deleteMultipleDataFromTable, getDatasFromTable } from "../../api";
 import TableRowsLoader from "../table/TableRowsLoader";
-import { toast } from "react-toastify";
-import { useConfirm } from "material-ui-confirm";
+import { TableHead } from "./TableHead";
 
+import { URL_APPLICATION_API } from "@/constants";
+import { usePermission } from "../../hooks";
 import { TableRowRender } from "./TableRowRender";
 import TableToolbar from "./TableToolbar";
 import { useDataTable } from "./hooks";
-import { usePermission } from "../../hooks";
-import { URL_APPLICATION, URL_APPLICATION_API } from "@/constants";
 const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit, disableDelete }) => {
   const {
     tableName,
@@ -288,16 +288,16 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
         </Table>
       </TableContainer>
 
-      <Grid2 container>
+      <Grid container>
         {!hasTabpanel && (
-          <Grid2 item alignSelf={"center"} sx={{ pl: 2 }}>
+          <Grid item alignSelf={"center"} sx={{ pl: 2 }}>
             <Typography variant="body1">
               Tổng số lượng: <span>{total}</span>
             </Typography>
           </Grid>
         )}
 
-        <Grid2 item xs>
+        <Grid item xs>
           <TablePaginationCustom
             count={total}
             rowsPerPage={rowsPerPage}

package/components/DataManagement/DataTableSM.jsx

@@ -1,20 +1,18 @@
-import { Grid2, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
-import TablePaginationCustom from "../table/TablePagination";
+import { Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
 import { useEffect, useMemo, useState } from "react";
+import TablePaginationCustom from "../table/TablePagination";
 
-import { TableHead } from "./TableHead";
+import { useConfirm } from "material-ui-confirm";
 import { useMutation, useQuery, useQueryClient } from "react-query";
+import { toast } from "react-toastify";
 import { changeStatusDataToTable, deleteDataFromTable, deleteMultipleDataFromTable, getDatasFromTable } from "../../api";
 import TableRowsLoader from "../table/TableRowsLoader";
-import { toast } from "react-toastify";
-import { useConfirm } from "material-ui-confirm";
 
-import { TableRowRender } from "./TableRowRender";
-import TableToolbar from "./TableToolbar";
-import { useDataTable } from "./hooks";
+import { URL_APPLICATION_API } from "@/constants";
 import { usePermission } from "../../hooks";
-import { URL_APPLICATION, URL_APPLICATION_API } from "@/constants";
 import { TableRowRenderSM } from "./TableRowRenderSM";
+import TableToolbar from "./TableToolbar";
+import { useDataTable } from "./hooks";
 const DataTableSM = ({ multipleActions = [], page, setPage = () => {}, disableEdit, disableDelete }) => {
   const {
     tableName,
@@ -289,16 +287,16 @@ const DataTableSM = ({ multipleActions = [], page, setPage = () => {}, disableEd
         </Table>
       </TableContainer>
 
-      <Grid2 container>
+      <Grid container>
         {!hasTabpanel && (
-          <Grid2 item alignSelf={"center"} sx={{ pl: 2 }}>
+          <Grid item alignSelf={"center"} sx={{ pl: 2 }}>
             <Typography variant="body1">
               Tổng số lượng: <span>{total}</span>
             </Typography>
           </Grid>
         )}
 
-        <Grid2 item xs>
+        <Grid item xs>
           <TablePaginationCustom
             count={total}
             rowsPerPage={rowsPerPage}

package/components/DataManagement/EditorForm.jsx

@@ -166,7 +166,7 @@ function EditorForm({ fields, submitRef }) {
   return (
     <FormProvider {...methods}>
       <Box component={"form"} onSubmit={methods.handleSubmit(onSubmit, onValid)}>
-        <Grid2 container spacing={2}>
+        <Grid container spacing={2}>
           {fields.map(
             ({
               field,
@@ -185,7 +185,7 @@ function EditorForm({ fields, submitRef }) {
               ...rest
             }) => {
               return (
-                <Grid2 item md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>
+                <Grid 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, Grid2, Slider, Typography } from "@mui/material";
+import { Accordion, AccordionSummary, Box, 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>
-          <Grid2 container spacing={1}>
+          <Grid 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 (
-                  <Grid2 key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <Grid 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 (
-                  <Grid2 key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <Grid 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 (
-                <Grid2 key={field} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                <Grid key={field} md={size?.md} xs={size?.xs} sm={size?.sm}>
                   <FilterElement name={field} {...rest} setPage={setPage} />
                 </Grid>
               );

package/components/form/DynamicForm.jsx

@@ -1,4 +1,4 @@
-import { Box,Grid2 }  from "@mui/material";
+import { Box } from "@mui/material";
 
 import PropTypes from "prop-types";
 import { FormProvider, useForm } from "react-hook-form";
@@ -79,11 +79,11 @@ function DynamicForm({ fields, elementSize = "medium", submitRef, validationSche
                     size={elementSize}
                     required={required}
                   />
-                </Grid2>
+                </Grid>
               );
             }
           )}
-        </Grid2>
+        </Grid>
         <button ref={submitRef} type="submit" style={{ display: "none" }} />
       </Box>
     </FormProvider>

package/package.json

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