trithuc-mvc-react 1.5.5 → 1.5.7

package/components/DataManagement/DataTable.jsx

@@ -32,7 +32,7 @@ const DataTable = () => {
       }),
     keepPreviousData: true,
     onSuccess: ({ PermissionModel, status }) => {
-      if (!Permission && status) {
+      if (status) {
         setPermission(PermissionModel);
       }
     }
@@ -144,7 +144,7 @@ const DataTable = () => {
   };
   const theme = useTheme();
   const downXL = useMediaQuery(theme.breakpoints.down("xl"));
-  console.log("downXL", downXL);
+
   return (
     <>
       <TableContainer sx={{ position: "relative" }}>

package/components/DataManagement/FormField.jsx

@@ -12,7 +12,7 @@ import {
   Switch,
   TextField
 } from "@mui/material";
-import { Controller,  useFormContext } from "react-hook-form";
+import { Controller, useFormContext } from "react-hook-form";
 // Grid version 2
 import PropTypes from "prop-types";
 import { DatePicker } from "@mui/x-date-pickers";
@@ -80,7 +80,6 @@ function FormField({
           }}
         />
       );
-
     case "text":
     case "number":
       return (
@@ -103,7 +102,6 @@ function FormField({
           }}
         />
       );
-
     case "autocomplete": {
       if (keyValueLabel) {
         register(keyValueLabel);
@@ -137,7 +135,6 @@ function FormField({
         />
       );
     }
-
     case "select":
       return (
         <Controller
@@ -238,6 +235,33 @@ function FormField({
           }}
         />
       );
+
+    case "trangThaiXuLy":
+      return (
+        <Controller
+          name={name}
+          control={control}
+          render={({ field, fieldState: { error } }) => {
+            return (
+              <TextField
+                {...field}
+                type={type}
+                label={label + (required ? "*" : "")}
+                error={Boolean(error)}
+                helperText={error?.message}
+                fullWidth
+                placeholder={label}
+                size={size}
+                InputProps={{
+                  style: {
+                    display: "none"
+                  }
+                }}
+              />
+            );
+          }}
+        />
+      );
   }
 }
 

package/components/DataManagement/context.js

@@ -1,4 +1,4 @@
 import { createContext } from "react";
 
 export const DataTableContext = createContext({ tableName: null });
-export const PermissionContext = createContext(null);
+export const PermissionContext = createContext({});

package/components/DataManagement/hooks.js

@@ -14,6 +14,7 @@ export function usePermission() {
     const canCreate = !Permission || Permission.Create;
     const canAction = !Permission || Permission.Action;
     const canView = !Permission || Permission.View;
+    
     return { canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView };
   }, [Permission]);
 

package/package.json

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