react-table-edit 1.4.49 → 1.4.51

package/dist/index.mjs

@@ -52709,6 +52709,11 @@ const TabMergeImportExcel = (props) => {
                         selectSettings: {
                             options: optionField
                         },
+                        callback(value, indexRow, item) {
+                            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; },
                         width: 300,
@@ -71780,7 +71785,7 @@ const mapDataImportExcel = async (dataSheet, headerRow, dataMap, handleValidate)
                             }
                         }
                         else {
-                            value = row[ele.column] ? row[ele.column].toString() : undefined;
+                            value = row[ele.column] ? row[ele.column].toString().trim() : undefined;
                         }
                         //validate cho mỗi loại
                     }
@@ -71888,7 +71893,7 @@ const TabValidateImportExcel = (props) => {
 
 const ModalImportComponent = (props) => {
     const { t } = useTranslation();
-    const { windowSize, openModal, handleModal, handleValidate, importExcelApi, validateExcelApi, headerErrorExcelColumns, templateUrl, defaultHeaderRow, pageOptions, pageSizeDefault, formatNumber, mapColumn, headerValidateExcelColumns } = props;
+    const { windowSize, openModal, handleModal, handleValidate, importExcelApi, validateExcelApi, getGeneralSettingApi, updateGeneralSettingApi, headerErrorExcelColumns, templateUrl, defaultHeaderRow, pageOptions, pageSizeDefault, formatNumber, mapColumn, headerValidateExcelColumns } = props;
     const [optionField, setOptionField] = useState([]);
     const [dataMerge, setDataMerge] = useState([]);
     const [dataValidate, setDataValidate] = useState([]);
@@ -71898,6 +71903,7 @@ const ModalImportComponent = (props) => {
     const [checkInitValidate, setCheckInitValidate] = useState(false);
     const [validateExcelColumns, setValidateExcelColumns] = useState([]);
     const [dataError, setDataError] = useState([]);
+    const [isSaveSetting, setIsSaveSetting] = useState(true);
     const formSchema = create().shape({
         step: create$1(),
         sheetId: create$2()
@@ -71944,9 +71950,17 @@ const ModalImportComponent = (props) => {
             getColumnsSheetExcel(data.file, data.headerRow ?? 0, data.sheetId ?? "", handleSetColumns);
         }
         else if (getValues('step') === 2) {
+            const check = data.dataMap.find(x => x.isRequired && !x.column);
+            if (check) {
+                messageBoxError(t, `Vui lòng chọn trường ghép cho cột <<${check.header}>>`);
+                return;
+            }
             mapDataImportExcel(dataMerge, getValues('headerRow') ?? 0, data.dataMap, handleValidate)
                 .then((arr) => {
                 setCheckInitValidate(true);
+                if (isSaveSetting) {
+                    updateGeneralSettingApi(data.dataMap.map(x => ({ ...x, column: undefined })));
+                }
                 validateExcelApi(arr)
                     .then((rs) => {
                     setCheckInitValidate(false);
@@ -72021,7 +72035,11 @@ const ModalImportComponent = (props) => {
         }
     ];
     const handleFormOpened = () => {
-        setValue('dataMap', mapColumn);
+        getGeneralSettingApi().then((rs) => {
+            setValue('dataMap', rs.value ? JSON.parse(rs.value) : mapColumn);
+        }).catch(() => {
+            setValue('dataMap', mapColumn);
+        });
         if (headerValidateExcelColumns && headerValidateExcelColumns.length > 0) {
             setValidateExcelColumns(headerValidateExcelColumns);
         }
@@ -72049,9 +72067,6 @@ const ModalImportComponent = (props) => {
             setValue('step', 2);
         }
     };
-    const renderFooterButtons = () => {
-        return (jsxs(Fragment, { children: [jsx(Button$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') }), jsx(Button$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') }), jsx(Button$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') }), jsx(Button$1, { color: "secondary", onClick: handleModal, outline: true, children: t('Close') })] }));
-    };
     return (jsx(Modal$1, { isOpen: openModal, toggle: handleModal, backdrop: 'static', className: 'modal-dialog-centered modal-xl', contentClassName: 'p-0', onOpened: handleFormOpened, onClosed: handleModalClosed, children: jsxs(Form$1, { id: 'form-modal-globalzone', className: 'todo-modal modal-form-content', children: [jsx(ModalHeader, { typeModal: 'Import', handleModal: handleModal, title: 'Import Excel' }), jsx(Scrollbars, { autoHide: true, autoHeight: true, autoHeightMax: windowSize.innerHeight - 120, children: jsx(ModalBody$1, { children: jsx("div", { style: { marginTop: '-25px' }, className: 'modern-horizontal-wizard', children: jsx(Wizard, { activeStep: watch('step'), type: 'modern-horizontal', steps: [
                                     {
                                         id: 'upload-file',
@@ -72074,7 +72089,9 @@ const ModalImportComponent = (props) => {
                                         visiable: !!headerErrorExcelColumns,
                                         content: jsx(TabHandleErrorImportExcel, { formatNumber: formatNumber, pageOptions: pageOptions, pageSizeDefault: pageSizeDefault, dataError: dataError, headerHandleErrorExcelColumns: headerErrorExcelColumns ?? [], windowSize: windowSize })
                                     }
-                                ] }) }) }) }), jsx("div", { className: "d-flex justify-content-end p-1", style: { boxShadow: "0 4px 24px 0 rgb(34 41 47 / 10%)" }, children: renderFooterButtons() })] }) }));
+                                ] }) }) }) }), 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: [jsx("div", { className: "d-flex align-items-center", children: watch('step') === 2 && jsxs(Fragment$1, { children: [jsx(Input$1, { checked: isSaveSetting, type: 'checkbox', className: 'me-50', onChange: (val) => {
+                                            setIsSaveSetting(val.target.checked);
+                                        } }), jsx("span", { children: "L\u01B0u th\u00F4ng tin gh\u00E9p tr\u01B0\u1EDDng d\u1EEF li\u1EC7u" })] }) }), jsxs("div", { className: "d-flex align-items-center", children: [jsx(Button$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') }), jsx(Button$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') }), jsx(Button$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') }), jsx(Button$1, { color: "secondary", onClick: handleModal, outline: true, children: t('Close') })] })] })] }) }));
 };
 
 const TabsMenuComponent = ({ buttonWidth, tabParent, tabChild, resourceCodeParent, resources, resourceCode, windowSize, renderModal }) => {