react-table-edit 1.5.34 → 1.5.36

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

@@ -45,12 +45,12 @@ type IFProps = {
      * API cập nhật cấu hình import
      * @param params - Tham số cập nhật
      */
-    updateGeneralSettingApi: (params: IFDataMapExcel[]) => void;
+    updateGeneralSettingApi?: (params: IFDataMapExcel[]) => void;
     /**
      * API lấy cấu hình in
      * @returns Promise trả về kết quả in
      */
-    getGeneralSettingApi: () => Promise<any>;
+    getGeneralSettingApi?: () => Promise<any>;
 };
 declare const ModalImportComponent: (props: IFProps) => import("react/jsx-runtime").JSX.Element;
 export { ModalImportComponent };

package/dist/component/table-view/index.d.ts

@@ -41,6 +41,7 @@ type TableViewProps = {
     contextMenuItems?: IContextItem[];
     handleContextMenuClick?: (context: IContextItem, data: any) => void;
     isMulti?: boolean;
+    haveSum?: boolean;
     handleSelect?: (data: any) => void;
 };
 declare const TableView: React.FC<TableViewProps>;

package/dist/index.d.ts

@@ -583,12 +583,12 @@ type IFProps$1 = {
      * API cập nhật cấu hình import
      * @param params - Tham số cập nhật
      */
-    updateGeneralSettingApi: (params: IFDataMapExcel[]) => void;
+    updateGeneralSettingApi?: (params: IFDataMapExcel[]) => void;
     /**
      * API lấy cấu hình in
      * @returns Promise trả về kết quả in
      */
-    getGeneralSettingApi: () => Promise<any>;
+    getGeneralSettingApi?: () => Promise<any>;
 };
 declare const ModalImportComponent: (props: IFProps$1) => react_jsx_runtime.JSX.Element;
 
@@ -743,6 +743,7 @@ type TableViewProps = {
     contextMenuItems?: IContextItem[];
     handleContextMenuClick?: (context: IContextItem, data: any) => void;
     isMulti?: boolean;
+    haveSum?: boolean;
     handleSelect?: (data: any) => void;
 };
 declare const TableView: React__default.FC<TableViewProps>;

package/dist/index.js

