react-table-edit 1.4.68 → 1.5.0

package/dist/component/modal-import-excel/type.d.ts

@@ -1,3 +1,4 @@
+import { JSX } from 'react';
 export interface IFDataExcel {
     step: number;
     file?: any;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import React__default, { ReactNode, Dispatch, SetStateAction, JSX as JSX$1 } from 'react';
+import React__default, { ReactNode, Dispatch, SetStateAction, JSX } from 'react';
 import { UseFormSetValue, UseFormGetValues, UseFormReset } from 'react-hook-form';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { TFunction } from 'react-i18next';
@@ -77,7 +77,7 @@ type ISettingFormElement = {
     /** Sự kiện submit form */
     onFormSubmit?: (rowData: any, setValue: UseFormSetValue<any>, getValues: UseFormGetValues<any>, reset: UseFormReset<any>) => void;
     /** Footer tùy chỉnh trong form */
-    footerTemplate?: (rowData: any) => JSX$1.Element;
+    footerTemplate?: (rowData: any) => JSX.Element;
     /** Sự kiện thay đổi trường dữ liệu */
     onChangeField?: (rowData: any, field: string, setValue: UseFormSetValue<any>, getValues: UseFormGetValues<any>) => void;
     /** Sự kiện thay đổi form */
@@ -122,9 +122,9 @@ type ISettingSelectElement = {
     /** Danh sách cột hiển thị trong bảng chọn */
     columns?: IFColumnSelectTable[];
     /** Tuỳ chỉnh hiển thị option */
-    formatOptionLabel?: (ele: any) => JSX$1.Element;
+    formatOptionLabel?: (ele: any) => JSX.Element;
     /** Component footer trong menu chọn */
-    footerComponent?: () => JSX$1.Element;
+    footerComponent?: () => JSX.Element;
     /** Load options động */
     loadOptions?: (keyword: string, callback: (rs: any[]) => void) => void;
     /** Sự kiện mở menu */
@@ -204,7 +204,7 @@ type IColumnTable = {
     /** Callback khi thay đổi giá trị */
     callback?: (value: any, indexRow: number, item: any) => void;
     /** Template hiển thị khi không ở chế độ edit */
-    template?: (row: any, indexRow: number) => JSX$1.Element | string | number | undefined;
+    template?: (row: any, indexRow: number) => JSX.Element | string | number | undefined;
     /** Xác định loại edit dựa trên điều kiện */
     typeCondition?: (row: any) => IColumnType;
     /** Sự kiện khi paste dữ liệu */
@@ -610,14 +610,14 @@ type Props$1 = {
     showFooter?: boolean;
     formatSetting?: IFTableSelectFormat;
     component?: string | HTMLElement | React__default.RefObject<HTMLElement> | undefined;
-    formatOptionLabel?: (ele: any) => JSX$1.Element;
+    formatOptionLabel?: (ele: any) => JSX.Element;
     loadOptions?: (keyword: string, callback: (rs: any[]) => void) => void;
     onKeyDown?: (e: React__default.KeyboardEvent<HTMLInputElement>) => any;
     onOpenMenu?: () => void;
     handleAdd?: (e?: any) => void;
     onPaste?: (e: React__default.ClipboardEvent<HTMLInputElement>) => void;
     onCloseMenu?: () => void;
-    footerComponent?: () => JSX$1.Element;
+    footerComponent?: () => JSX.Element;
     onChange: (val: any) => void;
     compareFunction?: (row?: any) => boolean | undefined;
 };
@@ -774,10 +774,10 @@ declare const calculateTableStructure: (columns: any[], settingColumns?: IFSetti
 
 type IFSteps = {
     id: string;
-    content: JSX$1.Element;
-    subtitle?: JSX$1.Element | string;
-    title: JSX$1.Element | string;
-    icon?: JSX$1.Element | string;
+    content: JSX.Element;
+    subtitle?: JSX.Element | string;
+    title: JSX.Element | string;
+    icon?: JSX.Element | string;
     done?: boolean;
     loading?: boolean;
     disable?: boolean;
@@ -794,7 +794,7 @@ type IFProps = {
     heightContent?: number | string;
     widthContent?: number | string;
     type?: 'vertical' | 'horizontal' | 'modern-horizontal' | 'modern-vertical';
-    separator?: JSX$1.Element;
+    separator?: JSX.Element;
 };
 declare const Wizard: React.ForwardRefExoticComponent<IFProps & React.RefAttributes<unknown>>;
 

package/dist/index.js

@@ -19960,7 +19960,9 @@ const calculateTableStructure = (columns, settingColumns) => {
         }, 0);
     };
     calcTotalRightWidth(columns);
-    applySetting(columns);
+    if ((settingColumns?.length ?? 0) > 0) {
+        applySetting(columns);
+    }
     traverse(columns);
     // Danh sách các cột được hiển thị
     const flatVisble = flat.filter((e) => e.visible !== false);
@@ -19971,7 +19973,6 @@ const calculateTableStructure = (columns, settingColumns) => {
     // Tính toán vị trí đầu tiên và cuối cùng của các cột có thể sửa
     const indexFirstEdit = flat.findIndex((item) => item.editEnable && item.visible !== false && !item.disabledCondition);
     const indexLastEdit = flat.map((item, idx) => (item.editEnable && item.visible !== false && !item.disabledCondition ? idx : -1)).reduce((acc, val) => (val > acc ? val : acc), -1);
-    console.log(flatVisble);
     return {
         levels,
         flat,
@@ -73030,7 +73031,7 @@ const ModalImportComponent = (props) => {
     const [dataInvalid, setDataInvalid] = React$5.useState([]);
     const [checkInit, setCheckInit] = React$5.useState(false);
     const [checkInitValidate, setCheckInitValidate] = React$5.useState(false);
-    const [validateExcelColumns, setValidateExcelColumns] = React$5.useState([]);
+    const [validateExcelColumns, setValidateExcelColumns] = React$5.useState(mapColumn);
     const [dataError, setDataError] = React$5.useState([]);
     const [isSaveSetting, setIsSaveSetting] = React$5.useState(true);
     const formSchema = create().shape({
@@ -73163,10 +73164,13 @@ const ModalImportComponent = (props) => {
             }
         }
     ];
+    React$5.useEffect(() => {
+        console.log(watch('dataMap'));
+    }, [watch('dataMap')]);
     const handleFormOpened = () => {
         getGeneralSettingApi().then((rs) => {
             const arr = rs?.value ? JSON.parse(rs.value) : [];
-            setValue('dataMap', mapColumn.map((x) => {
+            setValue('dataMap', [...mapColumn].map((x) => {
                 const ele = arr.find(y => x.field === y.field);
                 if (ele) {
                     x.headerDefault = ele.headerDefault;
@@ -73174,7 +73178,7 @@ const ModalImportComponent = (props) => {
                 return x;
             }));
         }).catch(() => {
-            setValue('dataMap', mapColumn);
+            setValue('dataMap', [...mapColumn]);
         });
         if (headerValidateExcelColumns && headerValidateExcelColumns.length > 0) {
             setValidateExcelColumns(headerValidateExcelColumns);
@@ -73813,7 +73817,7 @@ const TableView = ({ idTable, dataSource, rowHeight = 33, height = 400, columns,
                                                         right: col.fixedType === 'right' ? objWidthFixRight[indexCol] : undefined,
                                                         textAlign: col.textAlign ? col.textAlign : 'left'
                                                     }, children: jsxRuntime.jsxs("div", { className: "r-footer-div", children: [(item || (col.haveSum === true && col.type === "numeric")) && col.type === "numeric" && (Number(sumValue) >= 0) && jsxRuntime.jsx(jsxRuntime.Fragment, { children: formartNumberic(sumValue, formatSetting?.decimalSeparator ?? ',', formatSetting?.thousandSeparator ?? '.', col.numericSettings?.fraction, true, false) }), (item || (col.haveSum === true && col.type === "numeric")) && col.type === "numeric" && (Number(sumValue) < 0) && jsxRuntime.jsxs("div", { style: { color: formatSetting?.colorNegative ?? 'red' }, children: [" ", `${formatSetting?.prefixNegative ?? '-'}${formartNumberic(sumValue, formatSetting?.decimalSeparator ?? ',', formatSetting?.thousandSeparator ?? '.', col.numericSettings?.fraction, true, false)}${formatSetting?.suffixNegative ?? ''}`] })] }) }, `summarycell-${indexCol}`);
-                                            }) }) : jsxRuntime.jsx(jsxRuntime.Fragment, {}) })] }), (((viewData.length ?? 0) === 0) && !isLoading) && jsxRuntime.jsxs("div", { className: "r-no-data", children: [jsxRuntime.jsx("svg", { width: "64", height: "41", viewBox: "0 0 64 41", xmlns: "http://www.w3.org/2000/svg", children: jsxRuntime.jsxs("g", { transform: "translate(0 1)", fill: "none", fillRule: "evenodd", children: [jsxRuntime.jsx("ellipse", { fill: "#f5f5f5", cx: "32", cy: "33", rx: "32", ry: "7" }), jsxRuntime.jsxs("g", { fillRule: "nonzero", stroke: "#d9d9d9", children: [jsxRuntime.jsx("path", { d: "M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z" }), jsxRuntime.jsx("path", { d: "M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z", fill: "#fafafa" })] })] }) }), t('No data available.')] }), isLoading && jsxRuntime.jsx("div", { className: "r-loading-overlay", children: jsxRuntime.jsxs("div", { className: "r-loading", children: [jsxRuntime.jsx(Spinner$1, { className: "me-1" }), t('Loading...')] }) })] })] }), pagingSetting?.allowPaging ? jsxRuntime.jsx(PagingComponent, { onChangePage: onChangePage, pageSize: pagingSetting?.pageSize ?? 0, currentPage: pagingSetting?.currentPage ?? 0, pageOptions: pagingSetting?.pageOptions ?? [20, 30, 50, 100], totalItem: (pagingSetting?.pagingClient ? viewData.length : pagingSetting?.totalItem ?? 0), onChangePageSize: onChangePageSize }) : jsxRuntime.jsx(jsxRuntime.Fragment, {})] }));
+                                            }) }) : jsxRuntime.jsx(jsxRuntime.Fragment, {}) })] }), (((viewData.length ?? 0) === 0) && !isLoading) && jsxRuntime.jsxs("div", { className: "r-no-data", children: [jsxRuntime.jsx("svg", { width: "64", height: "41", viewBox: "0 0 64 41", xmlns: "http://www.w3.org/2000/svg", children: jsxRuntime.jsxs("g", { transform: "translate(0 1)", fill: "none", fillRule: "evenodd", children: [jsxRuntime.jsx("ellipse", { fill: "#f5f5f5", cx: "32", cy: "33", rx: "32", ry: "7" }), jsxRuntime.jsxs("g", { fillRule: "nonzero", stroke: "#d9d9d9", children: [jsxRuntime.jsx("path", { d: "M55 12.76L44.854 1.258C44.367.474 43.656 0 42.907 0H21.093c-.749 0-1.46.474-1.947 1.257L9 12.761V22h46v-9.24z" }), jsxRuntime.jsx("path", { d: "M41.613 15.931c0-1.605.994-2.93 2.227-2.931H55v18.137C55 33.26 53.68 35 52.05 35h-40.1C10.32 35 9 33.259 9 31.137V13h11.16c1.233 0 2.227 1.323 2.227 2.928v.022c0 1.605 1.005 2.901 2.237 2.901h14.752c1.232 0 2.237-1.308 2.237-2.913v-.007z", fill: "#fafafa" })] })] }) }), t('No data available.')] }), isLoading && jsxRuntime.jsx("div", { className: "r-loading-overlay", children: jsxRuntime.jsxs("div", { className: "r-loading", children: [jsxRuntime.jsx(Spinner$1, { className: "me-1" }), t('Loading...')] }) })] })] }), pagingSetting?.allowPaging ? jsxRuntime.jsx(PagingComponent, { gridRef: gridRef, onChangePage: onChangePage, pageSize: pagingSetting?.pageSize ?? 0, currentPage: pagingSetting?.currentPage ?? 0, pageOptions: pagingSetting?.pageOptions ?? [20, 30, 50, 100], totalItem: (pagingSetting?.pagingClient ? viewData.length : pagingSetting?.totalItem ?? 0), onChangePageSize: onChangePageSize }) : jsxRuntime.jsx(jsxRuntime.Fragment, {})] }));
 };
 
 exports.ExportExcelComponent = ExportExcelComponent;