es-grid-template 1.9.73 → 1.9.75

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

@@ -9,12 +9,13 @@ import { booleanOperator, findItemPath, isEditable, isObjEmpty, nonActionColumn,
 import classNames from 'classnames';
 import { Dropdown, Select, Space, Button } from 'rc-master-ui';
 import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, convertFilters, extendsObject,
+// findFirst,
 // flattenArray,
 flattenData, getColIdsBetween1, getDefaultOperator, getDragRightData, getEditType, getKeys, getNextColumn, getNextColumn1, getPrevColumn, getRowIdsBetween3,
 // getRowIndexMap,
 getSelectedCellMatrix1, getTypeFilter,
 // isObjEqual,
-newGuid } from "../../../table-component/hook/utils";
+newGuid, unFlattenData, updateOrInsert } from "../../../table-component/hook/utils";
 import { renderFilter } from "../../base-table/renderFilter";
 import { renderValueCell } from "../../../table-component/hook/useColumns";
 import EditCell from "../../base-table/cell/EditCell";
@@ -23,7 +24,7 @@ import { stateKeyResize, stateKeyColumnFilter, stateKeyFilter, stateKeyPaginatio
 //  state For edit
 stateKeyEndCell, stateKeyEndPasteCell, stateKeyStartCell, stateKeyStartPasteCell, stateKeyFocusedCell, stateKeyEditCellSettings, stateKeyIsEditing, stateKeyIsPasting, stateKeyIsSelecting } from "../../utils/constants";
 import { getColumnsAtLevel } from "../../base-table/utils";
