es-grid-template 1.9.57 → 1.9.59

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

@@ -23,6 +23,8 @@ var _locale = require("rc-master-ui/es/locale");
 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; }
+// import type { EditType } from "rc-master-ui"
+
 const {
   SHOW_PARENT
 } = _rcMasterUi.TreeSelect;
@@ -490,7 +492,7 @@ const EditableCell = props => {
             const formState = getValues();
             const formNewState = {
               ...getValues(),
-              [dataIndex]: formState[dataIndex] || undefined
+              [dataIndex]: !(0, _utils.isNullOrUndefined)(formState[dataIndex]) ? formState[dataIndex] : undefined
             };
             // @ts-ignore
             const prevState = record[dataIndex] ?? undefined;
@@ -636,7 +638,7 @@ const EditableCell = props => {
             const formState = getValues();
             const formNewState = {
               ...getValues(),
-              [dataIndex]: formState[dataIndex] || undefined
+              [dataIndex]: !(0, _utils.isNullOrUndefined)(formState[dataIndex]) ? formState[dataIndex] : undefined
             };
             // @ts-ignore
             const prevState = record[dataIndex] ?? undefined;
@@ -780,7 +782,7 @@ const EditableCell = props => {
             const formState = getValues();
             const formNewState = {
               ...getValues(),
-              [dataIndex]: formState[dataIndex] || undefined
+              [dataIndex]: !(0, _utils.isNullOrUndefined)(formState[dataIndex]) ? formState[dataIndex] : undefined
             };
             // @ts-ignore
             const prevState = record[dataIndex] ?? undefined;

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

@@ -13,6 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
 var _useContext = require("../useContext");
 var _useColumns = require("../hook/useColumns");
+var _rcMasterUi = require("rc-master-ui");
 const renderCellIndex = props => {
   const {
     parrents,
@@ -220,6 +221,18 @@ const TableBodyCell = props => {
   const colFormat = typeof columnMeta?.format === 'function' ? columnMeta?.format(record) : columnMeta?.format;
   const cellFormat = (0, _utils.getFormat)(colFormat, format);
   const fomatedValue = (0, _useColumns.renderValueCell)(columnMeta, cellValue, record, rowIndex, colIndex, cellFormat, true);
+  const cellContent = columnMeta?.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
+    field: columnMeta.field,
+    index: cell.row.index,
+    rowData: cell.row.original,
+    value: cell.getValue()
+  }) : columnMeta.template : fomatedValue;
+  const linkContent = columnMeta?.linkTemplate ? typeof columnMeta.linkTemplate === 'function' ? columnMeta.linkTemplate({
+    field: columnMeta.field,
+    index: cell.row.index,
+    rowData: cell.row.original,
+    value: cell.getValue()
+  }) : columnMeta.linkTemplate : cellContent;
   const valueCellString = (0, _useColumns.getValueCellString)(columnMeta, cellValue, record, rowIndex, colIndex, format);
   const tooltipContent = _react.default.useMemo(() => {
     if (isOpenTooltip === false) {
@@ -382,7 +395,7 @@ const TableBodyCell = props => {
     "data-row-index": rowNumber,
     "data-col-key": cell.column.id,
     "data-tooltip-id": `${id}-tooltip-content`,
-    "data-tooltip-content": tooltipContent
+    "data-tooltip-content": columnMeta?.type === 'link' ? '' : tooltipContent
     // data-tooltip-delay-show={500}
     ,
 
@@ -396,7 +409,8 @@ const TableBodyCell = props => {
       [`${prefix}-grid-cell-fix-left-last`]: isLastLeftPinnedColumn,
       [`${prefix}-grid-cell-fix-right-first`]: isFirstRightPinnedColumn,
       [`${prefix}-grid-cell-text-center`]: columnMeta?.textAlign === 'center',
-      [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right' || columnMeta.type === 'number'
+      [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right' || columnMeta?.type === 'number',
+      [`${prefix}-grid-cell-link`]: columnMeta?.type === 'link'
     }),
     style: {
       ...cellStyles,
@@ -494,6 +508,30 @@ const TableBodyCell = props => {
         }
       }
     }
+  }, cellContent && columnMeta?.type === 'link' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Dropdown, {
+    trigger: ['hover'],
+    menu: {
+      items: [{
+        key: '1',
+        label: ''
+      }]
+    },
+    dropdownRender: () => /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        padding: '1rem',
+        backgroundColor: '#ffffff',
+        borderRadius: 6,
+        boxShadow: '0 6px 16px 0 rgba(0, 0, 0, 0.08),0 3px 6px -4px rgba(0, 0, 0, 0.12),0 9px 28px 8px rgba(0, 0, 0, 0.05)'
+      }
+    }, linkContent && typeof linkContent === 'string' ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("a", {
+      href: linkContent,
+      target: "_blank",
+      rel: "noreferrer"
+    }, linkContent)) : linkContent ? linkContent : /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("a", {
+      href: typeof cellContent === 'string' ? cellContent : '',
+      target: "_blank",
+      rel: "noreferrer"
+    }, cellContent)))
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {})
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
@@ -542,11 +580,42 @@ const TableBodyCell = props => {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
-  }))), columnMeta.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
-    field: columnMeta.field,
-    index: cell.row.index,
-    rowData: cell.row.original,
-    value: cell.getValue()
-  }) : columnMeta.template : fomatedValue));
+  }))), cellContent))) : /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('ui-rc_cell-content', {})
+  }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
+    className: "ui-rc-table-row-expand-trigger",
+    style: {
+      paddingLeft: `${cell.row.depth * 25}px`
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/_react.default.createElement("button", {
+    // onClick: row.getToggleExpandedHandler(),
+    onClick: e => {
+      e.stopPropagation();
+      const keys = Object.keys(expanded);
+      // @ts-ignore
+      const tmp = {
+        ...expanded
+      };
+      if (keys.includes(cell.row.id)) {
+        delete tmp[cell.row.id];
+        setExpanded(tmp);
+      } else {
+        setExpanded(old => ({
+          ...old,
+          [cell.row.id]: true
+        }));
+      }
+    },
+    style: {
+      cursor: "pointer"
+    },
+    className: "ui-rc-table-row-expand"
+  }, cell.row.getIsExpanded() ? /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-expanded"
+  }) : /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
+  })) : /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
+  }))), cellContent));
 };
 var _default = exports.default = TableBodyCell;

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

