es-grid-template 1.1.7 → 1.1.8

package/es/grid-component/InternalTable.js

@@ -5,11 +5,9 @@ import { Button, Space } from "antd";
 import { SearchOutlined } from "@ant-design/icons";
 import { Resizable } from "react-resizable";
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import {
-// findAllChildrenKeys,
-numberOperator, translateOption, updateArrayByKey } from "./hooks";
+import { booleanOperator, getTypeFilter, numberOperator, stringOperator, translateOption, updateArrayByKey } from "./hooks";
 import { FilterFill } from "becoxy-icons";
-import { renderContent, renderFilter } from "./hooks/useColumns";
+import { flatColumns2, renderContent, renderFilter } from "./hooks/useColumns";
 import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
@@ -82,8 +80,6 @@ const InternalTable = props => {
   //   },
   // );
 
-  // console.log('mergedColumns', mergedColumns)
-
   const tableRef = useRef(null);
   const [data, setData] = useState([]);
   const [columns, setColumns] = useState([]);
@@ -147,13 +143,17 @@ const InternalTable = props => {
       setSelectedKeys,
       selectedKeys,
       confirm,
-      close,
+      // close,
       setOperatorKey,
       operatorKey,
       visible,
       searchValue,
       setSearchValue
     }) => {
+      const type = getTypeFilter(column);
+      // const operatorOptions  = !type || type === 'Text' ? stringOperator : numberOperator
+      // const operatorOptions  = type === 'Checkbox' || type === 'Dropdown' || type === 'DropTree' || ty
+      const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? booleanOperator : !type || type === 'Text' ? stringOperator : numberOperator;
       return /*#__PURE__*/React.createElement("div", {
         style: {
           padding: 8,
@@ -163,7 +163,7 @@ const InternalTable = props => {
       }, column?.showOperator !== false && column?.typeFilter !== 'DateRange' && column?.typeFilter !== 'NumberRange' && /*#__PURE__*/React.createElement("div", {
         className: 'mb-1'
       }, /*#__PURE__*/React.createElement(Select, {
-        options: translateOption(numberOperator, t),
+        options: translateOption(operatorOptions, t),
         style: {
           width: '100%',
           marginBottom: 8
@@ -194,13 +194,17 @@ const InternalTable = props => {
         style: {
           width: 90
         }
-      }, "Filter"), /*#__PURE__*/React.createElement(Button, {
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/React.createElement(Button, {
         type: "link",
         size: "small",
         onClick: () => {
-          close();
+          // setSearchValue('')
+          setSelectedKeys([]);
+          confirm();
+          // handleSearch()
+          // close()
         }
-      }, "close")));
+      }, t ? t("Clear") : 'Clear')));
     },
     filterIcon: filtered => /*#__PURE__*/React.createElement(FilterFill, {
       fontSize: 12,
@@ -219,117 +223,96 @@ const InternalTable = props => {
       }
     }
   }), [buddhistLocale, dataSourceFilter, onFilterCallback, onFilterClick, t]);
