react-table-edit 1.4.37 → 1.4.39

package/dist/index.mjs

@@ -17654,7 +17654,7 @@ const FindNodeByPath = (tree, path) => {
  *   fisrtObjWidthFixRight: number        // Chỉ số cột đầu tiên fixed right
  * }
  */
-const calculateTableStructure = (columns) => {
+const calculateTableStructure = (columns, settingColumns) => {
     const levels = [];
     const flat = [];
     const objWidthFixLeft = {};
@@ -17692,6 +17692,21 @@ const calculateTableStructure = (columns) => {
                 colspan,
                 rowspan: hasChildren ? 1 : maxDepth - level
             };
+            if (settingColumns && settingColumns.length > 0) {
+                const column = settingColumns.find((y) => y.field === cell.field);
+                if (column) {
+                    cell.visible = column.visible;
+                    if (column.fixedType) {
+                        cell.fixedType = column.fixedType;
+                    }
+                    if (column.width) {
+                        cell.width = column.width;
+                    }
+                }
+                else {
+                    cell.visible = false;
+                }
+            }
             levels[level].push(cell);
             const headerKey = `${level}-${indexCol}`;
             if (col.fixedType === "left" && col.visible !== false) {
@@ -42796,7 +42811,7 @@ const ToolbarBottom = ({ handleAdd, handleDuplicate, handleInsertBefore, handleI
 
 const TableEdit = forwardRef((props, ref) => {
     const { t } = useTranslation();
-    const { idTable, dataSource, columns, pagingSetting, setDataSource, height, maxHeight, minHeight, defaultValue, toolbarSetting, searchSetting, selectedItem, selectEnable, editDisable, addDisable, buttonSetting, formatSetting, haveSum, isMulti, disableAutoKey, commandClick, dataSourceChange, rowChange, setSelectedItem, handleSelect, onDuplicate, saveSettingColumn, allowFilter = true, allowOrder, optionsFilter } = props;
+    const { idTable, dataSource, columns, pagingSetting, setDataSource, height, maxHeight, minHeight, defaultValue, toolbarSetting, searchSetting, selectedItem, selectEnable, editDisable, addDisable, buttonSetting, formatSetting, haveSum, isMulti, disableAutoKey, commandClick, dataSourceChange, rowChange, setSelectedItem, handleSelect, onDuplicate, saveSettingColumn, allowFilter = true, allowOrder, settingColumns, optionsFilter } = props;
     useImperativeHandle(ref, () => {
         return {
             refeshFocusRow: handleRefeshRow
@@ -42809,7 +42824,6 @@ const TableEdit = forwardRef((props, ref) => {
     const [searchTerm, setSearchTerm] = useState("");
     const [orderBy, setOrderBy] = useState([]);
     const [filterBy, setFilterBy] = useState([]);
-    const [refreshColumns, setRefreshColumns] = useState(false);
     const tableElement = useRef(null);
     const gridRef = useRef(null);
     const totalCount = dataSource.length;
@@ -42823,8 +42837,8 @@ const TableEdit = forwardRef((props, ref) => {
         }
     }, [dataSource]);
     const { levels: headerColumns, flat: contentColumns, flatVisble, objWidthFixLeft, objWidthFixRight, lastObjWidthFixLeft, fisrtObjWidthFixRight, objHeaderWidthFixLeft, objHeaderWidthFixRight, indexFirstEdit: indexFirstEdit, indexLastEdit: indexLastEdit } = useMemo(() => {
-        return calculateTableStructure(columns);
-    }, [columns, refreshColumns]);
+        return calculateTableStructure(columns, settingColumns);
+    }, [columns, settingColumns]);
     const handleRefeshRow = () => {
         setRefreshRow(true);
         setTimeout(() => {
@@ -43663,15 +43677,9 @@ const TableEdit = forwardRef((props, ref) => {
                                                             }, changeOrder: (val) => {
                                                                 setOrderBy([...val]);
                                                             }, columns: contentColumns, setColumns: (newColumns) => {
-                                                                newColumns.forEach((x) => {
-                                                                    const column = columns.find((y) => y.field === x.field);
-                                                                    if (column) {
-                                                                        column.visible = x.visible;
-                                                                        column.fixedType = x.fixedType;
-                                                                        column.width = x.width;
-                                                                    }
-                                                                });
-                                                                setRefreshColumns(!refreshColumns);
+                                                                if (saveSettingColumn) {
+                                                                    saveSettingColumn(newColumns.map((x) => ({ field: x.field, headerText: x.headerText, visible: x.visible, fixedType: x.fixedType, width: x.width })));
+                                                                }
                                                             }, fisrtObjWidthFixRight: fisrtObjWidthFixRight, lastObjWidthFixLeft: lastObjWidthFixLeft, totalCount: totalCount }, `header-${indexParent}-${index}`));
                                                     }) }, `header-${-indexParent}`));
                                             }) }), jsx("tbody", { className: "r-gridcontent", role: "rowgroup", children: dataSource.map((row, indexRow) => {
@@ -43698,18 +43706,8 @@ const TableEdit = forwardRef((props, ref) => {
                     setOpenPopupSetupColumn(!openPopupSetupColumn);
                 }, openSidebar: openPopupSetupColumn, column: [...contentColumns], setColumn: (newColumns) => {
                     if (saveSettingColumn) {
-                        console.log(newColumns);
                         saveSettingColumn(newColumns.map((x) => ({ field: x.field, headerText: x.headerText, visible: x.visible, fixedType: x.fixedType, width: x.width })));
                     }
-                    newColumns.forEach((x) => {
-                        const column = columns.find((y) => y.field === x.field);
-                        if (column) {
-                            column.visible = x.visible;
-                            column.fixedType = x.fixedType;
-                            column.width = x.width;
-                        }
-                    });
-                    setRefreshColumns(!refreshColumns);
                 } })] }));
 });