@@ -15,6 +15,7 @@ var _useContext = require("../useContext");
 var _EditableCell = _interopRequireDefault(require("./EditableCell"));
 var _hooks = require("../../grid-component/hooks");
 var _useColumns = require("../hook/useColumns");
+var _rcMasterUi = require("rc-master-ui");
 const renderCellIndex = props => {
   const {
     parrents,
@@ -202,6 +203,7 @@ const TableBodyCellEdit = props => {
     setFocusedCell,
     setEditingKey,
     setRangeState,
+    rangePasteState,
     setRangePasteState,
     endCell,
     setEndCell,
@@ -245,13 +247,6 @@ const TableBodyCellEdit = props => {
   const [isOpenTooltip, setIsOpenTooltip] = _react.default.useState(false);
   const rowError = dataErrors ? dataErrors.find(it => it.id === cell.row.id) : undefined;
   const message = rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : undefined;
-
-  // const tooltipContent = (isOpenTooltip === false)
-  //   ? ''
-  //   : columnMeta?.tooltipDescription
-  //     ? (typeof columnMeta.tooltipDescription === 'function' ? columnMeta.tooltipDescription({ value: cell.getValue(), rowData: record }) : columnMeta.tooltipDescription)
-  //     : cell.getValue()
-
   const canEdit = (0, _utils.isEditable)(cell.column.columnDef.meta, record) && isRowEditable !== false;
 
   // const allRows = table.getRowModel().rows;
@@ -324,7 +319,8 @@ const TableBodyCellEdit = props => {
     const colPasteds = (0, _utils.getColIdsBetween)(table, startPasteCell?.colId ?? '', endPasteCell?.colId ?? '');
     const rowSelectIds = (0, _utils.getRowIdsBetween)(table, startCell?.rowId ?? '', endCell?.rowId ?? '');
     const colSelectIds = (0, _utils.getColIdsBetween)(table, startCell?.colId ?? '', endCell?.colId ?? '');
-    const dataSelected = [];
+    const dataSelected = []; // data được copy
+
     rowSelectIds.forEach(rowId => {
       const row = allRows.find(r => r.id === rowId);
       if (!row) return;
@@ -338,49 +334,104 @@ const TableBodyCellEdit = props => {
     });
     const copyRows = (0, _utils.flattenData)('children', dataSource).filter(it => rowSelectIds.includes(it[rowKey]));
     let newRange;
-    if ((startRowIndex ?? 0) < (pasteRangeState.startRowIndex ?? 0)) {
+    if (pasteState.type === 'down') {
       // kéo xuóng
       setRangeState?.((0, _utils.getSelectedCellMatrix)(table, startCell, endPasteCell));
       newRange = ctrlKey ? (0, _utils.addRowsDownWithCtrl)(dataSelected, rowPasteIds.length) : (0, _utils.addRowsDown)(dataSelected, rowPasteIds.length);
-    } else {
+    } else if (pasteState.type === 'up') {
       // kéo lên
       setStartCell?.(endCell);
       setRangeState?.((0, _utils.getSelectedCellMatrix)(table, endCell, endPasteCell));
       newRange = ctrlKey ? (0, _utils.addRowsUpWithCtrl)(dataSelected, rowPasteIds.length) : (0, _utils.addRowsUp)(dataSelected, rowPasteIds.length);
+    } else if (pasteState.type === 'right') {
+      // kéo phải
+      setRangeState?.((0, _utils.getSelectedCellMatrix)(table, startCell, endPasteCell));
+      // newRange = { addedRows: [], combined: [] }
+      // newRange = ctrlKey ? addRowsDownWithCtrl(dataSelected, rowPasteIds.length) : addRowsDown(dataSelected, rowPasteIds.length)
+      newRange = (0, _utils.getDragRightData)({
+        colPasteds,
+        colSelectIds,
+        copyRows,
+        rowSelectIds
+      });
+    } else if (pasteState.type === 'left') {
+      // kéo trái
+      setRangeState?.((0, _utils.getSelectedCellMatrix)(table, startCell, endPasteCell));
+      // newRange = { addedRows: [], combined: [] }
+      // newRange = ctrlKey ? addRowsDownWithCtrl(dataSelected, rowPasteIds.length) : addRowsDown(dataSelected, rowPasteIds.length)
+      newRange = (0, _utils.getDragRightData)({
+        colPasteds,
+        colSelectIds,
+        copyRows,
+        rowSelectIds
+      });
     }
 
     // Cập nhật data mới
     const newData = (0, _utils.flattenArray)([...dataSource]);
     const pastedRows = [];
-    newRange.addedRows.forEach((rowValues, rowIndex1) => {
-      const targetRow = pasteState.startRowIndex + rowIndex1;
+    if (pasteState.type === 'down' || pasteState.type === 'up') {
+      newRange.addedRows.forEach((rowValues, rowIndex1) => {
+        const targetRow = pasteState.startRowIndex + rowIndex1;
 
-      // Nếu vượt quá số dòng hiện có, thêm dòng mới
-      if (targetRow >= newData.length) {
-        newData.push({
-          id: undefined,
-          rowId: (0, _utils.newGuid)()
-        });
-      }
-      rowValues.forEach((cellValue, colIndex1) => {
-        const targetCol = startColIndex + colIndex1;
-        if (targetCol >= tmpCols.length) {
-          // Không vượt quá số cột
-          return;
-        }
-        const columnKey = tmpCols[targetCol].id;
-        const disable = !(0, _utils.isEditable)(tmpCols[targetCol].columnDef.meta, record);
-        if (!disable) {
-          newData[targetRow] = {
-            ...newData[targetRow],
-            [columnKey]: typeof cellValue === 'string' ? cellValue.trim() : cellValue
-          };
+        // Nếu vượt quá số dòng hiện có, thêm dòng mới
+        if (targetRow >= newData.length) {
+          newData.push({
+            id: undefined,
+            rowId: (0, _utils.newGuid)()
+          });
         }
+        rowValues.forEach((cellValue, colIndex1) => {
+          const targetCol = startColIndex + colIndex1;
+          if (targetCol >= tmpCols.length) {
+            // Không vượt quá số cột
+            return;
+          }
+          const columnKey = tmpCols[targetCol].id;
+          const disable = !(0, _utils.isEditable)(tmpCols[targetCol].columnDef.meta, record);
+          if (!disable) {
+            newData[targetRow] = {
+              ...newData[targetRow],
+              [columnKey]: typeof cellValue === 'string' ? cellValue.trim() : cellValue
+            };
+          }
+        });
+
+        // Lưu dòng được paste
+        pastedRows.push(newData[targetRow]);
       });
+    }
+    if (pasteState.type === 'right' || pasteState.type === 'left') {
+      newRange.addedCols.forEach((rowValues, rowIndex1) => {
+        const targetRow = pasteState.startRowIndex + rowIndex1;
 
-      // Lưu dòng được paste
-      pastedRows.push(newData[targetRow]);
-    });
+        // Nếu vượt quá số dòng hiện có, thêm dòng mới
+        if (targetRow >= newData.length) {
+          newData.push({
+            id: undefined,
+            rowId: (0, _utils.newGuid)()
+          });
+        }
+        rowValues.forEach((cellValue, colIndex1) => {
+          const targetCol = pasteState.startColIndex + colIndex1;
+          if (targetCol >= tmpCols.length) {
+            // Không vượt quá số cột
+            return;
+          }
+          const columnKey = tmpCols[targetCol].id;
+          const disable = !(0, _utils.isEditable)(tmpCols[targetCol].columnDef.meta, record);
+          if (!disable) {
+            newData[targetRow] = {
+              ...newData[targetRow],
+              [columnKey]: typeof cellValue === 'string' ? cellValue.trim() : cellValue
+            };
+          }
+        });
+
+        // Lưu dòng được paste
+        pastedRows.push(newData[targetRow]);
+      });
+    }
     const rsFilterData = (0, _utils.updateOrInsert)((0, _utils.flattenArray)([...originData]), newData);
     const rs = (0, _utils.unFlattenData)(rsFilterData);
     triggerPaste?.(pastedRows, colPasteds, rs, copyRows);
@@ -461,11 +512,22 @@ const TableBodyCellEdit = props => {
       });
     }
     if (isPasting) {
-      const absRowIndex = table.getRowModel().flatRows.findIndex(it => it.id === cell.row.id);
-      if ((startRowIndex ?? 0) > absRowIndex) {
-        // kéo lên
+      const allCols = table.getAllLeafColumns();
+      const absRowIndex = table.getRowModel().flatRows.findIndex(it => it.id === rowId); // row cell con chỏ chuột hiện tại
+      const absColIndex = allCols.findIndex(it => it.id === colId); // col cell con chỏ chuột hiện tại
 
-        const startRowPaste = allRows.find(it => it.index === (startRowIndex ?? 0) - 1);
+      // const absColIndex = allCols.findIndex((it) => it.id === endCell?.colId )
+
+      const endCellColIndex = allCols.findIndex(it => it.id === endCell?.colId); // col cuối cùng vùng được copy
+
+      const rowGap = absRowIndex - (endRowIndex ?? 0);
+      const colGap = absColIndex - (endCellColIndex ?? 0);
+      const absRowGap = rangeState?.rowRange.length === 1 ? rowGap : rowGap >= 0 ? rowGap : rowGap + (rangeState?.rowRange.length ?? 0) - 1;
+      const absColGap = rangeState?.colRange.length === 1 ? colGap : colGap >= 0 ? colGap : colGap + (rangeState?.colRange.length ?? 0) - 1;
+      if (rowGap > 0 && absRowGap > 0 && Math.abs(absRowGap) >= Math.abs(absColGap)) {
+        // kéo xuống : cell cuối trùng endCell
+        const findIndex = allRows.findIndex(it => it.id === endCell?.rowId);
+        const startRowPaste = allRows[findIndex + 1];
         setStartPasteCell?.({
           colId: startCell?.colId ?? '',
           rowId: startRowPaste?.id ?? ''
@@ -480,28 +542,57 @@ const TableBodyCellEdit = props => {
         }, {
           colId: endCell?.colId ?? '',
           rowId
-        }));
+        }, 'down'));
+        return;
       }
-      if ((startRowIndex ?? 0) < absRowIndex) {
-        // kéo xuống
-
-        const findIndex = allRows.findIndex(it => it.id === endCell?.rowId);
-        const startRowPaste = allRows[findIndex + 1];
-        setStartPasteCell?.({
-          colId: startCell?.colId ?? '',
-          rowId: startRowPaste?.id ?? ''
-        });
-        setEndPasteCell?.({
-          colId: endCell?.colId ?? '',
-          rowId
-        });
-        setRangePasteState?.((0, _utils.getSelectedCellMatrix)(table, {
+      if (rowGap < 0 && absRowGap < 0 && Math.abs(absRowGap) >= Math.abs(absColGap)) {
+        //  kéo lên
+        const startRowPaste = allRows.find(it => it.index === (startRowIndex ?? 0) - 1);
+        const startPastCell = {
           colId: startCell?.colId ?? '',
           rowId: startRowPaste?.id ?? ''
-        }, {
+        };
+        const endPastCell = {
           colId: endCell?.colId ?? '',
           rowId
-        }));
+        };
+        setStartPasteCell?.(startPastCell);
+        setEndPasteCell?.(endPastCell);
+        setRangePasteState?.((0, _utils.getSelectedCellMatrix)(table, startPastCell, endPastCell, 'up'));
+        return;
+      }
+      if (colGap > 0 && absColGap > 0 && Math.abs(absColGap) > Math.abs(absRowGap)) {
+        const startCol = allCols[(rangeState?.endColIndex ?? 0) + 1];
+        const startPastCell = {
+          colId: startCol?.id ?? '',
+          rowId: rangeState?.rowRange[0] ?? ''
+        };
+        const endPastCell = {
+          colId,
+          rowId: rangeState?.rowRange[rangeState?.rowRange.length - 1] ?? ''
+        };
+        setStartPasteCell?.(startPastCell);
+        setEndPasteCell?.(endPastCell);
+        setRangePasteState?.((0, _utils.getSelectedCellMatrix)(table, startPastCell, endPastCell, 'right'));
+        return;
+      }
+      if (colGap < 0 && absColGap < 0 && Math.abs(absColGap) > Math.abs(absRowGap)) {
+        const endCol = allCols[(rangeState?.startColIndex ?? 0) - 1];
+        const startPastCell = {
+          colId: colId ?? '',
+          rowId: rangeState?.rowRange[0] ?? ''
+        };
+        const endPastCell = {
+          colId: endCol.id,
+          rowId: rangeState?.rowRange[rangeState?.rowRange.length - 1] ?? ''
+        };
+        setStartPasteCell?.(startPastCell);
+        setEndPasteCell?.(endPastCell);
+        setRangePasteState?.((0, _utils.getSelectedCellMatrix)(table, startPastCell, endPastCell, 'left'));
+        return;
+      } else {
+        setStartPasteCell?.(undefined);
+        setEndPasteCell?.(undefined);
       }
     }
   }
@@ -529,14 +620,15 @@ const TableBodyCellEdit = props => {
     setIsSelecting?.(false);
     setIsPasting?.(false);
     const selectState = (0, _utils.getSelectedCellMatrix)(table, startCell, endCell);
-    const selectPasteState = (0, _utils.getSelectedCellMatrix)(table, startPasteCell, endPasteCell);
-    if (endPasteCell && endCell?.rowId !== endPasteCell?.rowId && isPasting) {
+    // const selectPasteState = getSelectedCellMatrix(table, startPasteCell, endPasteCell)
+    const selectPasteState = rangePasteState ? {
+      ...rangePasteState
+    } : {};
+
+    // if (endPasteCell && endCell?.rowId !== endPasteCell?.rowId && isPasting) {
+    if (selectPasteState.type && isPasting) {
       triggerDragPaste(selectPasteState, e.ctrlKey);
     } else {
-      // if ( endCell?.rowId !== rowId || endCell?.colId !== colId) {
-      //   setRangeState?.(selectState)
-      // }
-
       if (!(0, _utils.isObjEqual)(rangeState, selectState)) {
         setRangeState?.(selectState);
       }
@@ -1182,6 +1274,18 @@ const TableBodyCellEdit = props => {
   const colFormat = typeof columnMeta?.format === 'function' ? columnMeta?.format(record) : columnMeta?.format;
   const cellFormat = (0, _utils.getFormat)(colFormat, format);
   const fomatedValue = (0, _useColumns.renderValueCell)(columnMeta, cellValue, record, rowIndex, colIndex, cellFormat, true);
+  const cellContent = columnMeta?.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
+    field: columnMeta.field,
+    index: cell.row.index,
+    rowData: cell.row.original,
+    value: cell.getValue()
+  }) : columnMeta.template : fomatedValue;
+  const linkContent = columnMeta?.linkTemplate ? typeof columnMeta.linkTemplate === 'function' ? columnMeta.linkTemplate({
+    field: columnMeta.field,
+    index: cell.row.index,
+    rowData: cell.row.original,
+    value: cell.getValue()
+  }) : columnMeta.linkTemplate : cellContent;
   return /*#__PURE__*/_react.default.createElement("div", {
     key: cell.id,
     ref: el => {
@@ -1196,7 +1300,7 @@ const TableBodyCellEdit = props => {
     "data-row-key": cell.row.id,
     "data-tooltip-id": `${id}-tooltip-content`,
     "data-tooltip-delay-show": 500,
-    "data-tooltip-content": isEditing && message ? message : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : tooltipContent,
+    "data-tooltip-content": isEditing && message ? message : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : columnMeta?.type === 'link' ? '' : tooltipContent,
     className: (0, _classnames.default)(`${prefix}-grid-cell cell-editable editable `, {
       [`${prefix}-grid-cell-ellipsis`]: true,
       'cell-editing': isEditing,
@@ -1215,7 +1319,8 @@ const TableBodyCellEdit = props => {
       [`${prefix}-grid-cell-fix-left-last`]: isLastLeftPinnedColumn,
       [`${prefix}-grid-cell-fix-right-first`]: isFirstRightPinnedColumn,
       [`${prefix}-grid-cell-text-center`]: columnMeta?.textAlign === 'center',
-      [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right' || columnMeta.type === 'number'
+      [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right' || columnMeta?.type === 'number',
+      [`${prefix}-grid-cell-link`]: columnMeta?.type === 'link'
     }),
     style: {
       display: 'flex',
@@ -1315,8 +1420,31 @@ const TableBodyCellEdit = props => {
     record: record,
     visibleColumns: visibleColumns,
     handleNextCell: handleNextCell
-    // rowKey={rowKey}
-  }) : /*#__PURE__*/_react.default.createElement("div", {
+  }) : columnMeta?.type === 'link' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Dropdown, {
+    trigger: ['hover'],
+    menu: {
+      items: [{
+        key: '1',
+        label: ''
+      }]
+    },
+    dropdownRender: () => /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        padding: '1rem',
+        backgroundColor: '#ffffff',
+        borderRadius: 6,
+        boxShadow: '0 6px 16px 0 rgba(0, 0, 0, 0.08),0 3px 6px -4px rgba(0, 0, 0, 0.12),0 9px 28px 8px rgba(0, 0, 0, 0.05)'
+      }
+    }, linkContent && typeof linkContent === 'string' ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("a", {
+      href: linkContent,
+      target: "_blank",
+      rel: "noreferrer"
+    }, linkContent)) : linkContent ? linkContent : /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("a", {
+      href: typeof cellContent === 'string' ? cellContent : '',
+      target: "_blank",
+      rel: "noreferrer"
+    }, cellContent)))
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {
       'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes((0, _utils.getEditType)(columnMeta, record))
     })
@@ -1356,17 +1484,57 @@ const TableBodyCellEdit = props => {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
-  }))), columnMeta.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
-    field: columnMeta.field,
-    index: cell.row.index,
-    rowData: cell.row.original,
-    value: cell.getValue()
-  }) : columnMeta.template : fomatedValue, (editType === 'select' || editType === 'selectTable' || editType === 'asyncSelect' || editType === 'treeSelect') && canEdit && /*#__PURE__*/_react.default.createElement("span", {
+  }))), cellContent, (editType === 'select' || editType === 'selectTable' || editType === 'asyncSelect' || editType === 'treeSelect') && canEdit && /*#__PURE__*/_react.default.createElement("span", {
+    className: 'caret-down',
+    onClick: e => {
+      handleEdit(e);
+    }
+  })))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('ui-rc_cell-content', {
+      'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes((0, _utils.getEditType)(columnMeta, record))
+    })
+  }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
+    className: "ui-rc-table-row-expand-trigger",
+    style: {
+      paddingLeft: `${cell.row.depth * 25}px`
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/_react.default.createElement("button", {
+    // onClick: row.getToggleExpandedHandler(),
+    onClick: e => {
+      e.stopPropagation();
+      e.preventDefault();
+      setIsExpandClick(true);
+      const keys = Object.keys(expanded);
+      // @ts-ignore
+      const tmp = {
+        ...expanded
+      };
+      if (keys.includes(cell.row.id)) {
+        delete tmp[cell.row.id];
+        setExpanded(tmp);
+      } else {
+        setExpanded(old => ({
+          ...old,
+          [cell.row.id]: true
+        }));
+      }
+    },
+    style: {
+      cursor: "pointer"
+    },
+    className: "ui-rc-table-row-expand"
+  }, cell.row.getIsExpanded() ? /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-expanded"
+  }) : /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
+  })) : /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
+  }))), cellContent, (editType === 'select' || editType === 'selectTable' || editType === 'asyncSelect' || editType === 'treeSelect') && canEdit && /*#__PURE__*/_react.default.createElement("span", {
     className: 'caret-down',
     onClick: e => {
       handleEdit(e);
     }
-  })), !isSelecting && !isEditing && rowRange &&
+  }))), !isSelecting && !isEditing && rowRange &&
   // rowNumber === rangeState?.endRowIndex &&
   cell.row.id === rowRange[rowRange?.length - 1] && cell.column.getIndex() === rangeState?.endColIndex && /*#__PURE__*/_react.default.createElement("div", {
     className: 'dragging-point',

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

@@ -96,7 +96,7 @@ export declare const genPresets: (presets?: import("@ant-design/colors").Palette
 export declare const getEditType: <T>(column: ColumnTable<T>, rowData?: any) => EditType;
 export declare const getDefaultValue: (defaultValue: any) => AnyObject;
 export declare const flattenData: <RecordType extends AnyObject = AnyObject>(childrenColumnName: string, data?: RecordType[]) => RecordType[];
-export declare const getSelectedCellMatrix: (table: Table<any>, startCell: IPositionCell | undefined, endCell: IPositionCell | undefined) => RangeState;
+export declare const getSelectedCellMatrix: (table: Table<any>, startCell: IPositionCell | undefined, endCell: IPositionCell | undefined, type?: string) => RangeState;
 export declare function addRowsDownWithCtrl(arr: any, n: number): {
     combined: any;
     addedRows: any[];
@@ -125,6 +125,16 @@ export declare function addRowsUp(array: any, n: number): {
     combined: any[];
     addedRows: any[];
 };
+interface DragCopyParams {
+    rowSelectIds: string[];
+    colSelectIds: string[];
+    colPasteds: string[];
+    copyRows: any[];
+}
+export declare const getDragRightData: ({ rowSelectIds, colSelectIds, colPasteds, copyRows, }: DragCopyParams) => {
+    combined: any[][];
+    addedCols: any[][];
+};
 export declare const convertFilters: (filters: any[]) => any[];
 export declare const revertConvertFilters: (clauses: any[]) => FilterState[];
 export declare function getInvisibleColumns(columns: ColumnTable[]): Record<string, boolean>;
@@ -170,3 +180,4 @@ export declare function sumNumberFields(columns: ColumnTable[], data: any[], chi
 export declare const getTreeDepth: (rows: any[]) => number;
 export type FormatToken = 'YYYY' | 'MM' | 'DD' | 'HH' | 'mm' | 'ss';
 export declare const isDateChanged: (oldDate: string | Date, newDate: string | Date, format: string) => FormatToken | null;
+export {};