trithuc-mvc-react 2.3.2 → 2.3.4

package/components/DataManagement/TableRowRender.jsx

@@ -10,19 +10,23 @@ import MoreMenu from "../MoreMenu";
 import { useMemo } from "react";
 
 export const TableRowRender = ({ index, row, selected, onSelect, onChangeStatus, onDelete, onEdit, onView }) => {
-  const { selectedField, columns, statusKey, disableStatus, tableActions, disableCellThaoTac, tableName } = useDataTable();
+  const { selectedField, columns, statusKey, disableStatus, tableActions, disableCellThaoTac, tableName, sttLuyKe } =
+    useDataTable();
   const { canEdit, canDelete, canView, canAction } = usePermission(tableName);
 
+  console.log(">>> useDataTable()", useDataTable());
   const { tableActionsOnTable, tableActionsOnMoreMenu } = useMemo(() => {
-    const tableActionsAfterFilter = [...tableActions].filter(x => x).filter(({ permissionType }) => {
-      if (permissionType == "view" && !canView) {
-        return false;
-      }
-      if (permissionType == "action" && !canAction) {
-        return false;
-      }
-      return true;
-    });
+    const tableActionsAfterFilter = [...tableActions]
+      .filter((x) => x)
+      .filter(({ permissionType }) => {
+        if (permissionType == "view" && !canView) {
+          return false;
+        }
+        if (permissionType == "action" && !canAction) {
+          return false;
+        }
+        return true;
+      });
     const tableActionsOnTable = tableActionsAfterFilter.filter(({ isOnTable = false }) => isOnTable);
     const tableActionsOnMoreMenu = tableActionsAfterFilter.filter(({ isOnTable = false }) => !isOnTable);
     return { tableActionsOnTable, tableActionsOnMoreMenu };
@@ -38,7 +42,7 @@ export const TableRowRender = ({ index, row, selected, onSelect, onChangeStatus,
           onChange={(event) => onSelect(event, row[selectedField])}
         />
       </TableCell>
-      <TableCell align="center">{index + 1}</TableCell>
+      <TableCell align="center">{sttLuyKe ? index + 1 : index + 1}</TableCell>
       {columns.map(
         ({
           field,

package/components/DataManagement/index.jsx

@@ -51,6 +51,7 @@ const getDefaultValues = (filters = []) => {
   return defaultValues;
 };
 function DataManagement({
+  sttLuyKe = false,
   columns = [],
   title,
   titleButtons = [],
@@ -110,6 +111,7 @@ function DataManagement({
   const values = useMemo(() => {
     const hasTabpanel = !!tabPanel;
     return {
+      sttLuyKe,
       tableName,
       selectedField,
       titleButtons,
@@ -128,9 +130,11 @@ function DataManagement({
       tableActions,
       onEditClick,
       hasTabpanel,
+      backParentNavigator,
       defaultRowsPerPage
     };
   }, [
+    sttLuyKe,
     tableName,
     selectedField,
     titleButtons,
@@ -143,12 +147,12 @@ function DataManagement({
     openViewDialog,
     setOpenViewDialog,
     onEditClick,
+    backParentNavigator,
     defaultRowsPerPage
   ]);
 
   const methods = useForm({ defaultValues: getDefaultValues(filters) });
   const { reset, setValue } = methods;
-
   return (
     <>
       <DataTableContext.Provider value={values}>
@@ -204,7 +208,7 @@ function DataManagement({
             {tabPanel}
             <FilterGod filters={filters} elementSize={elementSize} />
             {backParentNavigator}
-
+            {console.log(">>> tnduc", backParentNavigator)}
             <DataTable multipleActions={multipleActions} />
           </Card>
         </FormProvider>

package/package.json

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

package/providers/PermissionProvider.jsx

@@ -6,7 +6,6 @@ const PermissionProvider = ({ children }) => {
   const value = useMemo(() => {
     return { permissionMap, setPermission };
   }, [permissionMap, setPermission]);
-  console.log("PermissionProvider: permissionMap", permissionMap);
   return <PermissionContext.Provider value={value}>{children}</PermissionContext.Provider>;
 };
 export default PermissionProvider;