-import { unFlattenData, updateOrInsert } from "../../utils/utility";
+// import { unFlattenData } from '../../utils/utility';
 // import { getMaxDepth } from '../../utils/utility';
 
 function clamp(min, x, max) {
@@ -50,6 +51,7 @@ export function columnCustom(opts) {
     wrapSettings,
     // ignoreAccents,
     dataSource,
+    dataFlatten,
     isDataTree,
     defaultSorter,
     defaultFilter,
@@ -440,7 +442,7 @@ export function columnCustom(opts) {
       }
 
       // Cập nhật data mới
-      const newData = allRows;
+      const newData = dataFlatten;
       const pastedRows = [];
       if (pasteState.type === 'down' || pasteState.type === 'up') {
         newRange.addedRows.forEach((rowValues, rowIndex1) => {
@@ -508,7 +510,7 @@ export function columnCustom(opts) {
       }
 
       // const rsFilterData = updateOrInsert(dataSource, newData)
-      const rsFilterData = updateOrInsert(allRows, newData);
+      const rsFilterData = updateOrInsert(dataFlatten, newData);
       const rs = unFlattenData(rsFilterData);
       triggerPaste?.(pastedRows, colPasteds, rs, copyRows);
       pipeline.setStateAtKey(stateKeyEndCell, endPasteCell);
@@ -535,7 +537,7 @@ export function columnCustom(opts) {
       const newRange = ctrlKey ? addRowsDownWithCtrl(dataSelected, rowsPasteId.length) : addRowsDown(dataSelected, rowsPasteId.length);
 
       // Cập nhật data mới
-      const newData = allRows;
+      const newData = dataFlatten;
       const pastedRows = [];
       newRange.addedRows.forEach((rowValues, rowIndex1) => {
         const targetRow = pasteState?.startRowIndex + rowIndex1;
@@ -557,7 +559,7 @@ export function columnCustom(opts) {
       });
 
       // const rsFilterData = updateOrInsert(dataSource, newData)
-      const rsFilterData = updateOrInsert(dataSource, newData);
+      const rsFilterData = updateOrInsert(dataFlatten, newData);
       const rs = unFlattenData(rsFilterData);
       triggerPaste?.(pastedRows, colsPastedId, rs, copyRows);
     };
@@ -1061,6 +1063,73 @@ export function columnCustom(opts) {
       pipeline.setStateAtKey(stateKeyEndCell, cellEnd);
       triggerPointPaste(selectPasteState, cellStart, cellEnd, e.ctrlKey);
     };
+
+    // cell Số thứ tự
+
+    const handleMouseDownIndex = rowId => {
+      // setIsSelecting?.(true);
+      pipeline.setStateAtKey(stateKeyIsSelecting, true);
+      const allColumns = allCols.filter(it => !nonActionColumn.includes(it.field));
+
+      // const firstCOlSpin = findFirst(allColumns)
+
+      const startCol = allColumns[0].field;
+      const endCol = allColumns[allColumns.length - 1].field;
+
+      // setStartCell?.({ rowId, colId: startCol });
+      // setEndCell?.({ rowId, colId: endCol });
+
+      pipeline.setStateAtKey(stateKeyStartCell, {
+        rowId,
+        colId: startCol
+      });
+      pipeline.setStateAtKey(stateKeyEndCell, {
+        rowId,
+        colId: endCol
+      });
+
+      // if (firstCOlSpin) {
+      //   setFocusedCell?.({ rowId: cell.row.id, colId: firstCOlSpin.id })
+      // } else {
+      //   const firstCOlVisible = allColumns[0]
+      //   setFocusedCell?.({ rowId: cell.row.id, colId: firstCOlVisible.id })
+      // }
+      pipeline.setStateAtKey(stateKeyFocusedCell, {
+        rowId,
+        colId: startCol
+      });
+
+      // setRangeState?.(getSelectedCellMatrix(table, { rowId, colId: startCol }, { rowId, colId: endCol }))
+    };
+    const handleMouseEnterIndex = rowId => {
+      if (isSelecting) {
+        const allColumns = allCols.filter(it => !nonActionColumn.includes(it.field));
+
+        // const firstCOl = findFirst(allColumns)
+
+        // const startCol = allColumns[0].id
+        const endCol = allColumns[allColumns.length - 1].field;
+
+        //  // setStartCell?.({ rowId, colId: startCol });
+        // setEndCell?.({ rowId, colId: endCol });
+        pipeline.setStateAtKey(stateKeyEndCell, {
+          rowId,
+          colId: endCol
+        });
+      }
+    };
+    const handleMouseUpIndex = () => {
+      // setIsSelecting?.(false);
+
+      pipeline.setStateAtKey(stateKeyIsSelecting, false);
+
+      // const selectState = getSelectedCellMatrix(table, startCell, endCell)
+
+      // if (!isObjEqual(rangeState, selectState)) {
+
+      //   setRangeState?.(selectState)
+      // }
+    };
     pipeline.mapColumns(makeRecursiveMapper((col, params) => {
       const {
         startIndex,
@@ -1213,6 +1282,7 @@ export function columnCustom(opts) {
       // cell Index
       if (col.field === '#') {
         const prevContent = col.template;
+        const prevGetCellProps = col?.getCellProps;
         return {
           ...col,
           lock: !!col.fixed,
@@ -1247,7 +1317,73 @@ export function columnCustom(opts) {
               overflow: 'visible',
               position: 'relative'
             }
-          })
+          }),
+          getCellProps(value, record, rowIndex) {
+            const prevCellProps = prevGetCellProps?.(value, record, rowIndex);
+
+            // const isCellSelected = (!startCell || !endCell) ? false : selectRowIds.includes(record.rowId) && cols.includes(col.field);
+
+            return mergeCellProps(prevCellProps, {
+              // @ts-ignore
+              'data-col-key': col.field,
+              ref: el => {
+                if (focusedCell?.rowId === record.rowId && focusedCell?.colId === col.field && !isEditing.editing) {
+                  el?.focus({
+                    preventScroll: true
+                  });
+                }
+              },
+              style: {
+                ...prevCellProps?.style,
+                userSelect: 'none'
+                // padding: cellEditing ? 0 : undefined
+                // ...cellStyles,
+              },
+              className: classNames(prevCellProps?.className, `${prefix}-grid-cell`, {
+                [`${prefix}-grid-cell-ellipsis`]: !wrapSettings || !(wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Content')),
+                [`${prefix}-grid-cell-wrap`]: wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Content'),
+                [`${prefix}-grid-cell-text-center`]: col?.textAlign === 'center',
+                [`${prefix}-grid-cell-text-right`]: col?.textAlign === 'right' || col.type === 'number',
+                [`${prefix}-grid-cell-index-selected`]: selectRowIds?.includes(record.rowId),
+                'no-hover': editAble
+
+                // isValid: !isEditing && rowError && rowError[col.field]?.field === col.field,
+                // [`${prefix}-grid-cell-selected`]: isCellSelected,
+              }),
+              onMouseDown: e => {
+                prevCellProps?.onMouseDown?.(e);
+                if (editAble) {
+                  // if (record[rowKey] === editingKey) {
+                  if (isEditing.editing) {
+                    // setFocusedCell?.({ rowId: cell.row.id, colId: cell.column.id })
+                  } else {
+                    handleMouseDownIndex(record.rowId);
+                    if (isEditing.editing) {
+                      setTimeout(() => {
+                        // setEditingKey?.('')
+                        pipeline.setStateAtKey(stateKeyIsEditing, defaultCellEditing);
+                        reset?.();
+                      });
+                    }
+                  }
+                }
+              },
+              onMouseEnter: e => {
+                prevCellProps?.onMouseEnter?.(e);
+                // Edit
+
+                if (editAble) {
+                  handleMouseEnterIndex(record.rowId);
+                }
+              },
+              onMouseUp: e => {
+                prevCellProps?.onMouseUp?.(e);
+                if (editAble) {
+                  handleMouseUpIndex();
+                }
+              }
+            });
+          }
         };
       }
 
@@ -1514,9 +1650,6 @@ export function columnCustom(opts) {
         }),
         getCellProps(value, record, rowIndex) {
           const prevCellProps = prevGetCellProps?.(value, record, rowIndex);
-
-          // console.log('record', record)
-
           const fomatedValue = ['color', 'checkbox', 'field'].includes(col.type ?? '') ? '' : renderValueCell(col, value, record, rowIndex, 0, format, false);
           const tooltipContent = isOpenTooltip === false ? '' : col?.tooltipDescription ? typeof col.tooltipDescription === 'function' ? col.tooltipDescription({
             value,

package/es/ali-table/utils/utility.d.ts

@@ -25,4 +25,15 @@ export declare function filterVisibleColumns<T extends ColumnTable>(columns: T[]
 export declare const sortByType: (arr: ColumnTable[], rowDnd?: RowDnd) => ColumnTable[];
 export declare function getVisibleColumnFields<T extends ColumnTable>(columns: T[]): string[];
 export declare const getOnlyInA: (a: string[], b: string[]) => string[];
+export declare const buildParentMap: <T extends {
+    id: string;
+    rowId: string;
+    children?: T[];
+}>(tree: T[]) => Map<string, T>;
+export declare const flattenTree: <T extends {
+    children?: T[];
+}>(tree: T[]) => T[];
+export declare const flattenTree2: <T extends {
+    children?: T[];
+}>(tree: T[]) => Omit<T, 'children'>[];
 export {};

package/es/ali-table/utils/utility.js

@@ -699,4 +699,53 @@ export function getVisibleColumnFields(columns) {
 export const getOnlyInA = (a, b) => {
   const setB = new Set(b);
   return a.filter(item => !setB.has(item));
+};
+export const buildParentMap = tree => {
+  const parentMap = new Map();
+  const stack = [...tree];
+  while (stack.length) {
+    const node = stack.pop();
+    const children = node.children;
+    if (!children?.length) continue;
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      parentMap.set(child.rowId, node);
+      stack.push(child);
+    }
+  }
+  return parentMap;
+};
+export const flattenTree = tree => {
+  const result = [];
+  const stack = [...tree];
+  while (stack.length) {
+    const node = stack.pop();
+    result.push(node);
+    const children = node.children;
+    if (children?.length) {
+      // Push ngược để giữ nguyên thứ tự tree
+      for (let i = children.length - 1; i >= 0; i--) {
+        stack.push(children[i]);
+      }
+    }
+  }
+  return result;
+};
+export const flattenTree2 = tree => {
+  const result = [];
+  const stack = [...tree];
+  while (stack.length) {
+    const node = stack.pop();
+    const {
+      children,
+      ...item
+    } = node;
+    result.push(item);
+    if (children?.length) {
+      for (let i = children.length - 1; i >= 0; i--) {
+        stack.push(children[i]);
+      }
+    }
+  }
+  return result;
 };

package/es/group-component/hook/utils.d.ts

@@ -196,10 +196,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
         value: any;
         rowData: RecordType;
     }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
-    onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
+    onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     getValue?: (row: any, rowIndex: number) => any;
     getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
     headerCellProps?: import("./../../grid-component/type").CellProps;

package/es/table-component/table/Grid.js

@@ -170,12 +170,17 @@ const Grid = props => {
     // debugTable: true
   });
   React.useEffect(() => {
+    setIsSelectionChange(prev => ({
+      ...prev,
+      isChange: false
+    }));
     if (!isSelectionChange.isChange) {
       if (mergedSelectedKeys.length === 0) {
         setIsSelectionChange(prev => ({
           ...prev,
           rowsData: []
         }));
+        setRowSelection(convertToObjTrue(mergedSelectedKeys));
       } else {
         const abc = flattenArray(dataSource);
         const selectedKeySet = new Set(mergedSelectedKeys);
@@ -186,8 +191,14 @@ const Grid = props => {
           rowsData: result
         }));
       }
+    } else {
+      if (mergedSelectedKeys.length === 0) {
+        setRowSelection(convertToObjTrue(mergedSelectedKeys));
+      }
     }
-  }, [mergedSelectedKeys, dataSource]);
+  }, [mergedSelectedKeys, dataSource, isSelectionChange.isChange]);
+  // }, [mergedSelectedKeys, dataSource])
+
   React.useEffect(() => {
     if (defaultFilter) {
       const a = revertConvertFilters(defaultFilter);

package/lib/ali-table/Grid.js

@@ -179,7 +179,6 @@ const Grid = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
 
       //  setColumns(cols)
     } else {
-      console.log('setColumns');
       setColumns(cols);
       // pipeline.columns(cols)