es-grid-template 1.9.52 → 1.9.55

package/lib/ali-table/base-table/table.js

@@ -19,6 +19,7 @@ var _htmlTable = require("./html-table");
 var _loading = _interopRequireDefault(require("./loading"));
 var _styles = require("./styles");
 var _utils = require("./utils");
+var _sortable = require("@dnd-kit/sortable");
 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; }
 let emptyContentDeprecatedWarned = false;
@@ -200,7 +201,8 @@ class BaseTable extends _react.default.Component {
       components,
       id,
       commandClick,
-      format
+      format,
+      dataRowIds
     } = this.props;
     const tableBodyClassName = (0, _classnames.default)(_styles.Classes.tableBody, _styles.Classes.horizontalScrollContainer, {
       'no-scrollbar': footerDataSource && footerDataSource.length > 0
@@ -238,7 +240,10 @@ class BaseTable extends _react.default.Component {
       style: {
         height: topBlank
       }
-    }), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, {
+    }), /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+      items: dataRowIds ?? [],
+      strategy: _sortable.verticalListSortingStrategy
+    }, /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, {
       id: id ?? '',
       commandClick: commandClick,
       components: components,
@@ -258,7 +263,7 @@ class BaseTable extends _react.default.Component {
         limit: bottomIndex,
         last: dataSource.length - 1
       }
-    }), bottomBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+    })), bottomBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
       key: "bottom-blank",
       className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'bottom'),
       style: {
@@ -355,7 +360,9 @@ class BaseTable extends _react.default.Component {
       isStickyFooter,
       isLoading,
       footerDataSource,
-      components
+      components,
+      isBottom,
+      isTitle
     } = this.props;
     const artTableWrapperClassName = (0, _classnames.default)(_styles.Classes.tableWrapper, {
       'use-outer-border': useOuterBorder,
@@ -365,7 +372,9 @@ class BaseTable extends _react.default.Component {
       'theme-dark': theme?.theme === 'dark',
       'sticky-header': isStickyHeader,
       'has-footer': footerDataSource && footerDataSource.length > 0,
-      'sticky-footer': isStickyFooter
+      'sticky-footer': isStickyFooter,
+      'has-bottom': isBottom,
+      'has-title': isTitle
     }, className);
     const artTableWrapperProps = {
       className: artTableWrapperClassName,
@@ -397,6 +406,15 @@ class BaseTable extends _react.default.Component {
     this.adjustNeedRenderLock();
     this.updateRowHeightManager();
     this.updateScrollLeftWhenLayoutChanged(prevProps, prevState);
+    this.updateVerticalScrollClass();
+  }
+  updateVerticalScrollClass() {
+    const wrapper = this.domHelper?.artTableWrapper;
+    if (!wrapper) {
+      return;
+    }
+    const hasVerticalScroll = wrapper.scrollHeight > wrapper.clientHeight + 1;
+    wrapper.classList.toggle('has-vertical-scroll', hasVerticalScroll);
   }
   updateScrollLeftWhenLayoutChanged(prevProps, prevState) {
     if (prevState != null) {
@@ -422,6 +440,7 @@ class BaseTable extends _react.default.Component {
     this.rootSubscription.add(_utils.throttledWindowResize$.subscribe(() => {
       this.updateStickyScroll();
       this.adjustNeedRenderLock();
+      this.updateVerticalScrollClass();
     }));
 
     // Scroll synchronization

package/lib/ali-table/pipeline/features/columnCustom.js

@@ -12,7 +12,6 @@ var _ColumnResizer = _interopRequireDefault(require("../../base-table/ColumnResi
 var _becoxyIcons = require("becoxy-icons");
 var _hooks = require("../../../grid-component/hooks");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _antd = require("antd");
 var _rcMasterUi = require("rc-master-ui");
 var _utils2 = require("../../../table-component/hook/utils");
 var _renderFilter = require("../../base-table/renderFilter");
@@ -371,7 +370,7 @@ function columnCustom(opts) {
               justifyContent: 'end',
               width: '100%'
             }
-          }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+          }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
             type: "primary",
             onClick: () => {
               doFilter(true);
@@ -380,7 +379,7 @@ function columnCustom(opts) {
             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: () => {
@@ -567,7 +566,8 @@ function columnCustom(opts) {
               [`${prefix}-grid-cell-text-right`]: col?.textAlign === 'right' || col.type === 'number'
             }),
             onMouseEnter: e => {
-              if (e.target?.clientWidth < e.target?.scrollWidth || e.target.firstChild?.clientWidth < e.target.firstChild?.scrollWidth) {
+              prevCellProps?.onMouseEnter?.(e);
+              if (e.target?.clientWidth < e.target?.scrollWidth || e.target?.firstChild?.clientWidth < e?.target?.firstChild?.scrollWidth) {
                 pipeline.setStateAtKey(stateKeyTooltip, true);
               }
             },

package/lib/ali-table/pipeline/features/pagination.js

@@ -24,7 +24,7 @@ function paginationFeature(opts = {}) {
     pipeline.dataSource(processDataSource(dataSource));
     return pipeline;
     function processDataSource(data) {
-      if (pagination === false || pagination && pagination.onChange) {
+      if (!pagination || pagination && pagination.onChange) {
         return data;
       }
       const currentPage = pagination?.currentPage ?? pipeline.getStateAtKey(stateKey)?.currentPage ?? 1;

package/lib/ali-table/utils/convertColumnsChoose.d.ts

@@ -1,5 +1,5 @@
-import type { TreeDataNode } from "antd";
-import type { ColumnTable } from "../../grid-component";
+import { TreeDataNode } from "rc-master-ui";
+import { ColumnTable } from "../../grid-component";
 export declare function convertColumnsToTreeData(columns: ColumnTable[], groupColumns?: string[], t?: any): TreeDataNode[];
 export declare function filterColumnsByField(columns: ColumnTable[], fieldList: string[]): ColumnTable[];
 export declare function filterVisibleColumns(columns: ColumnTable[]): ColumnTable[];

package/lib/grid-component/control/InputControl/InputControl.js

@@ -8,18 +8,16 @@ 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 _hooks = require("../../hooks");
-var _grid = require("rc-master-ui/es/grid");
 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 {isNullOrUndefined} from "../../../hooks"
 
 const {
   Text
-} = _antd.Typography;
+} = _rcMasterUi.Typography;
 const InputControl = props => {
   const {
     id,
@@ -46,7 +44,7 @@ const InputControl = props => {
     ...rest
   } = props;
   const renderLabel = () => {
-    return /*#__PURE__*/_react.default.createElement(_grid.Col, {
+    return /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
       span: 6
     }, isLabel === false ? '' : /*#__PURE__*/_react.default.createElement("label", {
       className: "form-label"
@@ -111,7 +109,7 @@ const InputControl = props => {
       type: "danger"
     }, errors?.message));
   };
-  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_grid.Row, {
+  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Row, {
     gutter: [4, 4]
     // className={classnames(' align', {
     //   [labelSize ? labelSize : '']: labelSize,
@@ -119,7 +117,7 @@ const InputControl = props => {
     //   'form-row-inline-error': errors
     // }, inLine === false ? 'form-group ' : 'form-row-inline d-flex'
     // )}
-  }, renderLabel(), /*#__PURE__*/_react.default.createElement(_grid.Col, {
+  }, renderLabel(), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
     span: 18,
     className: (0, _classnames.default)('', {
       'hidden-label': isLabel === false

package/lib/grid-component/hooks/calender.d.ts

@@ -0,0 +1,19 @@
+type WeekRow = {
+    sunday: DayCell;
+    monday: DayCell;
+    tuesday: DayCell;
+    wednesday: DayCell;
+    thursday: DayCell;
+    friday: DayCell;
+    saturday: DayCell;
+};
+type DayCell = {
+    date: Date;
+    day: number;
+    isCurrentMonth: boolean;
+    events?: {
+        title: string;
+    }[];
+};
+export declare const generateCalendarRows: (currentMonth: Date) => WeekRow[];
+export {};

package/lib/grid-component/hooks/calender.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateCalendarRows = void 0;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+const DAYS = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+const generateCalendarRows = currentMonth => {
+  const month = (0, _dayjs.default)(currentMonth);
+  const firstDay = month.startOf('month');
+  const lastDay = month.endOf('month');
+
+  // Chủ nhật đầu tiên hiển thị
+  const startDate = firstDay.startOf('week');
+
+  // Thứ 7 cuối cùng hiển thị
+  const endDate = lastDay.endOf('week');
+  const rows = [];
+  let current = startDate;
+  while (current.isBefore(endDate) || current.isSame(endDate, 'day')) {
+    const week = {};
+    for (let i = 0; i < 7; i++) {
+      week[DAYS[i]] = {
+        date: current.toDate(),
+        day: current.date(),
+        isCurrentMonth: current.month() === month.month(),
+        events: []
+      };
+      current = current.add(1, 'day');
+    }
+    rows.push(week);
+  }
+  return rows;
+};
+exports.generateCalendarRows = generateCalendarRows;
+const dataSource = generateCalendarRows(new Date(2026, 0, 1) // January 2026
+);
+console.log('dataSource', dataSource);

package/lib/grid-component/type.d.ts

@@ -305,6 +305,12 @@ export type ColumnTable<RecordType = AnyObject> = {
     /** Column con (multi header/group column) */
     children?: ColumnTable<RecordType>[];
 };
+export type RowDnd<RecordType = AnyObject> = {
+    enabled?: boolean;
+    onChange?: (args: {
+        rows: RecordType[];
+    }) => void;
+};
 export type ColumnsTable<RecordType = AnyObject> = ColumnTable<RecordType>[];
 export type IFTheme = {
     theme?: 'dark' | 'light';
@@ -490,6 +496,7 @@ export type TableProps<RecordType = AnyObject> = {
         /** Virtual theo chiều dọc */
         vertical?: boolean;
     };
+    rowDnd?: RowDnd<RecordType>;
     /** Cho phép chỉnh sửa dữ liệu */
     editAble?: boolean;
     /** Callback khi data thay đổi */
@@ -554,7 +561,11 @@ export type CommandClick<T> = {
     rows: T[];
 };
 export type IEditSelectSettings = {
+    /** @deprecated This prop is deprecated and should use `fieldNames` instead */
     fieldKey?: string;
+    /** @deprecated This prop is deprecated and should use `fieldNames` instead */
+    inputKey?: string;
+    fieldNames?: FieldNames;
     options: any[] | ((rowData: any, field: string) => any[]);
     /**  get value form other field **/
     fieldValue?: string;
@@ -562,12 +573,15 @@ export type IEditSelectSettings = {
     fieldLabel?: string;
     /** cho phép nhập giá trị - onBlur: giá trị search được set thành value **/
     searchTextAsValue?: boolean;
-    inputKey?: string;
     filterKey?: string[];
     selectMode?: SelectMode;
     getPasteValue?: (value: any) => Record<string, any> | null;
     validateOption?: (rowData: any, field: string) => any[];
     defaultOptions?: any[];
+    /**
+       * @deprecated
+       * @since  1.9.25
+       */
     defaultValue?: (value: any, rowData: any) => {
         value: any;
         label: string;
@@ -586,7 +600,6 @@ export type IEditSelectSettings = {
     hideSelectedOptions?: boolean;
     showItems?: number;
     isLengthSelected?: boolean;
-    fieldNames?: FieldNames;
     filterOption?: boolean | FilterFunc<any>;
 };
 export type IEditFromSettings = {

package/lib/group-component/ColumnsChoose.js

@@ -8,8 +8,7 @@ exports.ColumnsChoose = void 0;
 var _useMergedState = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _antd = require("antd");
-var _tree = _interopRequireDefault(require("rc-master-ui/es/tree"));
+var _rcMasterUi = require("rc-master-ui");
 var _SearchOutlined = _interopRequireDefault(require("@ant-design/icons/SearchOutlined"));
 var _utils = require("./hook/utils");
 var _becoxyIcons = require("becoxy-icons");
@@ -131,21 +130,21 @@ const ColumnsChoose = props => {
     setMergedSelectedKeys(defaultSelectedKeys);
     hide();
   };
-  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Popover, {
     placement: 'bottomLeft',
     content: /*#__PURE__*/_react.default.createElement("div", {
       style: {
         minWidth: 250,
         maxWidth: 320
       }
-    }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Input, {
       style: {
         marginBottom: 8
       },
       placeholder: t ? t("Search") : 'Search',
       prefix: /*#__PURE__*/_react.default.createElement(_SearchOutlined.default, null),
       onChange: onChange
-    }), /*#__PURE__*/_react.default.createElement(_tree.default, {
+    }), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Tree, {
       onExpand: onExpand
       // expandedKeys={expandedKeys}
       ,
@@ -193,14 +192,14 @@ const ColumnsChoose = props => {
       // style={{height: 300}}
     }), /*#__PURE__*/_react.default.createElement(BoxAction, {
       className: 'px-1'
-    }, /*#__PURE__*/_react.default.createElement(_antd.Button
+    }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button
     // className={classnames('btn-action btn-action-submit', {
     //   // disable: !columns.find((item) => item.visible !== false || item.visible)
     // })}
     , {
       onClick: handleAccept
       // disabled={!columns.find((item) => item.visible !== false || item.visible)}
-    }, t ? t('OK') : 'OK'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, t ? t('OK') : 'OK'), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
       className: 'btn-action btn-action-cancel',
       onClick: handleCancel
     }, t ? t('Cancel') : 'Cancel'))),

package/lib/group-component/ColumnsGroup/ColumnsGroup.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ColumnsGroup = void 0;
 var _becoxyIcons = require("becoxy-icons");
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
 var _rcMasterUi = require("rc-master-ui");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _hooks = require("../../grid-component/hooks");
@@ -98,7 +97,7 @@ const ColumnsGroup = props => {
       setTempGroup([]);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Popover, {
     placement: 'bottomLeft',
     content: /*#__PURE__*/_react.default.createElement("div", {
       style: {
@@ -206,14 +205,14 @@ const ColumnsGroup = props => {
       filterOption: _hooks.customFilterOption
     }))), /*#__PURE__*/_react.default.createElement(BoxAction, {
       className: 'px-1'
-    }, /*#__PURE__*/_react.default.createElement(_antd.Button
+    }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button
     // className={classnames('btn-action btn-action-submit', {
     //   // disable: !columns.find((item) => item.visible !== false || item.visible)
     // })}
     , {
       onClick: handleGroup
       // disabled={!columns.find((item) => item.visible !== false || item.visible)}
-    }, t ? t('Thực hiện') : 'Thực hiện'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, t ? t('Thực hiện') : 'Thực hiện'), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
       className: 'btn-action btn-action-cancel',
       onClick: handleClear
     }, t ? t('Clear') : 'Clear'))),

package/lib/group-component/TableContainerEdit.js

@@ -16,7 +16,6 @@ var _reactNumericComponent = require("react-numeric-component");
 var _useContext = require("./useContext");
 var _yup = require("@hookform/resolvers/yup");
 var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _becoxyIcons = require("becoxy-icons");
 var _TableWrapper = _interopRequireDefault(require("./table/TableWrapper"));
@@ -36,7 +35,7 @@ const MySwal = (0, _sweetalert2ReactContent.default)(_sweetalert.default);
 const {
   Paragraph,
   Title
-} = _antd.Typography;
+} = _rcMasterUi.Typography;
 const validateData = async (data, formSchema) => {
   if (!formSchema) {
     return [];
@@ -764,7 +763,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',

package/lib/group-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");
@@ -28,7 +27,7 @@ const {
 } = _rcMasterUi.TreeSelect;
 const {
   TextArea
-} = _antd.Input;
+} = _rcMasterUi.Input;
 const filterTreeNode = (input, treeNode) => {
   const {
     title,
@@ -414,7 +413,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, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+              return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Divider, {
                 style: {
                   margin: '8px 0'
                 }
@@ -486,8 +485,9 @@ const EditableCell = props => {
               indexRow,
               type: 'blur'
             });
-          },
-          autoDestroy: true,
+          }
+          // autoDestroy={true}
+          ,
           showSearch: true,
           mode: isMulti || selectMode === 'checkbox' ? 'multiple' : undefined,
           valueSelectAble: true,
@@ -566,8 +566,9 @@ const EditableCell = props => {
               indexRow,
               type: 'blur'
             });
-          },
-          autoDestroy: true,
+          }
+          // autoDestroy={true}
+          ,
           showSearch: true,
           defaultOpen: column.field === startCell?.colId,
           autoFocus: column.field === startCell?.colId,
@@ -849,7 +850,7 @@ const EditableCell = props => {
           green: _colors.green,
           cyan: _colors.cyan
         });
-        return /*#__PURE__*/_react.default.createElement(_antd.ColorPicker, {
+        return /*#__PURE__*/_react.default.createElement(_rcMasterUi.ColorPicker, {
           value: color,
           allowClear: column.isClearable ?? true,
           onChangeComplete: valueColor => {
@@ -873,18 +874,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)))
         });
@@ -934,7 +935,7 @@ const EditableCell = props => {
         }, numericFormatProps, {
           min: column.min,
           max: column.max,
-          customInput: _antd.Input
+          customInput: _rcMasterUi.Input
           // valueIsNumericString={true}
           ,
           placeholder: t && column.placeholder ? t(column.placeholder) : tableLocal?.textPlaceholder,

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

@@ -12,7 +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"));
@@ -306,7 +305,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: []
     },

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

@@ -8,16 +8,14 @@ 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");
 var _utils = require("../../hook/utils");
 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 {
   Text
-} = _antd.Typography;
+} = _rcMasterUi.Typography;
 const InputControl = props => {
   const {
     id,
@@ -44,7 +42,7 @@ const InputControl = props => {
     ...rest
   } = props;
   const renderLabel = () => {
-    return /*#__PURE__*/_react.default.createElement(_grid.Col, {
+    return /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
       span: 6
     }, isLabel === false ? '' : /*#__PURE__*/_react.default.createElement("label", {
       className: "form-label"
@@ -109,7 +107,7 @@ const InputControl = props => {
       type: "danger"
     }, errors?.message));
   };
-  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_grid.Row, {
+  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Row, {
     gutter: [4, 4]
     // className={classnames(' align', {
     //   [labelSize ? labelSize : '']: labelSize,
@@ -117,7 +115,7 @@ const InputControl = props => {
     //   'form-row-inline-error': errors
     // }, inLine === false ? 'form-group ' : 'form-row-inline d-flex'
     // )}
-  }, renderLabel(), /*#__PURE__*/_react.default.createElement(_grid.Col, {
+  }, renderLabel(), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Col, {
     span: 18,
     className: (0, _classnames.default)('', {
       'hidden-label': isLabel === false

package/lib/group-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/group-component/components/checkbox-filter/FilterSearch.d.ts

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

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

@@ -10,8 +10,6 @@ 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 {AnyObject} from "./../grid-component/type"
-
 const FilterSearch = props => {
   const {
     value,

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcMasterUi = require("rc-master-ui");
@@ -167,12 +166,12 @@ const TableHeadCell = props => {
         tableLocal: undefined
         // selectedKeys: (header.column.getFilterValue() ?? []) as string[],
         // setSelectedKeys: header.column.setFilterValue,
-      })), /*#__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)
@@ -183,7 +182,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: () => {