es-grid-template 1.7.45 → 1.7.46

package/es/grid-component/ContextMenu.d.ts

@@ -1,5 +1,6 @@
-import * as React from 'react';
-import type { ContextInfo, ContextMenuItem } from './type';
+import * as React from "react";
+import type { ContextInfo } from "./type";
+import type { ContextMenuItem } from "./type";
 export declare const findItemByKey: (array: any[], key: string, value: any) => any;
 type Props<RecordType> = {
     rowData: RecordType | null;

package/es/grid-component/ContextMenu.js

@@ -1,6 +1,6 @@
-import * as React from 'react';
+import * as React from "react";
 // import type { MenuProps } from "antd";
-import { Dropdown, Menu } from 'antd';
+import { Dropdown, Menu } from "antd";
 export const findItemByKey = (array, key, value) => {
   for (let i = 0; i < array.length; i++) {
     const item = array[i];

package/es/grid-component/InternalTable.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import 'react-resizable/css/styles.css';
-import type { GridTableProps } from './type';
+import type { GridTableProps } from "./type";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import './styles.scss';

package/es/grid-component/InternalTable.js

@@ -1,45 +1,45 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import customParseFormat from 'dayjs/plugin/customParseFormat';
 import React, { createContext, Fragment, useCallback, useContext, useState } from 'react';
 import 'react-resizable/css/styles.css';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
 import { addRowIdArray, booleanOperator, convertFilters, convertFlatColumn, filterDataByColumns4, findItemByKey, findItemPath, flattenArray, getAllRowKey, getFormat, getTypeFilter, groupArrayByColumns, isNullOrUndefined, numberOperator, removeColumns, removeInvisibleColumns, stringOperator, translateOption, unFlattenData, updateArrayByKey, updateColumnsByGroup,
 // updateData,
 updateOrInsert } from "./hooks";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
-import en from 'rc-master-ui/es/date-picker/locale/en_US';
-import vi from 'rc-master-ui/es/date-picker/locale/vi_VN';
-import Grid from "./table/Grid";
 import GridEdit from "./table/GridEdit";
-import enDr from 'rc-master-ui/es/locales/en_US';
-import viDr from 'rc-master-ui/es/locales/vi_VN';
+import Grid from "./table/Grid";
+import en from "rc-master-ui/es/date-picker/locale/en_US";
+import vi from "rc-master-ui/es/date-picker/locale/vi_VN";
+import enDr from "rc-master-ui/es/locales/en_US";
+import viDr from "rc-master-ui/es/locales/vi_VN";
 // import useColumns from "./hooks/useColumns";
 
 import "./styles.scss";
 // import 'rc-master-ui/es/date-range-picker/styles/index.less'
 // import 'rc-master-ui/assets/index.css'
 
-import { SearchOutlined } from '@ant-design/icons';
-import { closestCenter, DndContext, DragOverlay, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
-import { restrictToHorizontalAxis } from '@dnd-kit/modifiers';
-import { arrayMove, horizontalListSortingStrategy, SortableContext, useSortable } from '@dnd-kit/sortable';
-import { Button, Space } from 'antd';
-import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
-import classNames from 'classnames';
-import { Select } from 'rc-master-ui';
-import { Tooltip } from 'react-tooltip';
-import Swal from 'sweetalert2';
-import withReactContent from 'sweetalert2-react-content';
 import { flatColumns2, renderContent, renderFilter } from "./hooks/columns";
-import HeaderContent from "./hooks/content/HeaderContent";
 import Group from "./table/Group";
+import Swal from "sweetalert2";
+import withReactContent from "sweetalert2-react-content";
+import { Tooltip } from "react-tooltip";
+import classNames from "classnames";
+import HeaderContent from "./hooks/content/HeaderContent";
+import { ArrowDown, ArrowUp, FilterFill, SortCancel } from "becoxy-icons";
+import { Select } from "rc-master-ui";
+import { Button, Space } from "antd";
+import { SearchOutlined } from "@ant-design/icons";
+import { restrictToHorizontalAxis } from "@dnd-kit/modifiers";
+import { closestCenter, DndContext, DragOverlay, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
+import { arrayMove, horizontalListSortingStrategy, SortableContext, useSortable } from "@dnd-kit/sortable";
 // import {CSS} from "@dnd-kit/utilities";
-import { faker } from '@faker-js/faker';
-import Modal from 'antd/es/modal/Modal';
-import useMergedState from "rc-util/es/hooks/useMergedState";
-import { Resizable } from 'react-resizable';
+import { Resizable } from "react-resizable";
+import { faker } from "@faker-js/faker";
 import InfiniteTable from "./table/InfiniteTable";
+import useMergedState from "rc-util/es/hooks/useMergedState";
+import Modal from 'antd/es/modal/Modal';
 dayjs.extend(customParseFormat);
 const MySwal = withReactContent(Swal);
 const ASCEND = 'ascend';
@@ -213,9 +213,9 @@ const InternalTable = props => {
     const handleWindowResize = () => {
       setWindowSize(getWindowSize());
     };
-    window.addEventListener('resize', handleWindowResize);
+    window.addEventListener("resize", handleWindowResize);
     return () => {
-      window.removeEventListener('resize', handleWindowResize);
+      window.removeEventListener("resize", handleWindowResize);
     };
   }, []);
   const [scrollHeight, setHeight] = useState(0);
@@ -401,7 +401,7 @@ const InternalTable = props => {
           // handleSearch()
           // close()
         }
-      }, t ? t('Clear') : 'Clear')));
+      }, t ? t("Clear") : 'Clear')));
     },
     filterIcon: filtered => /*#__PURE__*/React.createElement(FilterFill, {
       fontSize: 12
@@ -441,7 +441,8 @@ const InternalTable = props => {
           id: id,
           wrapSettings: wrapSettings
         })),
