trithuc-mvc-react 2.3.5 → 2.3.7

package/components/DataManagement/DataTable.jsx

@@ -204,6 +204,8 @@ const DataTable = ({ multipleActions = [] }) => {
                   key={row.Id}
                   index={index}
                   row={row}
+                  page={page}
+                  rowsPerPage={rowsPerPage}
                   selected={isSelected(row[selectedField])}
                   onSelect={handleSelect}
                   onEdit={handlEdit}

package/components/DataManagement/TableRowRender.jsx

@@ -9,19 +9,20 @@ import { styled, useTheme } from "@mui/material/styles";
 import MoreMenu from "../MoreMenu";
 import { useMemo } from "react";
 
-export const TableRowRender = ({ index, row, selected, onSelect, onChangeStatus, onDelete, onEdit, onView }) => {
-  const {
-    selectedField,
-    columns,
-    page,
-    rowsPerPage,
-    statusKey,
-    disableStatus,
-    tableActions,
-    disableCellThaoTac,
-    tableName,
-    sttLuyKe
-  } = useDataTable();
+export const TableRowRender = ({
+  index,
+  row,
+  page,
+  rowsPerPage,
+  selected,
+  onSelect,
+  onChangeStatus,
+  onDelete,
+  onEdit,
+  onView
+}) => {
+  const { selectedField, columns, statusKey, disableStatus, tableActions, disableCellThaoTac, tableName, sttLuyKe } =
+    useDataTable();
   const { canEdit, canDelete, canView, canAction } = usePermission(tableName);
 
   console.log(">>> useDataTable()", useDataTable());
@@ -52,7 +53,10 @@ export const TableRowRender = ({ index, row, selected, onSelect, onChangeStatus,
           onChange={(event) => onSelect(event, row[selectedField])}
         />
       </TableCell>
-      <TableCell align="center">{sttLuyKe ? index + 1 : index + 1}</TableCell>
+      {console.log(">>> rowsPerPage", rowsPerPage)}
+      {console.log(">>> page", page)}
+      {console.log(">>> rowsPerPage * (page - 1)) + index + 1", rowsPerPage * (page - 1)) + index + 1)}
+      <TableCell align="center">{sttLuyKe ? (rowsPerPage * (page - 1)) + index + 1 : index + 1}</TableCell>
       {columns.map(
         ({
           field,

package/components/DataManagement/index.jsx

@@ -78,9 +78,7 @@ function DataManagement({
       sx: {}
     }
   },
-  defaultRowsPerPage = 5,
-  page = 0,
-  rowsPerPage = defaultRowsPerPage
+  defaultRowsPerPage = 5
 }) {
   const [openEditorDialog, setOpenEditorDialog] = useState(false);
   const [selectedEditItem, setSelectedEditItem] = useState(null);
@@ -133,9 +131,7 @@ function DataManagement({
       onEditClick,
       hasTabpanel,
       backParentNavigator,
-      defaultRowsPerPage,
-      page,
-      rowsPerPage
+      defaultRowsPerPage
     };
   }, [
     sttLuyKe,
@@ -152,9 +148,7 @@ function DataManagement({
     setOpenViewDialog,
     onEditClick,
     backParentNavigator,
-    defaultRowsPerPage,
-    page,
-    rowsPerPage
+    defaultRowsPerPage
   ]);
 
   const methods = useForm({ defaultValues: getDefaultValues(filters) });

package/package.json

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