es-grid-template 1.2.0 → 1.2.2

package/es/grid-component/InternalTable.js

@@ -1,24 +1,29 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { Select, Table } from "rc-master-ui";
-import { Button, Space } from "antd";
-import { SearchOutlined } from "@ant-design/icons";
+import React from 'react';
 import { Resizable } from "react-resizable";
+import 'react-resizable/css/styles.css';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { booleanOperator, getTypeFilter, numberOperator, stringOperator, translateOption, updateArrayByKey } from "./hooks";
-import { FilterFill } from "becoxy-icons";
-import { flatColumns2, renderContent, renderFilter } from "./hooks/useColumns";
+import { addRowIdArray,
+// convertFlatColumn,
+removeColumns,
+// addRowIdArray,
+updateArrayByKey, updateColumnsByGroup, updateData } from "./hooks";
 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 "./styles.scss";
 import GridEdit from "./table/GridEdit";
 import Grid from "./table/Grid";
-// import useMergedState from "rc-util/lib/hooks/useMergedState";
-
+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 useColumns from "./hooks/useColumns";
+import "./styles.scss";
+import { flatColumns2 } from "./hooks/columns";
+import Group from "./table/Group";
 dayjs.extend(customParseFormat);
+
+// const ASCEND = 'ascend';
+// const DESCEND = 'descend';
+
 const ResizableTitle = props => {
   const {
     onResize,
@@ -35,7 +40,7 @@ const ResizableTitle = props => {
       width: width,
       height: 0,
       handle: /*#__PURE__*/React.createElement("span", {
-        className: "react-resizable-handle",
+        className: "rc-resizable-handle",
         onClick: e => {
           e.stopPropagation();
         }
@@ -50,6 +55,7 @@ const ResizableTitle = props => {
 const InternalTable = props => {
   const {
     t,
+    // columns,
     columns: propsColumns,
     lang,
     locale,
@@ -58,13 +64,24 @@ const InternalTable = props => {
     dataSourceFilter: propDataSourceFilter,
     onFilterClick,
     editAble,
-    rowKey,
+    rowKey: propRowKey,
     format,
     onDataChange,
     sortMultiple,
-    expandable,
+    // expandable,
+    // @ts-ignore
+    onCellPaste,
+    clickHeaderToSort = true,
+    components,
+    onChooseColumns,
+    groupAble,
+    groupSetting,
+    groupColumns,
     ...rest
   } = props;
+  const rowKey = React.useMemo(() => {
+    return editAble ? 'rowId' : propRowKey ?? 'id';
+  }, [editAble, propRowKey]);
   const local = lang && lang === 'en' ? en : vi;
   const buddhistLocale = {
     ...local,
@@ -72,157 +89,28 @@ const InternalTable = props => {
       ...local.lang
     }
   };
-
-  // const [mergedColumns, setMergedColumns] = useMergedState(
-  //   propsColumns,
-  //   {
-  //     value: propsColumns,
-  //   },
-  // );
-
-  const tableRef = useRef(null);
-  const [data, setData] = useState([]);
-  const [columns, setColumns] = useState([]);
-  const [isManualUpdate, setIsManualUpdate] = useState(false);
-  // const [expandKeys, setExpandKeys] = useState<string[]>([]);
-  const [dataSourceFilter, setDataSourceFilter] = useState(propDataSourceFilter ?? []);
-  useEffect(() => {
-    const rs = propsColumns && propsColumns.length > 0 ? [Table.SELECTION_COLUMN, ...propsColumns] : [];
-    // const  rs = propsColumns ? [...propsColumns] : []
-    setColumns(rs);
+  const mergerdData = React.useMemo(() => {
+    return addRowIdArray(dataSource);
+  }, [dataSource]);
+  const [columns, setColumns] = React.useState([]);
+  const tableRef = React.useRef(null);
+  React.useEffect(() => {
+    setColumns(propsColumns);
   }, [propsColumns]);
-  useEffect(() => {
-    if (!isManualUpdate) {
-      setData(dataSource || []);
-    }
-    setIsManualUpdate(false);
-  }, [dataSource, isManualUpdate]);
 
-  // const [columns, setColumns] = useMergedState(
-  //   propsColumns ? [Table.SELECTION_COLUMN, ...propsColumns] : [],
-  //   {
-  //     value: propsColumns ? [Table.SELECTION_COLUMN, ...propsColumns] : [],
-  //   },
-  // );
+  // const [data, setData] = useState<RecordType[]>([]);
 
-  // ============================ RowKey ============================
-  const getRowKey = React.useMemo(() => {
-    if (typeof rowKey === 'function') {
-      return rowKey;
-    }
-    // @ts-ignore
-    return record => record?.[rowKey];
-  }, [rowKey]);
+  // const [isManualUpdate, setIsManualUpdate] = useState(false);
 
   // useEffect(() => {
-  //   const rrr = findAllChildrenKeys<any>(dataSource, getRowKey, 'children');
-  //   setExpandKeys(rrr as any)
-  // }, [dataSource, getRowKey])
+  //   if (!isManualUpdate) {
+  //     const mergedData = addRowIdArray(dataSource)
+  //
+  //     setData(mergedData || []);
+  //   }
+  //   setIsManualUpdate(false);
+  // }, [dataSource, isManualUpdate])
 
-  const handleSearch = (selectedKeys, confirm) => {
-    confirm();
-  };
-  const onFilterCallback = (key, filterDataCallback) => {
-    const find = dataSourceFilter.find(it => it.key === key);
-    if (find) {
-      const newData = updateArrayByKey(dataSourceFilter, {
-        key,
-        data: filterDataCallback
-      }, 'key');
-      setDataSourceFilter(newData);
-    } else {
-      const newData = [...dataSourceFilter, {
-        key,
-        data: filterDataCallback
-      }];
-      setDataSourceFilter(newData);
-    }
-  };
-  const getColumnSearchProps = useCallback(column => ({
-    filterDropdown: ({
-      setSelectedKeys,
-      selectedKeys,
-      confirm,
-      // 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,
-          minWidth: 275
-        },
-        onKeyDown: e => e.stopPropagation()
-      }, column?.showOperator !== false && column?.typeFilter !== 'DateRange' && column?.typeFilter !== 'NumberRange' && /*#__PURE__*/React.createElement("div", {
-        className: 'mb-1'
-      }, /*#__PURE__*/React.createElement(Select, {
-        options: translateOption(operatorOptions, t),
-        style: {
-          width: '100%',
-          marginBottom: 8
-        },
-        value: operatorKey,
-        onChange: val => {
-          setOperatorKey(val);
-        }
-      })), /*#__PURE__*/React.createElement("div", {
-        style: {
-          marginBottom: 8
-        }
-      }, renderFilter(column, selectedKeys, setSelectedKeys, confirm, visible, searchValue, setSearchValue, dataSourceFilter, buddhistLocale, locale, t)), /*#__PURE__*/React.createElement(Space, {
-        style: {
-          justifyContent: 'end',
-          width: '100%'
-        }
-      }, /*#__PURE__*/React.createElement(Button, {
-        type: "primary",
-        onClick: () => {
-          confirm({
-            closeDropdown: false
-          });
-          handleSearch(selectedKeys, confirm);
-        },
-        icon: /*#__PURE__*/React.createElement(SearchOutlined, null),
-        size: "small",
-        style: {
-          width: 90
-        }
-      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/React.createElement(Button, {
-        type: "link",
-        size: "small",
-        onClick: () => {
-          // setSearchValue('')
-          setSelectedKeys([]);
-          confirm();
-          // handleSearch()
-          // close()
-        }
-      }, t ? t("Clear") : 'Clear')));
-    },
-    filterIcon: filtered => /*#__PURE__*/React.createElement(FilterFill, {
-      fontSize: 12,
-      onClick: () => {
-        onFilterClick?.(column, onFilterCallback);
-      },
-      style: {
-        color: filtered ? '#283046' : undefined
-      }
-    }),
-    filterDropdownProps: {
-      onOpenChange(open) {
-        if (open) {
-          // setTimeout(() => searchInput.current?.select(), 100)
-        }
-      }
-    }
-  }), [buddhistLocale, dataSourceFilter, onFilterCallback, onFilterClick, t]);
   const handleResize = column => (e, {
     size
   }) => {
@@ -233,123 +121,136 @@ const InternalTable = props => {
     const newColumns = updateArrayByKey(columns, newColumn, 'field');
     setColumns(newColumns);
   };
-  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
-    };
+  const [transformSelectionColumns] = useColumns({
+    locale,
+    t,
+    buddhistLocale,
+    dataSourceFilter: propDataSourceFilter,
+    format,
+    sortMultiple,
+    groupAble,
+    groupSetting,
+    groupColumns,
+    handleResize
+  });
+  const mergedColumns = React.useMemo(() => {
+    return transformSelectionColumns(columns);
+  }, [columns, transformSelectionColumns]);
 
-    // @ts-ignore
-    if (["index", "#"].includes(transformedColumn.dataIndex)) {
-      return {
-        ...transformedColumn,
-        onCell: () => ({
-          className: 'cell-number'
-        }),
-        render: (_, __, rowIndex) => rowIndex + 1
-      };
-    }
-    if (column.field === 'command') {
-      return {
-        ...transformedColumn,
-        onCell: () => ({
-          className: column.field === 'command' ? "ui-rc-cell-command" : ''
-        }),
-        onHeaderCell: () => ({
-          width: column.width,
-          onResize: handleResize(column)
-        })
-      };
+  // ============================ RowKey ============================
+  const getRowKey = React.useMemo(() => {
+    if (typeof rowKey === 'function') {
+      return rowKey;
     }
-    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;
-      }
-      if (find) {
-        return {
-          ...find
-        };
-      }
+    return record => record?.[rowKey];
+  }, [rowKey]);
 
-      // Xử lý đệ quy cho children
-      if (column.children?.length) {
-        return {
-          ...column,
-          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,
-          children: transformColumns(column.children)
-        };
-      }
-    });
-  }, [convertColumns]);
-  const mergedColumns = React.useMemo(() => {
-    return transformColumns(columns);
-  }, [transformColumns, columns]);
+  // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
   const triggerChangeColumns = newColumns => {
     setColumns(newColumns);
+    onChooseColumns?.({
+      showColumns: [],
+      columns: [],
+      flattenColumns: []
+    });
+  };
+  const triggerGroupColumns = groupedColumns => {
+    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,
+        //     columns: removeColumns(columns as any, value),
+        //     flattenColumns: convertFlatColumn(removeColumns(columns as any, value)) as any
+        //
+        //   })
+        // }
+      } else {
+        if (groupSetting.onGroup) {
+          groupSetting.onGroup({
+            columnGrouped: groupedColumns,
+            columns: removeColumns(columns, groupedColumns),
+            flattenColumns: flatColumns2(removeColumns(columns, groupedColumns))
+          });
+        }
+      }
+    }
   };
   const triggerChangeData = newData => {
-    setIsManualUpdate(true);
-    setData(newData);
+    // setIsManualUpdate(true)
+    // setData(newData)
     // setMergedData(newData)
     onDataChange?.(newData);
   };
-  const TableComponent = editAble ? GridEdit : Grid;
+  const triggerPaste = (pastedRows, pastedColumnsArray, newData) => {
+    const handlePasteCallback = callbackData => {
+      const newDataUpdate = updateData(dataSource, callbackData, rowKey);
+      triggerChangeData(newDataUpdate);
+      onCellPaste?.dataChange?.(newDataUpdate);
+    };
+    if (onCellPaste && onCellPaste.onPasted) {
+      if (onCellPaste.onPasted.length > 1) {
+        onCellPaste.onPasted({
+          pasteData: pastedRows,
+          type: 'onPaste',
+          data: dataSource,
+          pastedColumns: pastedColumnsArray
+        }, handlePasteCallback);
+      } else {
+        onCellPaste.onPasted({
+          pasteData: pastedRows,
+          type: 'onPaste',
+          data: dataSource,
+          pastedColumns: pastedColumnsArray
+        }, handlePasteCallback);
+        triggerChangeData(newData);
+        onCellPaste.dataChange?.(newData);
+      }
+    }
+  };
+  const TableComponent = groupAble ? Group : editAble ? GridEdit : Grid;
   return /*#__PURE__*/React.createElement(TableComponent, _extends({}, rest, {
     t: t,
     locale: locale,
     tableRef: tableRef,
-    dataSource: data
-    // mergedData={mergedData}
+    dataSource: mergerdData
+    // components={components}
     ,
     components: {
       header: {
         cell: allowResizing ? ResizableTitle : undefined
       }
     },
-    format: format,
-    columns: mergedColumns
-    // defaultColumns={mergedColumns}
+    format: format
+    // columns={columns}
     ,
+    columns: mergedColumns,
     showSorterTooltip: {
       target: 'sorter-icon'
     },
     triggerChangeColumns: triggerChangeColumns,
     triggerChangeData: triggerChangeData,
+    triggerGroupColumns: triggerGroupColumns,
     rowKey: rowKey,
-    getRowKey: getRowKey
+    getRowKey: getRowKey,
+    triggerPaste: triggerPaste,
+    clickHeaderToSort: clickHeaderToSort,
+    groupSetting: groupSetting,
+    groupAble: groupAble,
+    groupColumns: groupColumns
   }));
 };
 export default InternalTable;

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

@@ -5,9 +5,12 @@ import type { ColumnsTable, GetRowKey, GridTableProps } from "./type";
 type GridProps<T> = GridTableProps<T> & {
     triggerChangeColumns?: (columns: ColumnsTable<T>, type: string) => void;
     triggerChangeData?: (newData: T[], type: string) => void;
+    triggerGroupColumns?: (groupedColumns: string[]) => void;
     tableRef: any;
     bottomToolbar?: () => React.ReactElement;
-    getRowKey?: GetRowKey<T>;
+    getRowKey: GetRowKey<T>;
+    rowSelection?: any;
+    groupToolbar?: () => React.ReactNode;
 };
 declare const TableGrid: <RecordType extends object>(props: GridProps<RecordType>) => React.JSX.Element;
 export default TableGrid;