es-grid-template 1.9.53 → 1.9.56

package/lib/table-component/TableContainerEdit.js

@@ -11,30 +11,29 @@ var _usehooksTs = require("usehooks-ts");
 var _utils = require("./hook/utils");
 var _reactVirtual = require("@tanstack/react-virtual");
 var _reactHookForm = require("react-hook-form");
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _button = _interopRequireDefault(require("rc-master-ui/es/button"));
 var _dropdown = _interopRequireDefault(require("rc-master-ui/es/dropdown"));
 var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
 var _reactNumericComponent = require("react-numeric-component");
 var _useContext = require("./useContext");
 var _yup = require("@hookform/resolvers/yup");
-var _rcMasterUi = require("rc-master-ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _becoxyIcons = require("becoxy-icons");
-var _ColumnsChoose = require("./ColumnsChoose");
 var _TableWrapper = _interopRequireDefault(require("./table/TableWrapper"));
 var _sweetalert2ReactContent = _interopRequireDefault(require("sweetalert2-react-content"));
 var _sweetalert = _interopRequireDefault(require("sweetalert2"));
 var _locale = require("rc-master-ui/es/locale");
 var _hooks = require("../grid-component/hooks");
 var _moment = _interopRequireDefault(require("moment"));
+var _ColumnsConfig = require("./ColumnsConfig");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const MySwal = (0, _sweetalert2ReactContent.default)(_sweetalert.default);
 const {
   Paragraph,
   Title
-} = _antd.Typography;
+} = _rcMasterUi.Typography;
 const validateData = async (data, formSchema) => {
   if (!formSchema) {
     return [];
@@ -599,7 +598,7 @@ const TableContainerEdit = props => {
     if (rowsPasted.length > (onCellPaste?.maxRowsPaste ?? 200)) {
       // bật popup thông báo
 
-      _antd.Modal.confirm({
+      _rcMasterUi.Modal.confirm({
         content: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(Paragraph, {
           style: {
             marginBottom: '.25rem',
@@ -649,11 +648,24 @@ const TableContainerEdit = props => {
       const isInsideContainer = element.closest(".be-popup-container") && container;
       const isInsideContainerContext = containerContextMenu && element.closest(".popup-context-menu");
       const isInsideToolbar = element.closest(`.ui-rc-toolbar-selection-overflow-item`) && itemContainer;
-      const isInsideHeader = itemHeader && itemHeader.contains(event.target);
+      const isInsideHeader = itemHeader && itemHeader.contains(element);
       if (isInsideContainer || isInsideToolbar || isInsideHeader || isInsideContainerContext || element.id === id) {
         return;
       }
-      if (containerRef.current && tableBody && !tableBody.contains(event.target)) {
+
+      // trường hợp đặc biệt select table clear icon
+      const path = '<path d="M512 64c247.4 0 448 200.6 448 448S759.4 960 512 960 64 759.4 64 512 264.6 64 512 64zm127.98 274.82h-.04l-.08.06L512 466.75 384.14 338.88c-.04-.05-.06-.06-.08-.06a.12.12 0 00-.07 0c-.03 0-.05.01-.09.05l-45.02 45.02a.2.2 0 00-.05.09.12.12 0 000 .07v.02a.27.27 0 00.06.06L466.75 512 338.88 639.86c-.05.04-.06.06-.06.08a.12.12 0 000 .07c0 .03.01.05.05.09l45.02 45.02a.2.2 0 00.09.05.12.12 0 00.07 0c.02 0 .04-.01.08-.05L512 557.25l127.86 127.87c.04.04.06.05.08.05a.12.12 0 00.07 0c.03 0 .05-.01.09-.05l45.02-45.02a.2.2 0 00.05-.09.12.12 0 000-.07v-.02a.27.27 0 00-.05-.06L557.25 512l127.87-127.86c.04-.04.05-.06.05-.08a.12.12 0 000-.07c0-.03-.01-.05-.05-.09l-45.02-45.02a.2.2 0 00-.09-.05.12.12 0 00-.07 0z"></path>';
+      const expectedD = path.match(/d="([^"]*)"/)?.[1];
+      const clickedPath = element.closest('path') ?? element.closest('svg')?.querySelector('path');
+      if (clickedPath) {
+        const isMatch = clickedPath.getAttribute('d') === expectedD;
+        if (isMatch) {
+          return;
+        }
+      }
+      // trường hợp đặc biệt select table clear icon
+
+      if (containerRef.current && tableBody && !tableBody.contains(element)) {
         if (editingKey) {
           onBlur?.(dataSource);
         }
@@ -2113,7 +2125,7 @@ const TableContainerEdit = props => {
     },
     "data-tooltip-id": `${id}-tooltip-content`,
     "data-tooltip-content": locale?.table?.fullScreen || tableLocal?.fullScreen || 'Full screen'
-  })), showColumnChoose && /*#__PURE__*/_react.default.createElement(_ColumnsChoose.ColumnsChoose, {
+  })), showColumnChoose && /*#__PURE__*/_react.default.createElement(_ColumnsConfig.ColumnsConfig, {
     table: table,
     columns: columns,
     originColumns: propsColumns,

package/lib/table-component/body/EditableCell.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
 var _utils = require("../hook/utils");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactNumericComponent = require("react-numeric-component");
@@ -79,6 +78,7 @@ const EditableCell = props => {
     const date = !(0, _utils.isEmpty)(value) ? (0, _utils.convertDateToDayjs)(new Date(value), dateFormat) : null;
     const maxDate = (0, _utils.convertDateToDayjs)(column.maxDate, dateFormat) ?? undefined;
     const minDate = (0, _utils.convertDateToDayjs)(column.minDate, dateFormat) ?? undefined;
+    const formValues = getValues();
     const {
       fieldValue,
       columns: selectColumns,
@@ -204,41 +204,6 @@ const EditableCell = props => {
           maxDate: maxDate,
           minDate: minDate
           // mode="date"
-
-          // onChange={(newDate, dateString) => {
-
-          //   const newDateValue = dateString ? moment(convertDayjsToDate(dateString as string, dateFormat)).format() : null
-
-          //   onChange(newDateValue)
-
-          //   setTimeout(() => {
-          //     // @ts-ignore
-          //     dateTimePickerRef.current?.focus()
-          //   }, 0)
-
-          // }}
-
-          // onBlur={() => {
-          //   const formState = getValues()
-          //   const itemState = getValues(dataIndex)
-          //   // @ts-ignore
-          //   const prevState = record[dataIndex]
-          //   const newState = itemState
-
-          //   if (prevState !== newState) {
-          //     handleCellChange?.({
-          //       key: key as any,
-          //       field: column.field ?? column.field as any,
-          //       record: formState,
-          //       prevState,
-          //       newState,
-          //       option: newState,
-          //       indexCol,
-          //       indexRow,
-          //       type: 'blur'
-          //     })
-          //   }
-          // }}
           ,
 
           popupClassName: 'be-popup-container',
@@ -246,8 +211,10 @@ const EditableCell = props => {
           "data-tooltip-content": message,
           "data-tooltip-id": `${id}-tooltip-error`,
           autoFocus: column.field === startCell?.colId,
-          defaultOpen: column.field === startCell?.colId,
-          needConfirm: false,
+          defaultOpen: column.field === startCell?.colId
+          // needConfirm={true}
+          ,
+
           onCalendarChange: (newDate, dateString) => {
             const newDateValue = dateString ? (0, _moment.default)((0, _utils.convertDayjsToDate)(dateString, dateFormat)).format() : null;
             onChange(newDateValue);
@@ -507,10 +474,10 @@ const EditableCell = props => {
             align: colSelect.textAlign
           };
         });
-        let valueSelectTable = value;
+        let valueSelectTable = formValues[dataIndex];
         if (fieldValue) {
           // @ts-ignore
-          valueSelectTable = record[fieldValue] ?? value;
+          valueSelectTable = record[fieldValue] ?? formValues[dataIndex];
         }
         return /*#__PURE__*/_react.default.createElement(_asyncTableSelect.AsyncTableSelect, {
           columns: columnsTable,
@@ -519,17 +486,19 @@ const EditableCell = props => {
           value: valueSelectTable ?? undefined,
           autoDestroy: true,
           onChange: (val, option) => {
-            onChange(val);
+            onChange(val ?? '');
             const formState = getValues();
-            // const itemState = getValues(dataIndex)
+            const formNewState = {
+              ...getValues(),
+              [dataIndex]: formState[dataIndex] || undefined
+            };
             // @ts-ignore
-            const prevState = record[dataIndex];
-            const newState = val;
+            const prevState = record[dataIndex] ?? undefined;
+            const newState = val ?? undefined;
             handleCellChange?.({
-              // @ts-ignore
-              key: record[rowKey],
+              key,
               field: column.field ?? column.field,
-              record: formState,
+              record: formNewState,
               prevState,
               newState,
               option: option,
@@ -559,7 +528,7 @@ const EditableCell = props => {
           status: isInvalid ? 'error' : undefined,
           dropdownRender: menu => {
             if (toolbarItems && toolbarItems.length > 0) {
-              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
                 style: {
                   margin: '8px 0'
                 }
@@ -573,7 +542,7 @@ const EditableCell = props => {
                     item: it,
                     column
                   })
-                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_antd.Button, {
+                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
                   className: "toolbar-item-btn"
                 }, it.icon && (0, _hooks.getTemplate)(it.icon), it.title));
               }))));
@@ -592,82 +561,90 @@ const EditableCell = props => {
           fieldNames: fieldNames ? fieldNames : {
             value: keySelect,
             label: inputKey ?? 'label'
-          },
-          onBlur: event => {
-            if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
-              const val = event.inputValue;
-              onChange(val ?? undefined);
-              const formState = getValues();
-              // const itemState = getValues(dataIndex)
-              // @ts-ignore
-              const prevState = record[dataIndex];
-              const newState = val;
-              handleCellChange?.({
-                key,
-                field: column.field ?? column.field,
-                record: formState,
-                prevState,
-                newState,
-                option: {
-                  value: val,
-                  label: val,
-                  searchTextAsValue: true
-                },
-                indexCol,
-                indexRow,
-                type: 'blur'
-              });
-            }
-          },
-          onKeyDown: event => {
-            if (event.key === 'Enter' && event.target?.value && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
-              const val = event.target.value;
-              onChange(val);
-              const formState = getValues();
-              // const itemState = getValues(dataIndex)
-              // @ts-ignore
-              const prevState = record[dataIndex];
-              const newState = val;
-              handleCellChange?.({
-                key,
-                field: column.field ?? column.field,
-                record: formState,
-                prevState,
-                newState,
-                option: {
-                  value: val,
-                  label: val,
-                  searchTextAsValue: true
-                },
-                indexCol,
-                indexRow,
-                type: 'blur'
-              });
-            }
-          },
+          }
+
+          // onBlur={(event: any) => {
+
+          //   if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
+          //     const val = event.inputValue
+          //     onChange(val ?? undefined)
+
+          //     const formState = getValues()
+          //     // const itemState = getValues(dataIndex)
+          //     // @ts-ignore
+          //     const prevState = record[dataIndex]
+          //     const newState = val
+
+          //     handleCellChange?.({
+          //       key,
+          //       field: column.field ?? column.field as any,
+          //       record: formState,
+          //       prevState,
+          //       newState,
+          //       option: { value: val, label: val, searchTextAsValue: true } as any,
+          //       indexCol,
+          //       indexRow,
+          //       type: 'blur'
+          //     })
+          //   }
+          // }}
+
+          // onKeyDown={(event: any) => {
+
+          //   if (event.key === 'Enter' && event.target?.value && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
+
+          //     const val = event.target.value
+          //     onChange(val)
+
+          //     const formState = getValues()
+          //     // const itemState = getValues(dataIndex)
+          //     // @ts-ignore
+          //     const prevState = record[dataIndex]
+          //     const newState = val
+
+          //     handleCellChange?.({
+          //       key,
+          //       field: column.field ?? column.field as any,
+          //       record: formState,
+          //       prevState,
+          //       newState,
+          //       option: { value: val, label: val, searchTextAsValue: true } as any,
+          //       indexCol,
+          //       indexRow,
+          //       type: 'blur'
+          //     })
+
+          //   }
+
+          // }}
+          ,
+
           "data-tooltip-content": message,
           "data-tooltip-id": `${id}-tooltip-error`
         });
       case 'select':
-        let valueSelect = value;
+        let valueSelect = formValues[dataIndex];
         if (fieldValue) {
           // @ts-ignore
-          valueSelect = record[fieldValue] ?? value;
+          valueSelect = record[fieldValue] ?? formValues[dataIndex];
         }
         return /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
           options: options,
-          value: valueSelect ?? undefined,
+          value: valueSelect ?? '',
           onChange: (val, option) => {
-            onChange(val);
+            onChange(val ?? '');
             const formState = getValues();
-            // const itemState = getValues(dataIndex)
+            const formNewState = {
+              ...getValues(),
+              [dataIndex]: formState[dataIndex] || undefined
+            };
             // @ts-ignore
-            const prevState = record[dataIndex];
-            const newState = val;
+            const prevState = record[dataIndex] ?? undefined;
+            const newState = val ?? undefined;
             handleCellChange?.({
               key,
               field: column.field ?? column.field,
-              record: formState,
+              record: formNewState,
               prevState,
               newState,
               option: option,
@@ -675,8 +652,11 @@ const EditableCell = props => {
               indexRow,
               type: 'blur'
             });
-          },
-          autoDestroy: true,
+          }
+          // destroyOnHidden
+          // des
+          // autoDestroy={true}
+          ,
           showSearch: true,
           mode: isMulti || selectMode === 'checkbox' ? 'multiple' : undefined,
           valueSelectAble: true,
@@ -760,7 +740,7 @@ const EditableCell = props => {
           },
           dropdownRender: menu => {
             if (toolbarItems && toolbarItems.length > 0) {
-              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
                 style: {
                   margin: '8px 0'
                 }
@@ -774,7 +754,7 @@ const EditableCell = props => {
                     item: it,
                     column
                   })
-                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_antd.Button, {
+                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
                   className: "toolbar-item-btn"
                 }, it.icon && (0, _hooks.getTemplate)(it.icon), it.title));
               }))));
@@ -786,26 +766,29 @@ const EditableCell = props => {
           "data-tooltip-id": `${id}-tooltip-error`
         });
       case 'asyncSelect':
-        let valueAsyncSelect = value;
+        let valueAsyncSelect = formValues[dataIndex];
         if (fieldValue) {
           // @ts-ignore
-          valueAsyncSelect = record[fieldValue] ?? value;
+          valueAsyncSelect = record[fieldValue] ?? formValues[dataIndex];
         }
         return /*#__PURE__*/_react.default.createElement(_asyncSelect.AsyncSelect, {
           options: options,
           defaultOptions: options,
           value: valueAsyncSelect ?? undefined,
           onChange: (val, option) => {
-            onChange(val);
+            onChange(val ?? '');
             const formState = getValues();
-            // const itemState = getValues(dataIndex)
+            const formNewState = {
+              ...getValues(),
+              [dataIndex]: formState[dataIndex] || undefined
+            };
             // @ts-ignore
-            const prevState = record[dataIndex];
-            const newState = val;
+            const prevState = record[dataIndex] ?? undefined;
+            const newState = val ?? undefined;
             handleCellChange?.({
               key,
               field: column.field ?? column.field,
-              record: formState,
+              record: formNewState,
               prevState,
               newState,
               option: option,
@@ -813,8 +796,9 @@ const EditableCell = props => {
               indexRow,
               type: 'blur'
             });
-          },
-          autoDestroy: true,
+          }
+          // autoDestroy={true}
+          ,
           showSearch: true,
           defaultOpen: column.field === startCell?.colId,
           autoFocus: column.field === startCell?.colId,
@@ -834,7 +818,7 @@ const EditableCell = props => {
           status: isInvalid ? 'error' : undefined,
           dropdownRender: menu => {
             if (toolbarItems && toolbarItems.length > 0) {
-              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, toolbarItems && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
                 style: {
                   margin: '8px 0'
                 }
@@ -848,7 +832,7 @@ const EditableCell = props => {
                     item: it,
                     column
                   })
-                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_antd.Button, {
+                }, it.template ? (0, _hooks.getTemplate)(it.template) : /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
                   className: "toolbar-item-btn"
                 }, it.icon && (0, _hooks.getTemplate)(it.icon), it.title));
               }))));
@@ -1095,18 +1079,18 @@ const EditableCell = props => {
               Picker,
               Presets
             }
-          }) => /*#__PURE__*/_react.default.createElement(_antd.Row, {
+          }) => /*#__PURE__*/_react.default.createElement(_rcMasterUi.Row, {
             justify: "space-between",
             wrap: false,
             className: "custom-panel be-popup-container"
-          }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
+          }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
             span: 12