@@ -49176,13 +49176,13 @@ const TabHandleErrorImportExcel = (props) => {
 const TabMergeImportExcel = (props) => {
     const { setValue, watch, windowSize, optionField, formatNumber } = props;
     const { t } = reactI18next.useTranslation();
-    return (jsxRuntime.jsxs("div", { className: 'box form-box__border', children: [jsxRuntime.jsx("h5", { className: 'm-0 form-box__border--title', children: t('Merge data fields') }), jsxRuntime.jsx(TableEdit, { formatSetting: {
+    return (jsxRuntime.jsxs("div", { className: "box form-box__border", children: [jsxRuntime.jsx("h5", { className: "m-0 form-box__border--title", children: t('Merge data fields') }), jsxRuntime.jsx(TableEdit, { formatSetting: {
                     decimalSeparator: formatNumber?.decimalSeparator,
                     thousandSeparator: formatNumber?.thousandSeparator,
                     colorNegative: formatNumber?.colorNegative,
                     prefixNegative: formatNumber?.prefixNegative,
                     suffixNegative: formatNumber?.suffixNegative
-                }, idTable: 'MapColumnImportExcel', columns: [
+                }, idTable: "MapColumnImportExcel", columns: [
                     {
                         headerText: 'Required Information',
                         field: 'isRequired',
@@ -49190,7 +49190,7 @@ const TabMergeImportExcel = (props) => {
                         editEnable: true,
                         textAlign: 'center',
                         template: (data) => {
-                            return jsxRuntime.jsx(jsxRuntime.Fragment, { children: data.isRequired ? jsxRuntime.jsx(SvgCheckSquare, { color: 'green', fontSize: 18 }) : jsxRuntime.jsx(SvgXSquare, { color: 'red', fontSize: 18 }) });
+                            return jsxRuntime.jsx(jsxRuntime.Fragment, { children: data.isRequired ? jsxRuntime.jsx(SvgCheckSquare, { color: "green", fontSize: 18 }) : jsxRuntime.jsx(SvgXSquare, { color: "red", fontSize: 18 }) });
                         },
                         disabledCondition: (row) => {
                             return row.disableEdit ?? false;
@@ -49212,15 +49212,18 @@ const TabMergeImportExcel = (props) => {
                         type: 'select',
                         editEnable: true,
                         selectSettings: {
-                            options: optionField
+                            options: optionField,
+                            isClearable: true
                         },
                         callback(value, indexRow, item) {
-                            if (!item.headerDefault.includes(value.label)) {
-                                item.headerDefault.push(value.label ? value.label?.trim() : '');
+                            if (!item.headerDefault.includes(value?.label)) {
+                                item.headerDefault.push(value?.label ? value?.label?.trim() : '');
                             }
                         },
                         visible: watch('dataMap').length > 0,
-                        template: (row) => { return optionField.find((e) => e.value === row.column)?.label; },
+                        template: (row) => {
+                            return optionField.find((e) => e.value === row.column)?.label;
+                        },
                         width: 300,
                         minWidth: 250,
                         maxWidth: 350
@@ -68398,7 +68401,7 @@ const ModalImportComponent = (props) => {
     const [checkInitValidate, setCheckInitValidate] = React$5.useState(false);
     const [validateExcelColumns, setValidateExcelColumns] = React$5.useState(mapColumn);
     const [dataError, setDataError] = React$5.useState([]);
-    const [isSaveSetting, setIsSaveSetting] = React$5.useState(true);
+    const [isSaveSetting, setIsSaveSetting] = React$5.useState(!!getGeneralSettingApi && !!updateGeneralSettingApi);
     const formSchema = create().shape({
         step: create$1(),
         sheetId: create$2().when('step', {
@@ -68451,7 +68454,7 @@ const ModalImportComponent = (props) => {
             mapDataImportExcel(dataMerge, getValues('headerRow') ?? 0, data.dataMap, handleValidate).then((arr) => {
                 setCheckInitValidate(true);
                 if (isSaveSetting) {
-                    updateGeneralSettingApi(data.dataMap.map((x) => ({ ...x, column: undefined })));
+                    updateGeneralSettingApi?.(data.dataMap.map((x) => ({ ...x, column: undefined })));
                 }
                 validateExcelApi(arr)
                     .then((rs) => {
@@ -68462,7 +68465,8 @@ const ModalImportComponent = (props) => {
                     setDataValid(list.filter((x) => x.error || x.errors?.length === 0));
                     setValue('step', 3);
                 })
-                    .catch(() => {
+                    .catch((ex) => {
+                    console.log(ex);
                     notificationError(t('GetFail'));
                     setCheckInitValidate(false);
                 });
@@ -68528,24 +68532,26 @@ 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) => {
-                const ele = arr.find((y) => x.field === y.field);
-                if (ele) {
-                    x.headerDefault = ele.headerDefault;
-                }
-                return x;
-            }));
-        })
-            .catch(() => {
+        if (getGeneralSettingApi) {
+            getGeneralSettingApi()
+                .then((rs) => {
+                const arr = rs?.value ? JSON.parse(rs.value) : [];
+                setValue('dataMap', [...mapColumn].map((x) => {
+                    const ele = arr.find((y) => x.field === y.field);
+                    if (ele) {
+                        x.headerDefault = ele.headerDefault;
+                    }
+                    return x;
+                }));
+            })
+                .catch(() => {
+                setValue('dataMap', [...mapColumn]);
+            });
+        }
+        else {
             setValue('dataMap', [...mapColumn]);
-        });
+        }
         if (headerValidateExcelColumns && headerValidateExcelColumns.length > 0) {
             setValidateExcelColumns(headerValidateExcelColumns);
         }
@@ -68596,7 +68602,7 @@ const ModalImportComponent = (props) => {
                                         visible: !!headerErrorExcelColumns,
                                         content: jsxRuntime.jsx(TabHandleErrorImportExcel, { formatNumber: formatNumber, dataError: dataError, headerHandleErrorExcelColumns: headerErrorExcelColumns ?? [], windowSize: windowSize })
                                     }
-                                ] }) }) }) }), jsxRuntime.jsxs("div", { className: "d-flex justify-content-between align-items-center p-1", style: { boxShadow: '0 4px 24px 0 rgb(34 41 47 / 10%)' }, children: [jsxRuntime.jsx("div", { className: "d-flex align-items-center", children: watch('step') === 2 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Input$1, { checked: isSaveSetting, type: "checkbox", className: "me-50", onChange: (val) => {
+                                ] }) }) }) }), jsxRuntime.jsxs("div", { className: "d-flex justify-content-between align-items-center p-1", style: { boxShadow: '0 4px 24px 0 rgb(34 41 47 / 10%)' }, children: [jsxRuntime.jsx("div", { className: "d-flex align-items-center", children: watch('step') === 2 && getGeneralSettingApi && updateGeneralSettingApi && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Input$1, { checked: isSaveSetting, type: "checkbox", className: "me-50", onChange: (val) => {
                                             setIsSaveSetting(val.target.checked);
                                         } }), jsxRuntime.jsx("span", { children: "L\u01B0u th\u00F4ng tin gh\u00E9p tr\u01B0\u1EDDng d\u1EEF li\u1EC7u" })] })) }), jsxRuntime.jsxs("div", { className: "d-flex align-items-center", children: [jsxRuntime.jsx(Button$1$1, { disabled: !getValues('file'), color: "primary", outline: true, className: `update-btn update-todo-item me-1 ${watch('step') !== 1 ? '' : 'd-none'}`, onClick: handleBackStep, children: t('Back') }), jsxRuntime.jsx(Button$1$1, { className: `update-btn update-todo-item me-1 ${watch('step') !== 3 ? '' : 'd-none'}`, disabled: !watch('file') || checkInitValidate, color: "primary", onClick: handleSubmit(onSubmit), children: t('Next') }), jsxRuntime.jsx(Button$1$1, { className: `update-btn update-todo-item me-1 ${watch('step') === 3 ? '' : 'd-none'}`, disabled: dataValid.length === 0 || !getValues('file') || checkInit, color: "primary", onClick: handleSubmit(onSubmit), children: t('Import') }), jsxRuntime.jsx(Button$1$1, { color: "secondary", onClick: handleModal, outline: true, children: t('Close') })] })] })] }) }));
 };
@@ -68738,7 +68744,17 @@ const RenderContentCol = (props) => {
         return element && element.scrollWidth > element.clientWidth;
     };
     const RenderElement = () => {
-        if (col.type === 'checkbox' || col.field === 'checkbox') {
+        if (col.field === '#' || col.type === '#') {
+            return (jsxRuntime.jsx("div", { className: classNames$1('r-rowcell-div cursor-pointer text-center', { 'r-active-cell': isSelected }), style: {
+                    fontWeight: row.sortOrder < 0 || row.sortOrder > 100000 || row.haveBoldType ? 600 : 400,
+                    fontStyle: row.haveItalicType ? 'italic' : 'normal'
+                }, onDoubleClick: (e) => {
+                    e.preventDefault();
+                    handleCloseContext();
+                    handleDoubleClick?.(row, col);
+                }, children: indexRow + 1 }));
+        }
+        else if (col.type === 'checkbox' || col.field === 'checkbox') {
             return (jsxRuntime.jsx("div", { className: classNames$1('r-rowcell-div cursor-pointer', { 'r-active-cell': isSelected }), style: { display: 'flex', justifyContent: col.textAlign === 'center' ? 'center' : col.textAlign === 'right' ? 'flex-end' : 'flex-start', alignItems: 'center' }, onClick: (e) => {
                     const index = selectedRows?.findIndex((x) => x[fieldKey] === row[fieldKey]);
                     if (index > -1) {
@@ -68801,7 +68817,10 @@ const RenderContentCol = (props) => {
                                 textOverflow: 'ellipsis',
                                 whiteSpace: 'pre',
                                 maxWidth: '100%'
-                            }, children: displayText }) }), checkOverflow() && (jsxRuntime.jsx(UncontrolledTooltip, { className: "r-tooltip", autohide: false, target: cellId, placement: "top", children: jsxRuntime.jsx("div", { style: { color: textColor }, children: displayText }) }))] }));
+                            }, children: displayText }) }), checkOverflow() && (jsxRuntime.jsx(UncontrolledTooltip, { className: "r-tooltip", autohide: false, target: cellId, placement: "top", children: jsxRuntime.jsx("div", { style: { color: textColor }, onClick: (e) => {
+                                e.stopPropagation();
+                                e.preventDefault();
+                            }, children: displayText }) }))] }));
         }
     };
     return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: col.visible !== false && col.isGroup !== true && (jsxRuntime.jsx("td", { className: classNames$1(`r-rowcell fix-${col.fixedType}`, { 'cell-fixed': col.fixedType }, { 'fixed-last': (col.fixedType === 'left' && indexCol === lastObjWidthFixLeft) || (col.fixedType === 'right' && indexCol === fisrtObjWidthFixRight) }, { 'r-active': isSelected }), style: {
@@ -68832,7 +68851,7 @@ const RenderContentCol = (props) => {
             }, children: RenderElement() }, `col-${indexRow}-${indexCol}`)) }));
 };
 