-  const handleResize = indexPath => (e, {
+  const handleResize = column => (e, {
     size
   }) => {
-    const updateColumns = (cols, path) => {
-      const [currentIndex, ...restPath] = path;
-      return cols.map((col, idx) => {
-        if (idx === currentIndex) {
-          if (restPath.length === 0) {
-            // Cập nhật width của cột cuối cùng trong path
-            // return { ...col, width: size.width }
-
-            // Kiểm tra minWidth trước khi cập nhật width
-            if (col.minWidth && size.width < col.minWidth) {
-              e.preventDefault();
-              return col; // Không cập nhật nếu nhỏ hơn minWidth
-            }
-
-            // Kiểm tra minWidth trước khi cập nhật width
-            if (col.maxWidth && size.width > col.maxWidth) {
-              e.preventDefault();
-              return col; // Không cập nhật nếu nhỏ hơn minWidth
-            }
-            return {
-              ...col,
-              width: size.width
-            };
-          } else if (col.children) {
-            // Tiếp tục cập nhật các cấp con
-            return {
-              ...col,
-              children: updateColumns(col.children, restPath)
-            };
-          }
-        }
-        // e.preventDefault()
-        return col;
-      });
+    const newColumn = {
+      ...column,
+      width: size.width
     };
-    setColumns(prevColumns => updateColumns(prevColumns, indexPath));
+    const newColumns = updateArrayByKey(columns, newColumn, 'field');
+    setColumns(newColumns);
   };
-  const transformColumns = React.useCallback((cols, parentPath = []) => {
-    return cols.map((col, index) => {
-      const currentPath = [...parentPath, index];
-      // @ts-ignore
-      if (!col?.dataIndex && !col.key && !col.field) {
-        return col;
-      }
-      const transformedColumn = {
-        ...col,
-        dataIndex: col.field ?? col.dataIndex,
-        key: col.field ?? col.dataIndex ?? col.key,
-        title: t ? t(col.headerText ?? col.title) : col.headerText ?? col.title,
-        ellipsis: col.ellipsis !== false,
-        align: col.textAlign ?? col.align,
-        fixed: col.frozen ? col.frozen.toLowerCase() : col.fixed
+  const convertColumns = flatColumns2(columns).map((column, colIndex) => {
+    if (!column?.dataIndex && !column.key && !column.field) {
+      return column;
+    }
+    const transformedColumn = {
+      ...column,
+      dataIndex: column.field ?? column.dataIndex,
+      key: column.field ?? column.dataIndex ?? column.key,
+      title: t ? t(column.headerText ?? column.title) : column.headerText ?? column.title,
+      ellipsis: column.ellipsis !== false,
+      align: column.textAlign ?? column.align,
+      fixed: column.frozen ? column.frozen.toLowerCase() : column.fixed
+    };
+
+    // @ts-ignore
+    if (["index", "#"].includes(transformedColumn.dataIndex)) {
+      return {
+        ...transformedColumn,
+        onCell: () => ({
+          className: 'cell-number'
+        }),
+        render: (_, __, rowIndex) => rowIndex + 1
       };
-      if (col.children) {
-        return {
-          ...transformedColumn,
-          children: transformColumns(col.children, currentPath)
-        };
+    }
+    if (column.field === 'command') {
+      return {
+        ...transformedColumn,
+        onCell: () => ({
+          className: column.field === 'command' ? "ui-rc-cell-command" : ''
+        }),
+        onHeaderCell: () => ({
+          width: column.width,
+          onResize: handleResize(column)
+        })
+      };
+    }
+    return {
+      ...(column.allowFiltering === false ? {} : {
+        ...getColumnSearchProps(column)
+      }),
+      ...transformedColumn,
+      onFilter: value => {
+        return value;
+      },
+      sorter: column.sorter === false ? undefined : {
+        compare: a => a,
+        multiple: sortMultiple ? colIndex : undefined
+      },
+      onHeaderCell: () => ({
+        width: column.width,
+        onResize: handleResize(column)
+      }),
+      render: (value, record, rowIndex) => renderContent(column, value, record, rowIndex, format)
+    };
+  });
+  const transformColumns = React.useCallback(cols => {
+    // @ts-ignore
+    return cols.map(column => {
+      const find = convertColumns.find(it => it.key === column.field);
+      if (!column?.field && !column?.key) {
+        return column;
       }
-
-      // @ts-ignore
-      if (["index", "#"].includes(transformedColumn.dataIndex)) {
+      if (find) {
         return {
-          ...transformedColumn,
-          onCell: () => ({
-            className: 'cell-number'
-          }),
-          render: (_, __, rowIndex) => rowIndex + 1
+          ...find
         };
       }
-      if (col.field === 'command') {
+
+      // Xử lý đệ quy cho children
+      if (column.children?.length) {
         return {
-          ...transformedColumn,
-          onCell: () => ({
-            className: col.field === 'command' ? "ui-rc-cell-command" : ''
-          }),
-          onHeaderCell: () => ({
-            width: col.width,
-            onResize: handleResize(currentPath)
-          })
+          ...column,
+          children: transformColumns(column.children)
         };
       }
-      return {
-        ...(col.allowFiltering === false ? {} : {
-          ...getColumnSearchProps(col)
-        }),
-        ...transformedColumn,
-        onFilter: value => {
-          return value;
-        },
-        sorter: col.sorter === false ? undefined : {
-          compare: a => a,
-          multiple: sortMultiple ? index : undefined
-        },
-        onHeaderCell: () => ({
-          width: col.width,
-          onResize: handleResize(currentPath)
-        }),
-        render: (value, record, rowIndex) => renderContent(col, value, record, rowIndex, format)
-      };
     });
-  }, [getColumnSearchProps]);
+  }, [convertColumns]);
   const mergedColumns = React.useMemo(() => {
     return transformColumns(columns);
   }, [transformColumns, columns]);
-
-  // console.log('mergedColumns', mergedColumns)
-
   const triggerChangeColumns = newColumns => {
     setColumns(newColumns);
   };

package/es/grid-component/TableGrid.js

@@ -90,6 +90,7 @@ const TableGrid = props => {
     dataSource,
     locale,
     expandable,
+    rowHoverable,
     // mergedData,
     title,
     format,
@@ -328,7 +329,7 @@ const TableGrid = props => {
     virtual: virtual,
     columns: columns,
     rowKey: rowKey,
-    rowHoverable: true,
+    rowHoverable: rowHoverable,
     size: "small",
     scroll: scroll ? scroll : {
       y: 500
@@ -350,7 +351,9 @@ const TableGrid = props => {
       selectedRowKeys: mergedSelectedKeys,
       defaultSelectedRowKeys: selectionSettings?.defaultSelectedRowKeys,
       preserveSelectedRowKeys: true,
-      ...rowSelection,
+      // ...rowSelection,
+      // checkStrictly: false,
+
       hideSelectAll: !type || type === 'single' || selectionSettings?.mode === 'radio' ? true : hideSelectAll ?? type !== 'multiple'
     },
     onScroll: () => {
@@ -445,7 +448,7 @@ const TableGrid = props => {
         } = args;
 
         // @ts-ignore
-        if (record?.children && record?.children?.length > 0 || record?.isChildren) {
+        if (record?.children?.length > 0 || record?.isChildren) {
           return expanded ? /*#__PURE__*/React.createElement("button", {
             onClick: e => {
               e.preventDefault();

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

@@ -10,29 +10,29 @@ export const numberOperator = [{
   key: '>'
 }, {
   value: 'greaterthanorequal',
-  label: 'Greater Than or Equal',
+  label: 'Greater than or equal',
   key: '>='
 }, {
   value: 'lessthan',
-  label: 'Less Than',
+  label: 'Less than',
   key: '<'
 }, {
   value: 'lessthanorequal',
-  label: 'Less Than Or Equal',
+  label: 'Less than or equal',
   key: '<='
 }, {
   value: 'notequal',
-  label: 'Not Equal',
+  label: 'Not equal',
   key: '!='
 }];
 export const stringOperator = [{
   value: 'startswith',
   key: '_=',
-  label: 'Starts With'
+  label: 'Starts with'
 }, {
   value: 'endswith',
   key: '|=',
-  label: 'Ends With'
+  label: 'Ends with'
 }, {
   value: 'contains',
   key: '~=',
@@ -44,7 +44,7 @@ export const stringOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }];
 export const dateOperator = [{
   value: 'equal',
@@ -53,15 +53,15 @@ export const dateOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }, {
   value: 'greaterthan',
   key: '>',
-  label: 'Greater Than'
+  label: 'Greater than'
 }, {
   value: 'lessthan',
   key: '<',
-  label: 'Less Than'
+  label: 'Less than'
 }];
 export const dateTimeOperator = [{
   value: 'equal',
@@ -70,15 +70,15 @@ export const dateTimeOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }, {
   value: 'greaterthan',
   key: '>',
-  label: 'Greater Than'
+  label: 'Greater than'
 }, {
   value: 'lessthan',
   key: '<',
-  label: 'Less Than'
+  label: 'Less than'
 }];
 export const booleanOperator = [{
   value: 'equal',
@@ -87,7 +87,7 @@ export const booleanOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }];
 export const translateOption = (options, t) => {
   if (!t) {

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

@@ -1,7 +1,9 @@
-import type { ColumnsType, ColumnType, IFormat } from "../../type";
+import type { ColumnType, IFormat } from "../../type";
 import React from "react";
-import { TableLocale } from "rc-master-ui/lib/table/interface";
-export declare function flatColumns<RecordType>(columns: ColumnsType<RecordType>, parentKey?: string): ColumnType<RecordType>[];
+import type { TableLocale } from "rc-master-ui/lib/table/interface";
+import type { ColumnsTable } from "../../type";
+export declare function flatColumns<RecordType>(columns: ColumnsTable<RecordType>, parentKey?: string): ColumnsTable<RecordType>;
+export declare function flatColumns2<RecordType>(columns: ColumnsTable<RecordType>, parentKey?: string): ColumnsTable<RecordType>;
 export declare const getValueCell: <T>(column: ColumnType<T>, value: any, format?: IFormat) => any;
 export declare const renderContent: <RecordType>(column: ColumnType<RecordType>, value: any, record: RecordType, index: number, format?: IFormat) => React.JSX.Element;
 export declare const renderFilter: <RecordType>(column: ColumnType<RecordType>, selectedKeys: string[], setSelectedKeys: any, confirm: any, visible: boolean, searchValue: string, setSearchValue: any, dataSourceFilter: any[], buddhistLocale: any, locale?: TableLocale, t?: any) => React.JSX.Element;

package/es/grid-component/hooks/useColumns/index.js

@@ -7,7 +7,7 @@ import moment from "moment/moment";
 import React, { Fragment } from "react";
 import { DatePicker, Empty, Input, Select } from "rc-master-ui";
 import CheckboxFilter from "../../CheckboxFilter";
-// import {ColorPicker} from "antd";
+import { SELECTION_COLUMN } from "rc-master-ui/es/table/hooks/useSelection";
 const {
   RangePicker
 } = DatePicker;
@@ -34,6 +34,34 @@ export function flatColumns(columns, parentKey = 'key') {
     }];
   }, []);
 }
+export function flatColumns2(columns, parentKey = 'key') {
+  // @ts-ignore
+  return columns.reduce((list, column, index) => {
+    const {
+      fixed
+    } = column;
+    // Convert `fixed='true'` to `fixed='left'` instead
+    const parsedFixed = fixed === true ? 'left' : fixed;
+    const mergedKey = `${parentKey}-${index}`;
+    const subColumns = column.children;
+    if (column === SELECTION_COLUMN) {
+      return [...list, {
+        ...column
+      }];
+    }
+    if (subColumns && subColumns.length > 0) {
+      return [...list, ...flatColumns(subColumns, mergedKey).map(subColum => ({
+        fixed: parsedFixed,
+        ...subColum
+      }))];
+    }
+    return [...list, {
+      key: mergedKey,
+      ...column,
+      fixed: parsedFixed
+    }];
+  }, []);
+}
 export const getValueCell = (column, value, format) => {
   switch (column?.type) {
     case 'number':

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

@@ -24,7 +24,7 @@ export declare const customWeekStartEndFormat: (value: any, weekFormat: string)
 export declare const getTypeFilter: (col: ColumnTable<any>) => TypeFilter;
 export declare const updateArrayByKey: (arr: any[], element: any, key: string) => any[];
 export declare const getDateString: <T>(column: ColumnTable<T>, value: any) => string;
-export declare const getEditType: <T>(column: ColumnEditType<T>, rowData?: any) => EditType | ((rowData?: any) => EditType);
+export declare const getEditType: <T>(column: ColumnEditType<T>, rowData?: any) => EditType;
 export declare const isDisable: <T>(column: ColumnEditType<T>, rowData?: any) => boolean;
 export declare const checkFieldKey: (key: string | undefined) => string;
 export declare const convertLabelToTitle: (data: any[]) => any[];

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

@@ -222,7 +222,7 @@ export const getEditType = (column, rowData) => {
   if (column && typeof column.editType === 'function') {
     return column.editType(rowData);
   }
-  return column.editType;
+  return column.editType ?? 'text';
 };
 export const isDisable = (column, rowData) => {
   if (column && typeof column?.disable === 'function') {