-          }, /*#__PURE__*/_react.default.createElement(Presets, null)), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+          }, /*#__PURE__*/_react.default.createElement(Presets, null)), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
             type: "vertical",
             style: {
               height: 'auto'
             }
-          }), /*#__PURE__*/_react.default.createElement(_antd.Col, {
+          }), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
             flex: "auto"
           }, /*#__PURE__*/_react.default.createElement(Picker, null)))
         });

package/lib/table-component/body/TableBodyCellEdit.js

@@ -1318,7 +1318,7 @@ const TableBodyCellEdit = props => {
     // rowKey={rowKey}
   }) : /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {
-      'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect'].includes((0, _utils.getEditType)(columnMeta, record))
+      'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes((0, _utils.getEditType)(columnMeta, record))
     })
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
     className: "ui-rc-table-row-expand-trigger",

package/lib/table-component/body/TableBodyRow.js

@@ -66,17 +66,12 @@ const TableBodyRow = ({
       [`${prefix}-grid-row-even`]: striped && virtualRow.index % 2 === 0
     }),
     style: {
-      // display: 'flex',
       display: 'grid',
-      // position: 'absolute',
       transform: `translateY(${virtualRow.start}px)`,
       //this should always be a `style` as it changes on scroll
-      // height: isEditing ? '36px' : undefined,
       gridTemplateColumns: `${templateColumns.map(n => `${n}fr`).join(" ")}`,
       height: isEditing ? virtualRow.size : undefined,
       minHeight: isEditing ? undefined : virtualRow.size,
-      // backgroundColor: Array.isArray(row.originalSubRows) ? '#f5f5f5' : undefined,
-      // fontWeight: Array.isArray(row.originalSubRows) ? '500' : undefined,
       ...rowStyles
     },
     onDoubleClick: e => {

package/lib/table-component/components/EditForm/EditForm.js

@@ -12,9 +12,6 @@ var _yup = require("@hookform/resolvers/yup");
 var _grid = require("rc-master-ui/es/grid");
 var _utils = require("../../hook/utils");
 var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
-var _divider = _interopRequireDefault(require("rc-master-ui/es/divider"));
-var _button = _interopRequireDefault(require("rc-master-ui/es/button"));
 var _InputControl = _interopRequireDefault(require("../InputControl/InputControl"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -306,7 +303,7 @@ const EditForm = props => {
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(SelectStyle, {
     ref: formRef,
     id: id ? id : ''
-  }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
+  }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Dropdown, {
     menu: {
       items: []
     },
@@ -359,14 +356,14 @@ const EditForm = props => {
         maxHeight: menuHeight ? menuHeight : 300,
         overflow: "auto"
       }
-    }, column.editFromSettings?.items ? renderForm(column.editFromSettings?.items) : ''), /*#__PURE__*/_react.default.createElement(_divider.default, {
+    }, column.editFromSettings?.items ? renderForm(column.editFromSettings?.items) : ''), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
       style: {
         margin: 0
       }
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "d-flex justify-content-end p-1"
       // style={{ boxShadow: "0 4px 24px 0 rgb(34 41 47 / 10%)" }}
-    }, /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
       variant: "solid",
       className: ""
       // onSubmit={handleSubmit(handleOnSubmit)}

package/lib/table-component/components/InputControl/InputControl.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _reactHookForm = require("react-hook-form");
 var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _grid = require("rc-master-ui/es/grid");
@@ -17,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const {
   Text
-} = _antd.Typography;
+} = _rcMasterUi.Typography;
 const InputControl = props => {
   const {
     id,

package/lib/table-component/components/checkbox-filter/CheckboxFilter.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
 var _useFilter = require("rc-master-ui/es/table/hooks/useFilter");
 var _FilterSearch = _interopRequireDefault(require("./FilterSearch"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -212,7 +211,7 @@ const CheckboxFilter = props => {
       indeterminate: selectedKeys.length > 0 && selectedKeys.length < (0, _useFilter.flattenKeys)(options).length,
       className: `${tablePrefixCls}-filter-dropdown-checkall`,
       onChange: onCheckAll
-    }, locale?.filterCheckall) : /*#__PURE__*/React.createElement(_rcMasterUi.Empty, null), /*#__PURE__*/React.createElement(_antd.Tree, {
+    }, locale?.filterCheckall) : /*#__PURE__*/React.createElement(_rcMasterUi.Empty, null), /*#__PURE__*/React.createElement(_rcMasterUi.Tree, {
       checkable: true,
       selectable: false,
       blockNode: true,

package/lib/table-component/components/checkbox-filter/FilterSearch.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import type { FilterSearchType, TableLocale } from "antd/es/table/interface";
 import type { AnyObject } from '../../../grid-component/type';
+import type { FilterSearchType, TableLocale } from 'rc-master-ui/es/table/interface';
 interface FilterSearchProps<RecordType = AnyObject> {
     value: string;
     onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;

package/lib/table-component/components/checkbox-filter/FilterSearch.js

@@ -10,6 +10,9 @@ var _SearchOutlined = _interopRequireDefault(require("@ant-design/icons/SearchOu
 var _rcMasterUi = require("rc-master-ui");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// import type {FilterSearchType, TableLocale} from "antd/es/table/interface"
+
+// import type { TableLocale } from 'rc-master-ui/es/locales';
 // import type {AnyObject} from "./../grid-component/type"
 
 const FilterSearch = props => {
@@ -17,8 +20,8 @@ const FilterSearch = props => {
     value,
     filterSearch,
     tablePrefixCls,
-    locale,
-    onChange
+    onChange,
+    locale
   } = props;
   if (!filterSearch) {
     return null;

package/lib/table-component/header/TableHeadCell.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcMasterUi = require("rc-master-ui");
 var _hooks = require("../../grid-component/hooks");
 var _utils = require("../hook/utils");
 var _useContext = require("../useContext");
@@ -164,12 +163,12 @@ const TableHeadCell = props => {
         selectedKeys,
         setSelectedKeys,
         tableLocal: undefined
-      })), /*#__PURE__*/_react.default.createElement(_antd.Space, {
+      })), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Space, {
         style: {
           justifyContent: 'end',
           width: '100%'
         }
-      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
         type: "primary",
         onClick: () => {
           // header.column.setFilterValue(selectedKeys)
@@ -180,7 +179,7 @@ const TableHeadCell = props => {
         style: {
           width: 90
         }
-      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
         type: "link",
         size: "small",
         onClick: () => {