es-grid-template 1.8.66 → 1.8.67

package/es/grid-component/hooks/constant.d.ts

@@ -70,3 +70,4 @@ export declare const booleanToValue: {
     true: number;
     false: number;
 };
+export declare const nonActionColumn: string[];

package/es/grid-component/hooks/constant.js

@@ -236,4 +236,5 @@ export const valueToBoolean = {
 export const booleanToValue = {
   true: 1,
   false: 0
-};
+};
+export const nonActionColumn = ['#', 'command', 'selection_column'];

package/es/table-component/TableContainerEdit.js

@@ -13,7 +13,7 @@ import { TableContext } from "./useContext";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { Toolbar } from "rc-master-ui";
 import classNames from "classnames";
-import { Maximize, Minimize, Plus, Trash2 } from "becoxy-icons";
+import { Maximize, Minimize } from "becoxy-icons";
 import { ColumnsChoose } from "./ColumnsChoose";
 import TableWrapper from "./table/TableWrapper";
 import withReactContent from "sweetalert2-react-content";
@@ -77,7 +77,7 @@ const TableContainerEdit = props => {
     isSelectionChange,
     setIsSelectionChange,
     // onContextMenu,
-    contextMenuItems: propsContext,
+    contextMenuItems,
     setSorterChange,
     setFilterChange,
     onCellPaste,
@@ -117,7 +117,6 @@ const TableContainerEdit = props => {
     contextMenuOpen,
     contextMenuClick,
     contextMenuHidden,
-    showDefaultContext,
     commandSettings,
     isDataTree,
     onCellClick,
@@ -141,123 +140,6 @@ const TableContainerEdit = props => {
 
   // const columnSizingState = table.getState().columnSizing;
 
-  const defaultContext = React.useMemo(() => {
-    return [{
-      key: 'INSERT_BEFORE',
-      // label: 'Thêm dòng bên trên',
-      // label: `${t ? t(locale?.add_rows_before ?? 'Add rows before') : 'Add rows before'}`,
-      label: locale?.add_rows_before ?? 'Add rows before',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_AFTER',
-      label: locale?.add_rows_after ?? 'Add rows after',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_CHILDREN',
-      // label: 'Insert item children',
-      label: locale?.add_children ?? 'Add children',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      })
-      // children: [
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_1',
-      //     label: 'Thêm 1 dòng',
-      //     row: 1
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_10',
-      //     label: 'Thêm 10 dòng',
-      //     row: 10
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_50',
-      //     label: 'Thêm 50 dòng',
-      //     row: 50
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_100',
-      //     label: 'Thêm 100 dòng',
-      //     row: 100
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_ADV',
-      //     label: 'Tùy chỉnh'
-      //   }
-      // ]
-    }, {
-      key: 'DELETE_CONTENT',
-      label: locale?.delete_content ?? 'Delete content',
-      icon: /*#__PURE__*/React.createElement(Trash2, {
-        fontSize: 14
-      })
-    }, {
-      key: 'DELETE_ROWS',
-      label: locale?.delete_rows ?? 'Delete rows',
-      icon: /*#__PURE__*/React.createElement(Trash2, {
-        fontSize: 14
-      })
-    }];
-  }, [locale]);
   const itemsAdd = React.useMemo(() => {
     return [{
       key: '10',
@@ -270,13 +152,6 @@ const TableContainerEdit = props => {
       label: `100 ${t ? t('rows') : 'rows'}`
     }];
   }, [t]);
-  const contextMenuItems = React.useMemo(() => {
-    const a = showDefaultContext !== false ? [...defaultContext] : [];
-    const b = propsContext && propsContext.length > 0 ? [...propsContext, {
-      type: 'divider'
-    }] : [];
-    return [...b, ...a];
-  }, [defaultContext, propsContext, showDefaultContext]);
   const [dataErrors, setDataErrors] = React.useState([]);
   React.useEffect(() => {
     if (validate && dataSource && dataSource.length) {

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

@@ -2,21 +2,14 @@ import { flexRender } from "@tanstack/react-table";
 import Space from "rc-master-ui/es/space";
 import Command from "../components/command/Command";
 import ReactDOMServer from 'react-dom/server';
-import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData,
-// getCellsByPosition,
-getColIdsBetween, getCommonPinningStyles, getEditType, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
-// import { nonActionColumn } from "../hook/constant";
+import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData, getColIdsBetween, getCommonPinningStyles, getEditType, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
 import classNames from "classnames";
-// import type { Dispatch, SetStateAction } from "react";
-
 import React from "react";
 import { TableContext } from "../useContext";
 import EditableCell from "./EditableCell";
-import { nonActionColumn } from "../hook/constant";
+import { nonActionColumn } from "../../grid-component/hooks";
 import { toggleRowSelection } from "../hook/useColumns";
-// import { nonActionColumn } from "../hook/constant";
-
 const renderCellIndex = props => {
   const {
     parrents,

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

@@ -1,23 +1,14 @@
-// import { useSortable } from "@dnd-kit/sortable"
-
 import { flexRender } from '@tanstack/react-table';
 import React, { useContext } from 'react';
-// import { CSS } from '@dnd-kit/utilities'
-// import type { Virtualizer } from '@tanstack/react-virtual'
 import { Button, Space } from 'antd';
 import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
 import classNames from 'classnames';
 import { Checkbox, Dropdown, Select } from 'rc-master-ui';
-import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../hook/constant";
+import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../../grid-component/hooks";
 import { extendsObject, getCommonPinningStyles, getDefaultOperator, getTypeFilter } from "../hook/utils";
 import { TableContext } from "../useContext";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
-
-// import { ColumnTable } from "../type";
-
-// import { Tooltip } from 'react-tooltip'
-
 const TableHeadCell = props => {
   const {
     header,

package/es/table-component/header/TableHeadCell2.js

@@ -4,11 +4,11 @@ import { Button, Space } from 'antd';
 import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
 import classNames from 'classnames';
 import { Checkbox, Dropdown, Select } from 'rc-master-ui';
-import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../hook/constant";
 import { excludeItems, extendsObject, getCommonPinningStyles, getDefaultOperator, getTypeFilter, removeDuplicatesByKey } from "../hook/utils";
 import { TableContext } from "../useContext";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
+import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../../grid-component/hooks";
 const TableHeadCell2 = props => {
   const {
     column,

package/es/table-component/type.d.ts

@@ -2,9 +2,9 @@ import type { CheckboxProps, TablePaginationConfig } from 'rc-master-ui';
 import type { ItemType } from 'rc-master-ui/es/menu/interface';
 import type { Cell, Header, OnChangeFn, Row } from '@tanstack/react-table';
 import type { ReactElement, ReactNode } from 'react';
-import type { IOperator } from './hook/constant';
 import type { ColorPickerProps } from 'antd';
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
+import type { IOperator } from '../grid-component/hooks';
 declare module "@tanstack/table-core" {
     interface ColumnMeta<any, any> extends ColumnTable {
         rowSpan?: number;

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

@@ -70,3 +70,4 @@ export declare const booleanToValue: {
     true: number;
     false: number;
 };
+export declare const nonActionColumn: string[];

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.valueToBoolean = exports.translateOption = exports.transferFontSize = exports.stringOperator = exports.paperSize = exports.optionsSize = exports.optionsPaperOrientation = exports.optionFontSize = exports.optionFont = exports.numberOperator = exports.defaultWidth = exports.defaultTimeFormat = exports.defaultRowHeight = exports.defaultPageSizes = exports.defaultDateTimeFormat = exports.defaultDateFormat = exports.default = exports.dateTimeOperator = exports.dateOperator = exports.booleanToValue = exports.booleanOperator = exports.alignToFlex = void 0;
+exports.valueToBoolean = exports.translateOption = exports.transferFontSize = exports.stringOperator = exports.paperSize = exports.optionsSize = exports.optionsPaperOrientation = exports.optionFontSize = exports.optionFont = exports.numberOperator = exports.nonActionColumn = exports.defaultWidth = exports.defaultTimeFormat = exports.defaultRowHeight = exports.defaultPageSizes = exports.defaultDateTimeFormat = exports.defaultDateFormat = exports.default = exports.dateTimeOperator = exports.dateOperator = exports.booleanToValue = exports.booleanOperator = exports.alignToFlex = void 0;
 const defaultWidth = exports.defaultWidth = 100;
 const defaultRowHeight = exports.defaultRowHeight = 35;
 const numberOperator = exports.numberOperator = [{
@@ -243,4 +243,5 @@ const valueToBoolean = exports.valueToBoolean = {
 const booleanToValue = exports.booleanToValue = {
   true: 1,
   false: 0
-};
+};
+const nonActionColumn = exports.nonActionColumn = ['#', 'command', 'selection_column'];

package/lib/table-component/TableContainerEdit.js

@@ -84,7 +84,7 @@ const TableContainerEdit = props => {
     isSelectionChange,
     setIsSelectionChange,
     // onContextMenu,
-    contextMenuItems: propsContext,
+    contextMenuItems,
     setSorterChange,
     setFilterChange,
     onCellPaste,
@@ -124,7 +124,6 @@ const TableContainerEdit = props => {
     contextMenuOpen,
     contextMenuClick,
     contextMenuHidden,
-    showDefaultContext,
     commandSettings,
     isDataTree,
     onCellClick,
@@ -148,123 +147,6 @@ const TableContainerEdit = props => {
 
   // const columnSizingState = table.getState().columnSizing;
 
-  const defaultContext = _react.default.useMemo(() => {
-    return [{
-      key: 'INSERT_BEFORE',
-      // label: 'Thêm dòng bên trên',
-      // label: `${t ? t(locale?.add_rows_before ?? 'Add rows before') : 'Add rows before'}`,
-      label: locale?.add_rows_before ?? 'Add rows before',
-      icon: /*#__PURE__*/_react.default.createElement(_becoxyIcons.Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_AFTER',
-      label: locale?.add_rows_after ?? 'Add rows after',
-      icon: /*#__PURE__*/_react.default.createElement(_becoxyIcons.Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_CHILDREN',
-      // label: 'Insert item children',
-      label: locale?.add_children ?? 'Add children',
-      icon: /*#__PURE__*/_react.default.createElement(_becoxyIcons.Plus, {
-        fontSize: 14
-      })
-      // children: [
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_1',
-      //     label: 'Thêm 1 dòng',
-      //     row: 1
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_10',
-      //     label: 'Thêm 10 dòng',
-      //     row: 10
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_50',
-      //     label: 'Thêm 50 dòng',
-      //     row: 50
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_100',
-      //     label: 'Thêm 100 dòng',
-      //     row: 100
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_ADV',
-      //     label: 'Tùy chỉnh'
-      //   }
-      // ]
-    }, {
-      key: 'DELETE_CONTENT',
-      label: locale?.delete_content ?? 'Delete content',
-      icon: /*#__PURE__*/_react.default.createElement(_becoxyIcons.Trash2, {
-        fontSize: 14
-      })
-    }, {
-      key: 'DELETE_ROWS',
-      label: locale?.delete_rows ?? 'Delete rows',
-      icon: /*#__PURE__*/_react.default.createElement(_becoxyIcons.Trash2, {
-        fontSize: 14
-      })
-    }];
-  }, [locale]);
   const itemsAdd = _react.default.useMemo(() => {
     return [{
       key: '10',
@@ -277,13 +159,6 @@ const TableContainerEdit = props => {
       label: `100 ${t ? t('rows') : 'rows'}`
     }];
   }, [t]);
-  const contextMenuItems = _react.default.useMemo(() => {
-    const a = showDefaultContext !== false ? [...defaultContext] : [];
-    const b = propsContext && propsContext.length > 0 ? [...propsContext, {
-      type: 'divider'
-    }] : [];
-    return [...b, ...a];
-  }, [defaultContext, propsContext, showDefaultContext]);
   const [dataErrors, setDataErrors] = _react.default.useState([]);
   _react.default.useEffect(() => {
     if (validate && dataSource && dataSource.length) {

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

@@ -15,14 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
 var _useContext = require("../useContext");
 var _EditableCell = _interopRequireDefault(require("./EditableCell"));
-var _constant = require("../hook/constant");
+var _hooks = require("../../grid-component/hooks");
 var _useColumns = require("../hook/useColumns");
-// import { nonActionColumn } from "../hook/constant";
-
-// import type { Dispatch, SetStateAction } from "react";
-
-// import { nonActionColumn } from "../hook/constant";
-
 const renderCellIndex = props => {
   const {
     parrents,
@@ -646,7 +640,7 @@ const TableBodyCellEdit = props => {
     if (e.key === 'ArrowRight') {
       e.preventDefault();
       e.stopPropagation();
-      const allCols = table.getVisibleLeafColumns().filter(it => !_constant.nonActionColumn.includes(it.id));
+      const allCols = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
       const nextCol = allCols[currentColIndex + 1];
       if (nextCol) {
@@ -677,7 +671,7 @@ const TableBodyCellEdit = props => {
     }
     if (e.key === 'ArrowLeft') {
       e.preventDefault();
-      const allCols = table.getVisibleLeafColumns().filter(it => !_constant.nonActionColumn.includes(it.id));
+      const allCols = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
 
       // const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
@@ -825,7 +819,7 @@ const TableBodyCellEdit = props => {
   }
   const handleMouseDownIndex = rowId => {
     setIsSelecting?.(true);
-    const allColumns = table.getVisibleLeafColumns().filter(it => !_constant.nonActionColumn.includes(it.id));
+    const allColumns = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
     const firstCOl = (0, _utils.findFirst)(allColumns);
     const startCol = allColumns[0].id;
     const endCol = allColumns[allColumns.length - 1].id;
@@ -853,7 +847,7 @@ const TableBodyCellEdit = props => {
   };
   const handleMouseEnterIndex = rowId => {
     if (isSelecting) {
-      const allColumns = table.getVisibleLeafColumns().filter(it => !_constant.nonActionColumn.includes(it.id));
+      const allColumns = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
 
       // const firstCOl = findFirst(allColumns)
 

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

@@ -11,22 +11,13 @@ var _antd = require("antd");
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcMasterUi = require("rc-master-ui");
-var _constant = require("../hook/constant");
+var _hooks = require("../../grid-component/hooks");
 var _utils = require("../hook/utils");
 var _useContext = require("../useContext");
 var _renderFilter = require("./renderFilter");
 var _server = _interopRequireDefault(require("react-dom/server"));
 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 { useSortable } from "@dnd-kit/sortable"
-
-// import { CSS } from '@dnd-kit/utilities'
-// import type { Virtualizer } from '@tanstack/react-virtual'
-
-// import { ColumnTable } from "../type";
-
-// import { Tooltip } from 'react-tooltip'
-
 const TableHeadCell = props => {
   const {
     header,
@@ -149,7 +140,7 @@ const TableHeadCell = props => {
     dropdownRender: () => {
       const type = (0, _utils.getTypeFilter)(originalColumn);
       const operatorValue = header.column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(originalColumn);
-      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _constant.booleanOperator : !type || type === 'Text' ? _constant.stringOperator : _constant.numberOperator;
+      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _hooks.booleanOperator : !type || type === 'Text' ? _hooks.stringOperator : _hooks.numberOperator;
       return /*#__PURE__*/_react.default.createElement("div", {
         // className='ui-rc-table-filter-dropdown'
 
@@ -163,7 +154,7 @@ const TableHeadCell = props => {
       }, /*#__PURE__*/_react.default.createElement("div", null), column.meta?.showOperator !== false && column.meta?.typeFilter !== 'DateRange' && column.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
         className: 'mb-1'
       }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
-        options: (0, _constant.translateOption)(operatorOptions, t),
+        options: (0, _hooks.translateOption)(operatorOptions, t),
         style: {
           width: '100%',
           marginBottom: 8
@@ -271,7 +262,7 @@ const TableHeadCell = props => {
       [`${prefix}-grid-cell-ellipsis`]: !wrapSettings || !(wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')),
       [`${prefix}-grid-cell-text-wrap`]: wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')
     })
-  }, cellContent)), !_constant.nonActionColumn.includes(header.column.id) && header.subHeaders.length < 2 && /*#__PURE__*/_react.default.createElement("span", {
+  }, cellContent)), !_hooks.nonActionColumn.includes(header.column.id) && header.subHeaders.length < 2 && /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-header-trigger"
   }, header.column.getCanSort() && /*#__PURE__*/_react.default.createElement("div", {
     style: {

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

@@ -11,11 +11,11 @@ var _antd = require("antd");
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcMasterUi = require("rc-master-ui");
-var _constant = require("../hook/constant");
 var _utils = require("../hook/utils");
 var _useContext = require("../useContext");
 var _renderFilter = require("./renderFilter");
 var _server = _interopRequireDefault(require("react-dom/server"));
+var _hooks = require("../../grid-component/hooks");
 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 TableHeadCell2 = props => {
@@ -133,7 +133,7 @@ const TableHeadCell2 = props => {
     dropdownRender: () => {
       const type = (0, _utils.getTypeFilter)(originalColumn);
       const operatorValue = column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(originalColumn);
-      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _constant.booleanOperator : !type || type === 'Text' ? _constant.stringOperator : _constant.numberOperator;
+      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _hooks.booleanOperator : !type || type === 'Text' ? _hooks.stringOperator : _hooks.numberOperator;
       return /*#__PURE__*/_react.default.createElement("div", {
         // className='ui-rc-table-filter-dropdown'
 
@@ -147,7 +147,7 @@ const TableHeadCell2 = props => {
       }, /*#__PURE__*/_react.default.createElement("div", null), column.columnDef?.meta?.showOperator !== false && column.columnDef?.meta?.typeFilter !== 'DateRange' && column.columnDef?.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
         className: 'mb-1'
       }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
-        options: (0, _constant.translateOption)(operatorOptions, t),
+        options: (0, _hooks.translateOption)(operatorOptions, t),
         style: {
           width: '100%',
           marginBottom: 8
@@ -266,7 +266,7 @@ const TableHeadCell2 = props => {
       [`${prefix}-grid-cell-ellipsis`]: !wrapSettings || !(wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')),
       [`${prefix}-grid-cell-text-wrap`]: wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')
     })
-  }, cellContent)), !_constant.nonActionColumn.includes(column.id) && column.columns.length < 1 && /*#__PURE__*/_react.default.createElement("span", {
+  }, cellContent)), !_hooks.nonActionColumn.includes(column.id) && column.columns.length < 1 && /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-header-trigger"
   }, column.getCanSort() && /*#__PURE__*/_react.default.createElement("div", {
     style: {

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

@@ -2,9 +2,9 @@ import type { CheckboxProps, TablePaginationConfig } from 'rc-master-ui';
 import type { ItemType } from 'rc-master-ui/es/menu/interface';
 import type { Cell, Header, OnChangeFn, Row } from '@tanstack/react-table';
 import type { ReactElement, ReactNode } from 'react';
-import type { IOperator } from './hook/constant';
 import type { ColorPickerProps } from 'antd';
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
+import type { IOperator } from '../grid-component/hooks';
 declare module "@tanstack/table-core" {
     interface ColumnMeta<any, any> extends ColumnTable {
         rowSpan?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.66",
+  "version": "1.8.67",
   "description": "es-grid-template",
   "keywords": [
     "react",

package/es/table-component/hook/constant.d.ts

@@ -1,73 +0,0 @@
-export declare const defaultWidth: number;
-export declare const defaultRowHeight: number;
-export type IOperator = {
-    value: string;
-    label: string;
-    key: string;
-};
-export declare const numberOperator: IOperator[];
-export declare const stringOperator: IOperator[];
-export declare const dateOperator: IOperator[];
-export declare const dateTimeOperator: IOperator[];
-export declare const booleanOperator: IOperator[];
-export declare const translateOption: (options: IOperator[], t: any) => any[];
-export declare const transferFontSize: any;
-export declare const defaultDateFormat = "d/m/Y";
-export declare const defaultDateTimeFormat = "d/m/Y H:i";
-export declare const defaultTimeFormat = "H:i";
-export declare const defaultPageSizes: number[];
-export declare const alignToFlex: any;
-export declare const optionsSize: {
-    label: string;
-    value: string;
-    width: number;
-    height: number;
-}[];
-export declare const paperSize: {
-    a4: {
-        width: number;
-        height: number;
-    };
-    a3: {
-        width: number;
-        height: number;
-    };
-    letter: {
-        width: number;
-        height: number;
-    };
-};
-export declare const optionFont: {
-    value: string;
-    label: string;
-}[];
-export declare const optionsPaperOrientation: any[];
-export declare const optionFontSize: {
-    value: number;
-    label: string;
-}[];
-/**
- * Sort order for BaseTable
- */
-declare const SortOrder: {
-    /**
-     * Sort data in ascending order
-     */
-    ascend: string;
-    /**
-     * Sort data in descending order
-     */
-    descend: string;
-};
-export default SortOrder;
-export declare const valueToBoolean: {
-    true: boolean;
-    false: boolean;
-    1: boolean;
-    0: boolean;
-};
-export declare const booleanToValue: {
-    true: number;
-    false: number;
-};
-export declare const nonActionColumn: string[];

package/es/table-component/hook/constant.js

@@ -1,240 +0,0 @@
-export const defaultWidth = 100;
-export const defaultRowHeight = 35;
-export const numberOperator = [{
-  value: 'equal',
-  label: 'Equal',
-  key: '=='
-}, {
-  value: 'greaterthan',
-  label: 'Greater than',
-  key: '>'
-}, {
-  value: 'greaterthanorequal',
-  label: 'Greater than or equal',
-  key: '>='
-}, {
-  value: 'lessthan',
-  label: 'Less than',
-  key: '<'
-}, {
-  value: 'lessthanorequal',
-  label: 'Less than or equal',
-  key: '<='
-}, {
-  value: 'notequal',
-  label: 'Not equal',
-  key: '!='
-}];
-export const stringOperator = [{
-  value: 'startswith',
-  key: '_=',
-  label: 'Starts with'
-}, {
-  value: 'endswith',
-  key: '|=',
-  label: 'Ends with'
-}, {
-  value: 'contains',
-  key: '~=',
-  label: 'Contains'
-}, {
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}];
-export const dateOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}, {
-  value: 'greaterthan',
-  key: '>',
-  label: 'Greater than'
-}, {
-  value: 'lessthan',
-  key: '<',
-  label: 'Less than'
-}];
-export const dateTimeOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}, {
-  value: 'greaterthan',
-  key: '>',
-  label: 'Greater than'
-}, {
-  value: 'lessthan',
-  key: '<',
-  label: 'Less than'
-}];
-export const booleanOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}];
-export const translateOption = (options, t) => {
-  if (!t) {
-    return options;
-  }
-  return options.map(it => ({
-    ...it,
-    label: t(it.label)
-  }));
-};
-export const transferFontSize = {
-  6: 8,
-  7: 9,
-  8: 11,
-  9: 12,
-  10: 13,
-  11: 15,
-  12: 16,
-  13: 17,
-  14: 19,
-  15: 20,
-  16: 21,
-  17: 23,
-  18: 24,
-  19: 25,
-  20: 27,
-  21: 28,
-  22: 29,
-  24: 32,
-  26: 35,
-  27: 36,
-  28: 37
-};
-export const defaultDateFormat = 'd/m/Y';
-export const defaultDateTimeFormat = 'd/m/Y H:i';
-export const defaultTimeFormat = 'H:i';
-export const defaultPageSizes = [20, 30, 50, 100];
-export const alignToFlex = {
-  center: 'center',
-  left: 'start',
-  right: 'end'
-};
-export const optionsSize = [{
-  label: 'letter',
-  value: 'letter',
-  width: 21.59,
-  height: 27.94
-}, {
-  label: 'A3',
-  value: 'a3',
-  width: 27.94,
-  height: 42
-}, {
-  label: 'A4',
-  value: 'a4',
-  width: 21,
-  height: 29.7
-}];
-export const paperSize = {
-  a4: {
-    width: 21,
-    height: 29.7
-  },
-  a3: {
-    width: 27.94,
-    height: 42
-  },
-  letter: {
-    width: 21.59,
-    height: 27.94
-  }
-};
-export const optionFont = [{
-  value: 'Times New Roman',
-  label: 'Times New Roman'
-}, {
-  value: 'Calibri',
-  label: 'Calibri (Body)'
-}];
-// portrait' | 'landscape'
-export const optionsPaperOrientation = [{
-  value: 'portrait',
-  label: 'portrait'
-}, {
-  value: 'landscape',
-  label: 'landscape'
-}];
-export const optionFontSize = [{
-  value: 8,
-  label: '8'
-}, {
-  value: 9,
-  label: '9'
-}, {
-  value: 10,
-  label: '10'
-}, {
-  value: 11,
-  label: '11'
-}, {
-  value: 12,
-  label: '12'
-}, {
-  value: 13,
-  label: '13'
-}, {
-  value: 14,
-  label: '14'
-}, {
-  value: 16,
-  label: '16'
-}, {
-  value: 18,
-  label: '18'
-}, {
-  value: 24,
-  label: '24'
-}, {
-  value: 36,
-  label: '36'
-}, {
-  value: 48,
-  label: '48'
-}];
-
-/**
- * Sort order for BaseTable
- */
-const SortOrder = {
-  /**
-   * Sort data in ascending order
-   */
-  ascend: 'Ascending',
-  /**
-   * Sort data in descending order
-   */
-  descend: 'Descending'
-};
-export default SortOrder;
-export const valueToBoolean = {
-  true: true,
-  false: false,
-  1: true,
-  0: false
-};
-export const booleanToValue = {
-  true: 1,
-  false: 0
-};
-export const nonActionColumn = ['#', 'command', 'selection_column'];

package/lib/table-component/hook/constant.d.ts

@@ -1,73 +0,0 @@
-export declare const defaultWidth: number;
-export declare const defaultRowHeight: number;
-export type IOperator = {
-    value: string;
-    label: string;
-    key: string;
-};
-export declare const numberOperator: IOperator[];
-export declare const stringOperator: IOperator[];
-export declare const dateOperator: IOperator[];
-export declare const dateTimeOperator: IOperator[];
-export declare const booleanOperator: IOperator[];
-export declare const translateOption: (options: IOperator[], t: any) => any[];
-export declare const transferFontSize: any;
-export declare const defaultDateFormat = "d/m/Y";
-export declare const defaultDateTimeFormat = "d/m/Y H:i";
-export declare const defaultTimeFormat = "H:i";
-export declare const defaultPageSizes: number[];
-export declare const alignToFlex: any;
-export declare const optionsSize: {
-    label: string;
-    value: string;
-    width: number;
-    height: number;
-}[];
-export declare const paperSize: {
-    a4: {
-        width: number;
-        height: number;
-    };
-    a3: {
-        width: number;
-        height: number;
-    };
-    letter: {
-        width: number;
-        height: number;
-    };
-};
-export declare const optionFont: {
-    value: string;
-    label: string;
-}[];
-export declare const optionsPaperOrientation: any[];
-export declare const optionFontSize: {
-    value: number;
-    label: string;
-}[];
-/**
- * Sort order for BaseTable
- */
-declare const SortOrder: {
-    /**
-     * Sort data in ascending order
-     */
-    ascend: string;
-    /**
-     * Sort data in descending order
-     */
-    descend: string;
-};
-export default SortOrder;
-export declare const valueToBoolean: {
-    true: boolean;
-    false: boolean;
-    1: boolean;
-    0: boolean;
-};
-export declare const booleanToValue: {
-    true: number;
-    false: number;
-};
-export declare const nonActionColumn: string[];

package/lib/table-component/hook/constant.js

@@ -1,247 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.valueToBoolean = exports.translateOption = exports.transferFontSize = exports.stringOperator = exports.paperSize = exports.optionsSize = exports.optionsPaperOrientation = exports.optionFontSize = exports.optionFont = exports.numberOperator = exports.nonActionColumn = exports.defaultWidth = exports.defaultTimeFormat = exports.defaultRowHeight = exports.defaultPageSizes = exports.defaultDateTimeFormat = exports.defaultDateFormat = exports.default = exports.dateTimeOperator = exports.dateOperator = exports.booleanToValue = exports.booleanOperator = exports.alignToFlex = void 0;
-const defaultWidth = exports.defaultWidth = 100;
-const defaultRowHeight = exports.defaultRowHeight = 35;
-const numberOperator = exports.numberOperator = [{
-  value: 'equal',
-  label: 'Equal',
-  key: '=='
-}, {
-  value: 'greaterthan',
-  label: 'Greater than',
-  key: '>'
-}, {
-  value: 'greaterthanorequal',
-  label: 'Greater than or equal',
-  key: '>='
-}, {
-  value: 'lessthan',
-  label: 'Less than',
-  key: '<'
-}, {
-  value: 'lessthanorequal',
-  label: 'Less than or equal',
-  key: '<='
-}, {
-  value: 'notequal',
-  label: 'Not equal',
-  key: '!='
-}];
-const stringOperator = exports.stringOperator = [{
-  value: 'startswith',
-  key: '_=',
-  label: 'Starts with'
-}, {
-  value: 'endswith',
-  key: '|=',
-  label: 'Ends with'
-}, {
-  value: 'contains',
-  key: '~=',
-  label: 'Contains'
-}, {
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}];
-const dateOperator = exports.dateOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}, {
-  value: 'greaterthan',
-  key: '>',
-  label: 'Greater than'
-}, {
-  value: 'lessthan',
-  key: '<',
-  label: 'Less than'
-}];
-const dateTimeOperator = exports.dateTimeOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}, {
-  value: 'greaterthan',
-  key: '>',
-  label: 'Greater than'
-}, {
-  value: 'lessthan',
-  key: '<',
-  label: 'Less than'
-}];
-const booleanOperator = exports.booleanOperator = [{
-  value: 'equal',
-  key: '==',
-  label: 'Equal'
-}, {
-  value: 'notequal',
-  key: '!=',
-  label: 'Not equal'
-}];
-const translateOption = (options, t) => {
-  if (!t) {
-    return options;
-  }
-  return options.map(it => ({
-    ...it,
-    label: t(it.label)
-  }));
-};
-exports.translateOption = translateOption;
-const transferFontSize = exports.transferFontSize = {
-  6: 8,
-  7: 9,
-  8: 11,
-  9: 12,
-  10: 13,
-  11: 15,
-  12: 16,
-  13: 17,
-  14: 19,
-  15: 20,
-  16: 21,
-  17: 23,
-  18: 24,
-  19: 25,
-  20: 27,
-  21: 28,
-  22: 29,
-  24: 32,
-  26: 35,
-  27: 36,
-  28: 37
-};
-const defaultDateFormat = exports.defaultDateFormat = 'd/m/Y';
-const defaultDateTimeFormat = exports.defaultDateTimeFormat = 'd/m/Y H:i';
-const defaultTimeFormat = exports.defaultTimeFormat = 'H:i';
-const defaultPageSizes = exports.defaultPageSizes = [20, 30, 50, 100];
-const alignToFlex = exports.alignToFlex = {
-  center: 'center',
-  left: 'start',
-  right: 'end'
-};
-const optionsSize = exports.optionsSize = [{
-  label: 'letter',
-  value: 'letter',
-  width: 21.59,
-  height: 27.94
-}, {
-  label: 'A3',
-  value: 'a3',
-  width: 27.94,
-  height: 42
-}, {
-  label: 'A4',
-  value: 'a4',
-  width: 21,
-  height: 29.7
-}];
-const paperSize = exports.paperSize = {
-  a4: {
-    width: 21,
-    height: 29.7
-  },
-  a3: {
-    width: 27.94,
-    height: 42
-  },
-  letter: {
-    width: 21.59,
-    height: 27.94
-  }
-};
-const optionFont = exports.optionFont = [{
-  value: 'Times New Roman',
-  label: 'Times New Roman'
-}, {
-  value: 'Calibri',
-  label: 'Calibri (Body)'
-}];
-// portrait' | 'landscape'
-const optionsPaperOrientation = exports.optionsPaperOrientation = [{
-  value: 'portrait',
-  label: 'portrait'
-}, {
-  value: 'landscape',
-  label: 'landscape'
-}];
-const optionFontSize = exports.optionFontSize = [{
-  value: 8,
-  label: '8'
-}, {
-  value: 9,
-  label: '9'
-}, {
-  value: 10,
-  label: '10'
-}, {
-  value: 11,
-  label: '11'
-}, {
-  value: 12,
-  label: '12'
-}, {
-  value: 13,
-  label: '13'
-}, {
-  value: 14,
-  label: '14'
-}, {
-  value: 16,
-  label: '16'
-}, {
-  value: 18,
-  label: '18'
-}, {
-  value: 24,
-  label: '24'
-}, {
-  value: 36,
-  label: '36'
-}, {
-  value: 48,
-  label: '48'
-}];
-
-/**
- * Sort order for BaseTable
- */
-const SortOrder = {
-  /**
-   * Sort data in ascending order
-   */
-  ascend: 'Ascending',
-  /**
-   * Sort data in descending order
-   */
-  descend: 'Descending'
-};
-var _default = exports.default = SortOrder;
-const valueToBoolean = exports.valueToBoolean = {
-  true: true,
-  false: false,
-  1: true,
-  0: false
-};
-const booleanToValue = exports.booleanToValue = {
-  true: 1,
-  false: 0
-};
-const nonActionColumn = exports.nonActionColumn = ['#', 'command', 'selection_column'];