-        ellipsis: editAble || column.ellipsis !== false && wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
+        // ellipsis: editAble || column.ellipsis !== false && wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
+        ellipsis: column.ellipsis !== false || wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
         // ellipsis: column.ellipsis !== false,
 
         align: column.textAlign ?? column.align,
@@ -586,7 +587,7 @@ const InternalTable = props => {
             if (currentGroupColumn?.template) {
               return renderContent(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat);
             }
-            return /*#__PURE__*/React.createElement("span", null, currentGroupColumn?.headerText, ":", ' ', renderContent(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat));
+            return /*#__PURE__*/React.createElement("span", null, currentGroupColumn?.headerText, ": ", renderContent(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat));
           }
           return renderContent(column, value, record, rowIndex, colIndex, false, cellFormat);
         },
@@ -658,7 +659,7 @@ const InternalTable = props => {
     if (tableRef.current && type === 'columnChoose') {
       tableRef.current.scrollTo({
         left: 0.1,
-        behavior: 'smooth'
+        behavior: "smooth"
       });
     }
     onChooseColumns?.({
@@ -699,11 +700,17 @@ const InternalTable = props => {
     setColumns(updateColumnsByGroup(mergedColumns, groupedColumns));
     if (groupSetting) {
       if (groupSetting.client === false) {
+
         // setIsTree(true)
+
         // setGroupOpen([])
+
         // const dt = ungroupArray(dataSource)
+
         // const rs = groupArrayByColumns2(dt, [...value])
+
         // setResource([...rs])
+
         // if (groupSetting.onGroup) {
         //   groupSetting.onGroup({
         //     columnGrouped: value,
@@ -952,6 +959,7 @@ const InternalTable = props => {
     } : {
       y: scrollHeight - (summary ? 1 : 1)
     } // scroll height auto, không quá  600
+
     // height={isFullScreen ? windowSize.innerHeight - 100 : propsHeight}
     ,
     height: propsHeight,
@@ -1001,10 +1009,10 @@ const InternalTable = props => {
     style: {
       maxWidth: '100%',
       height: '100%'
-    }
-    // onClose={() => setIsFullScreen(false)}
-    ,
+    },
+    onClose: () => setIsFullScreen(false),
     onCancel: () => setIsFullScreen(false)
+
     // destroyOnClose
     ,
     styles: {
@@ -1066,6 +1074,7 @@ const InternalTable = props => {
       y: scrollHeight1 - (summary ? 1 : 1)
     } // scroll height auto, không quá  600
     ,
+
     height: windowSize.innerHeight - 35,
     scrollHeight: scrollHeight1,
     components: {

package/es/grid-component/hooks/content/TooltipContent.d.ts

@@ -1,5 +1,4 @@
-import type { ReactElement, ReactNode } from "react";
-import React from "react";
+import React, { ReactElement, ReactNode } from "react";
 type Props = {
     t?: any;
     content?: any;

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

@@ -15,5 +15,7 @@ interface UseColumnsConfig<RecordType> {
     rowKey?: any;
     onMouseHover?: any;
 }
-declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [any];
+declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
+    any
+];
 export default useColumns;

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

@@ -205,6 +205,7 @@ export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<Re
     dataSource: RecordType[];
     columns: ColumnsTable<RecordType>;
     height?: number;
+    minHeight?: number;
     format?: IFormat;
     t?: any;
     lang?: string;

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

@@ -1,5 +1,6 @@
-import * as React from 'react';
-import type { ContextInfo, ContextMenuItem } from './type';
+import * as React from "react";
+import type { ContextInfo } from "./type";
+import type { ContextMenuItem } from "./type";
 export declare const findItemByKey: (array: any[], key: string, value: any) => any;
 type Props<RecordType> = {
     rowData: RecordType | null;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import 'react-resizable/css/styles.css';
-import type { GridTableProps } from './type';
+import type { GridTableProps } from "./type";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import './styles.scss';

package/lib/grid-component/InternalTable.js

@@ -6,39 +6,39 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.SELECTION_COLUMN = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _react = _interopRequireWildcard(require("react"));
 require("react-resizable/css/styles.css");
+var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _hooks = require("./hooks");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("dayjs/locale/es");
 require("dayjs/locale/vi");
+var _GridEdit = _interopRequireDefault(require("./table/GridEdit"));
+var _Grid = _interopRequireDefault(require("./table/Grid"));
 var _en_US = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/en_US"));
 var _vi_VN = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/vi_VN"));
-var _Grid = _interopRequireDefault(require("./table/Grid"));
-var _GridEdit = _interopRequireDefault(require("./table/GridEdit"));
 var _en_US2 = _interopRequireDefault(require("rc-master-ui/es/locales/en_US"));
 var _vi_VN2 = _interopRequireDefault(require("rc-master-ui/es/locales/vi_VN"));
 require("./styles.scss");
-var _icons = require("@ant-design/icons");
-var _core = require("@dnd-kit/core");
-var _modifiers = require("@dnd-kit/modifiers");
-var _sortable = require("@dnd-kit/sortable");
-var _antd = require("antd");
-var _becoxyIcons = require("becoxy-icons");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _rcMasterUi = require("rc-master-ui");
-var _reactTooltip = require("react-tooltip");
+var _columns = require("./hooks/columns");
+var _Group = _interopRequireDefault(require("./table/Group"));
 var _sweetalert = _interopRequireDefault(require("sweetalert2"));
 var _sweetalert2ReactContent = _interopRequireDefault(require("sweetalert2-react-content"));
-var _columns = require("./hooks/columns");
+var _reactTooltip = require("react-tooltip");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _HeaderContent = _interopRequireDefault(require("./hooks/content/HeaderContent"));
-var _Group = _interopRequireDefault(require("./table/Group"));
-var _faker = require("@faker-js/faker");
-var _Modal = _interopRequireDefault(require("antd/es/modal/Modal"));
-var _useMergedState = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
+var _becoxyIcons = require("becoxy-icons");
+var _rcMasterUi = require("rc-master-ui");
+var _antd = require("antd");
+var _icons = require("@ant-design/icons");
+var _modifiers = require("@dnd-kit/modifiers");
+var _core = require("@dnd-kit/core");
+var _sortable = require("@dnd-kit/sortable");
 var _reactResizable = require("react-resizable");
+var _faker = require("@faker-js/faker");
 var _InfiniteTable = _interopRequireDefault(require("./table/InfiniteTable"));
+var _useMergedState = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
+var _Modal = _interopRequireDefault(require("antd/es/modal/Modal"));
 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 useColumns from "./hooks/useColumns";
@@ -221,9 +221,9 @@ const InternalTable = props => {
     const handleWindowResize = () => {
       setWindowSize(getWindowSize());
     };
-    window.addEventListener('resize', handleWindowResize);
+    window.addEventListener("resize", handleWindowResize);
     return () => {
-      window.removeEventListener('resize', handleWindowResize);
+      window.removeEventListener("resize", handleWindowResize);
     };
   }, []);
   const [scrollHeight, setHeight] = (0, _react.useState)(0);
@@ -409,7 +409,7 @@ const InternalTable = props => {
           // handleSearch()
           // close()
         }
-      }, t ? t('Clear') : 'Clear')));
+      }, t ? t("Clear") : 'Clear')));
     },
     filterIcon: filtered => /*#__PURE__*/_react.default.createElement(_becoxyIcons.FilterFill, {
       fontSize: 12
@@ -449,7 +449,8 @@ const InternalTable = props => {
           id: id,
           wrapSettings: wrapSettings
         })),
