react-table-edit 0.4.3 → 0.4.4

package/dist/index.js

@@ -1534,6 +1534,11 @@ var TableEdit = (0, import_react12.forwardRef)((props, ref) => {
   let totalCount = dataSource.length;
   const fieldKey = columns.find((item) => item.isPrimarykey === true)?.field ?? "id";
   const fieldUniKey = columns.filter((item) => item.isUnikey === true)?.map((item) => item.field);
+  (0, import_react12.useEffect)(() => {
+    if (pagingClient && pagingSetting.setCurrentPage && dataSource?.length / (pagingSetting?.pageSize ?? 1) > (pagingSetting.currentPage ?? 1)) {
+      pagingSetting.setCurrentPage(1);
+    }
+  }, [dataSource]);
   (0, import_react12.useEffect)(() => {
     let indexFirst = -1;
     let indexlast = -1;
@@ -1584,6 +1589,23 @@ var TableEdit = (0, import_react12.forwardRef)((props, ref) => {
     setHeaderColumns(arrHeaderColumns);
     setContentColumns(arrContentColumns);
   }, [columns]);
+  (0, import_react12.useEffect)(() => {
+    const arrHeaderColumns = [];
+    const arrContentColumns = [];
+    let headerLevelRow = 0;
+    if (levelCol) {
+      headerLevelRow = levelCol;
+    } else {
+      headerLevelRow = stretchColumn(columns, 0);
+      setLevelCol(headerLevelRow);
+    }
+    for (let i = 0; i < headerLevelRow; i++) {
+      arrHeaderColumns.push([]);
+    }
+    getNestedChildren(columns, arrHeaderColumns, arrContentColumns, 0, headerLevelRow);
+    setHeaderColumns(arrHeaderColumns);
+    setContentColumns(arrContentColumns);
+  }, [columns]);
   const getNestedChildren = (array, arrHeaderColumns, arrContentColumns, level, maxLevelRow) => {
     array.forEach((item) => {
       const ele = { ...item, visible: item.visible, rowspan: 1, index: 0 };
@@ -2891,22 +2913,26 @@ var TableEdit = (0, import_react12.forwardRef)((props, ref) => {
   };
   const renderData = () => {
     totalCount = 0;
+    let countDisplay = -1;
     return dataSource.map((row, indexRow) => {
       const isSelected = selectedRows?.some((x) => x[fieldKey] === row[fieldKey]);
       const flagSearch = !searchClient || checkSearch(searchSetting?.searchTerm !== void 0 ? searchSetting?.searchTerm : searchTerm, row, searchSetting?.keyField ?? []);
       if (flagSearch) {
         totalCount += 1;
         const flagDisplay = !pagingClient || totalCount > (pagingSetting.pageSize ?? 0) * ((pagingSetting.currentPage ?? 0) - 1) && totalCount <= (pagingSetting.pageSize ?? 0) * (pagingSetting.currentPage ?? 0);
-        return flagDisplay && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-          "tr",
-          {
-            className: (0, import_classnames10.default)("r-row", { "last-row": indexRow === (pagingClient ? totalCount % (pagingSetting?.pageSize ?? 0) : totalCount - 1) }, { "fisrt-row": pagingClient ? indexRow % (pagingSetting?.pageSize ?? 0) === 0 : 0 }),
-            children: contentColumns.map((col, indexCol) => {
-              return renderContentCol(col, row, indexRow, indexCol, isSelected);
-            })
-          },
-          `row-${indexRow}`
-        );
+        if (flagDisplay) {
+          countDisplay++;
+          return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+            "tr",
+            {
+              className: (0, import_classnames10.default)("r-row", { "fisrt-row": countDisplay === 0 }),
+              children: contentColumns.map((col, indexCol) => {
+                return renderContentCol(col, row, indexRow, indexCol, isSelected);
+              })
+            },
+            `row-${indexRow}`
+          );
+        }
       }
     });
   };

package/dist/index.mjs

@@ -1493,6 +1493,11 @@ var TableEdit = forwardRef2((props, ref) => {
   let totalCount = dataSource.length;
   const fieldKey = columns.find((item) => item.isPrimarykey === true)?.field ?? "id";
   const fieldUniKey = columns.filter((item) => item.isUnikey === true)?.map((item) => item.field);
+  useEffect5(() => {
+    if (pagingClient && pagingSetting.setCurrentPage && dataSource?.length / (pagingSetting?.pageSize ?? 1) > (pagingSetting.currentPage ?? 1)) {
+      pagingSetting.setCurrentPage(1);
+    }
+  }, [dataSource]);
   useEffect5(() => {
     let indexFirst = -1;
     let indexlast = -1;
@@ -1543,6 +1548,23 @@ var TableEdit = forwardRef2((props, ref) => {
     setHeaderColumns(arrHeaderColumns);
     setContentColumns(arrContentColumns);
   }, [columns]);
+  useEffect5(() => {
+    const arrHeaderColumns = [];
+    const arrContentColumns = [];
+    let headerLevelRow = 0;
+    if (levelCol) {
+      headerLevelRow = levelCol;
+    } else {
+      headerLevelRow = stretchColumn(columns, 0);
+      setLevelCol(headerLevelRow);
+    }
+    for (let i = 0; i < headerLevelRow; i++) {
+      arrHeaderColumns.push([]);
+    }
+    getNestedChildren(columns, arrHeaderColumns, arrContentColumns, 0, headerLevelRow);
+    setHeaderColumns(arrHeaderColumns);
+    setContentColumns(arrContentColumns);
+  }, [columns]);
   const getNestedChildren = (array, arrHeaderColumns, arrContentColumns, level, maxLevelRow) => {
     array.forEach((item) => {
       const ele = { ...item, visible: item.visible, rowspan: 1, index: 0 };
@@ -2850,22 +2872,26 @@ var TableEdit = forwardRef2((props, ref) => {
   };
   const renderData = () => {
     totalCount = 0;
+    let countDisplay = -1;
     return dataSource.map((row, indexRow) => {
       const isSelected = selectedRows?.some((x) => x[fieldKey] === row[fieldKey]);
       const flagSearch = !searchClient || checkSearch(searchSetting?.searchTerm !== void 0 ? searchSetting?.searchTerm : searchTerm, row, searchSetting?.keyField ?? []);
       if (flagSearch) {
         totalCount += 1;
         const flagDisplay = !pagingClient || totalCount > (pagingSetting.pageSize ?? 0) * ((pagingSetting.currentPage ?? 0) - 1) && totalCount <= (pagingSetting.pageSize ?? 0) * (pagingSetting.currentPage ?? 0);
-        return flagDisplay && /* @__PURE__ */ jsx12(
-          "tr",
-          {
-            className: classnames6("r-row", { "last-row": indexRow === (pagingClient ? totalCount % (pagingSetting?.pageSize ?? 0) : totalCount - 1) }, { "fisrt-row": pagingClient ? indexRow % (pagingSetting?.pageSize ?? 0) === 0 : 0 }),
-            children: contentColumns.map((col, indexCol) => {
-              return renderContentCol(col, row, indexRow, indexCol, isSelected);
-            })
-          },
-          `row-${indexRow}`
-        );
+        if (flagDisplay) {
+          countDisplay++;
+          return /* @__PURE__ */ jsx12(
+            "tr",
+            {
+              className: classnames6("r-row", { "fisrt-row": countDisplay === 0 }),
+              children: contentColumns.map((col, indexCol) => {
+                return renderContentCol(col, row, indexRow, indexCol, isSelected);
+              })
+            },
+            `row-${indexRow}`
+          );
+        }
       }
     });
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-table-edit",
   "license": "MIT",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",