-const TableView = ({ idTable, dataSource, height = 400, columns, isLoading, formatSetting, querySetting, pagingSetting, searchSetting, columnsAggregate, toolbarSetting, selectedItem, setSelectedItem, handleSelect, saveSettingColumn, resetDefaultColumns, settingColumns, headerComponent, groupSetting, zeroVisiable, isMulti, handleDoubleClick, contextMenuItems, handleContextMenuClick }) => {
+const TableView = ({ idTable, dataSource, height = 400, haveSum, columns, isLoading, formatSetting, querySetting, pagingSetting, searchSetting, columnsAggregate, toolbarSetting, selectedItem, setSelectedItem, handleSelect, saveSettingColumn, resetDefaultColumns, settingColumns, headerComponent, groupSetting, zeroVisiable, isMulti, handleDoubleClick, contextMenuItems, handleContextMenuClick }) => {
     const { t } = reactI18next.useTranslation();
     const gridRef = React$5.useRef(null);
     const [openPopupSetupColumn, setOpenPopupSetupColumn] = React$5.useState(false);
@@ -69181,7 +69200,7 @@ const TableView = ({ idTable, dataSource, height = 400, columns, isLoading, form
                                                             querySetting.changeOrder(val);
                                                         }
                                                     }, columns: contentColumns, setContentColumns: setContentColumns, fisrtObjWidthFixRight: fisrtObjWidthFixRight, lastObjWidthFixLeft: lastObjWidthFixLeft, totalCount: dataSource?.length ?? 0 }, `header-${indexParent}-${index}`))) }, `header-${-indexParent}`));
-                                        }) }), jsxRuntime.jsx("tbody", { className: "r-gridcontent", role: "rowgroup", children: jsxRuntime.jsx(RenderContent, { datas: viewData }) }), jsxRuntime.jsx("tfoot", { className: "r-gridfoot", children: (columnsAggregate?.length ?? 0) > 0 && (jsxRuntime.jsx("tr", { className: "r-row", children: contentColumns.map((col, indexCol) => {
+                                        }) }), jsxRuntime.jsx("tbody", { className: "r-gridcontent", role: "rowgroup", children: jsxRuntime.jsx(RenderContent, { datas: viewData }) }), jsxRuntime.jsx("tfoot", { className: "r-gridfoot", children: ((columnsAggregate?.length ?? 0) > 0 || haveSum) && (jsxRuntime.jsx("tr", { className: "r-row", children: contentColumns.map((col, indexCol) => {
                                                 if (col.visible === false || col.isGroup === true) {
                                                     return;
                                                 }