-        ellipsis: editAble || column.ellipsis !== false && wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
+        // ellipsis: editAble || column.ellipsis !== false && wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
+        ellipsis: column.ellipsis !== false || wrapSettings && wrapSettings.wrapMode !== 'Content' && wrapSettings.wrapMode !== 'Both',
         // ellipsis: column.ellipsis !== false,
 
         align: column.textAlign ?? column.align,
@@ -594,7 +595,7 @@ const InternalTable = props => {
             if (currentGroupColumn?.template) {
               return (0, _columns.renderContent)(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat);
             }
-            return /*#__PURE__*/_react.default.createElement("span", null, currentGroupColumn?.headerText, ":", ' ', (0, _columns.renderContent)(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat));
+            return /*#__PURE__*/_react.default.createElement("span", null, currentGroupColumn?.headerText, ": ", (0, _columns.renderContent)(currentGroupColumn, record[record.field], record, rowIndex, colIndex, false, cellFormat));
           }
           return (0, _columns.renderContent)(column, value, record, rowIndex, colIndex, false, cellFormat);
         },
@@ -666,7 +667,7 @@ const InternalTable = props => {
     if (tableRef.current && type === 'columnChoose') {
       tableRef.current.scrollTo({
         left: 0.1,
-        behavior: 'smooth'
+        behavior: "smooth"
       });
     }
     onChooseColumns?.({
@@ -707,11 +708,17 @@ const InternalTable = props => {
     setColumns((0, _hooks.updateColumnsByGroup)(mergedColumns, groupedColumns));
     if (groupSetting) {
       if (groupSetting.client === false) {
+
         // setIsTree(true)
+
         // setGroupOpen([])
+
         // const dt = ungroupArray(dataSource)
+
         // const rs = groupArrayByColumns2(dt, [...value])
+
         // setResource([...rs])
+
         // if (groupSetting.onGroup) {
         //   groupSetting.onGroup({
         //     columnGrouped: value,
@@ -960,6 +967,7 @@ const InternalTable = props => {
     } : {
       y: scrollHeight - (summary ? 1 : 1)
     } // scroll height auto, không quá  600
+
     // height={isFullScreen ? windowSize.innerHeight - 100 : propsHeight}
     ,
     height: propsHeight,
@@ -1009,10 +1017,10 @@ const InternalTable = props => {
     style: {
       maxWidth: '100%',
       height: '100%'
-    }
-    // onClose={() => setIsFullScreen(false)}
-    ,
+    },
+    onClose: () => setIsFullScreen(false),
     onCancel: () => setIsFullScreen(false)
+
     // destroyOnClose
     ,
     styles: {
@@ -1074,6 +1082,7 @@ const InternalTable = props => {
       y: scrollHeight1 - (summary ? 1 : 1)
     } // scroll height auto, không quá  600
     ,
+
     height: windowSize.innerHeight - 35,
     scrollHeight: scrollHeight1,
     components: {

package/lib/grid-component/hooks/content/TooltipContent.d.ts

@@ -1,5 +1,4 @@
-import type { ReactElement, ReactNode } from "react";
-import React from "react";
+import React, { ReactElement, ReactNode } from "react";
 type Props = {
     t?: any;
     content?: any;

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

@@ -205,6 +205,7 @@ export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<Re
     dataSource: RecordType[];
     columns: ColumnsTable<RecordType>;
     height?: number;
+    minHeight?: number;
     format?: IFormat;
     t?: any;
     lang?: string;

package/package.json

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