@zhenliang/sheet 0.1.7-3.beta.1 → 0.1.7-3.beta.11

package/dist/core/table/addButton.js

@@ -7,7 +7,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { MoreOutlined } from "@ant-design/icons";
 import { Form, InputNumber, Popover, Button } from "antd";
 import React, { useEffect, useRef, useState } from "react";
-import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var RowPop = function RowPop(props) {

package/dist/core/table/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
 import { SheetTableType } from "../../type";
+import './index.less';
 declare const Table: React.FC<SheetTableType.TableProps>;
 export default Table;

package/dist/core/table/index.js

@@ -1,10 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler"];
+var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler", "remarkRender", "handleAddRemark", "showRemark", "freeze"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -17,12 +21,15 @@ import { Sheet, useSetState } from "../..";
 import { GroupContext } from "../../hooks/useGroupConfig";
 import { WidthContext } from "../../hooks/useWidthConfig";
 import { ConfigProvider, Empty } from 'antd';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { flatten } from 'lodash';
+import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
 import { TableShell } from "../shell/tableShell";
 import { AddButton } from "./addButton";
 import { GroupEvent, SelectionEvent } from "./events";
+import "./index.less";
+import { RemarkEvent } from "./remarkEvent";
 import { formatGroupData, useGroupConfig } from "./useGroupConfig";
 import { formatSelectionData, useRowSelection } from "./useRowSelection";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,6 +46,12 @@ var Table = function Table(_ref) {
     handleBatchAdd = _ref.handleBatchAdd,
     draggable = _ref.draggable,
     eventHandler = _ref.eventHandler,
+    RemarkRender = _ref.remarkRender,
+    handleAddRemark = _ref.handleAddRemark,
+    _ref$showRemark = _ref.showRemark,
+    showRemark = _ref$showRemark === void 0 ? false : _ref$showRemark,
+    _ref$freeze = _ref.freeze,
+    freeze = _ref$freeze === void 0 ? false : _ref$freeze,
     args = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([[]]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -49,7 +62,7 @@ var Table = function Table(_ref) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     widths = _useSetState2[0],
     setWidth = _useSetState2[1];
-  var sheetInstance = sheetRef || _sheetInstance;
+  var sheetInstance = _sheetInstance;
   var dataHasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 || (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
@@ -58,6 +71,39 @@ var Table = function Table(_ref) {
   var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
   var offset = hasControl ? 2 : 1;
+  useImperativeHandle(sheetRef, function () {
+    return new Proxy({}, {
+      get: function get(target, property) {
+        var _sheetInstance$curren3;
+        var flatDataSource = flatten(dataSource.map(function (item) {
+          return item.children ? [item].concat(_toConsumableArray(item.children)) : [item];
+        }));
+        if (property === 'goToByTable') {
+          return function (id, columnKey) {
+            var _sheetInstance$curren, _sheetInstance$curren2;
+            var toCol = columns.findIndex(function (column) {
+              return column.dataIndex === columnKey;
+            }) + offset;
+            var toRow = flatDataSource.findIndex(function (d) {
+              return String(d === null || d === void 0 ? void 0 : d.id) === String(id);
+            });
+            (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.goTo(toRow, toCol);
+            (_sheetInstance$curren2 = sheetInstance.current) === null || _sheetInstance$curren2 === void 0 || _sheetInstance$curren2.select({
+              start: {
+                row: toRow,
+                col: toCol
+              },
+              end: {
+                row: toRow,
+                col: toCol
+              }
+            });
+          };
+        }
+        return (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 ? void 0 : _sheetInstance$curren3[property];
+      }
+    });
+  }, [columns, dataSource, offset]);
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
@@ -74,9 +120,10 @@ var Table = function Table(_ref) {
     setData(formatGroupData({
       dataSource: dataSource,
       columns: columns,
-      rowKey: rowKey
+      rowKey: rowKey,
+      showRemark: showRemark
     }));
-  }, [dataSource, columns, hasChildren, rowKey]);
+  }, [dataSource, columns, hasChildren, rowKey, showRemark]);
   useEffect(function () {
     if (hasChildren) return;
     if (!dataSource || !columns) return;
@@ -85,15 +132,17 @@ var Table = function Table(_ref) {
       columns: columns,
       checked: checkedRow,
       rowKey: rowKey,
-      rowSelection: rowSelection
+      rowSelection: rowSelection,
+      showRemark: showRemark
     }));
-  }, [dataSource, columns, checkedRow, hasChildren, rowKey, rowSelection]);
+  }, [dataSource, columns, checkedRow, hasChildren, rowKey, rowSelection, showRemark]);
   useEffect(function () {
     if (!dataSource || !columns) {
       setData([[]]);
     }
   }, [dataSource, columns]);
   var handleChanges = useCallback(function (changes, extChange) {
+    if (freeze) return;
     onChange && onChange(changes.map(function (item) {
       return {
         col: item.col,
@@ -111,7 +160,7 @@ var Table = function Table(_ref) {
         value: item.value
       };
     }));
-  }, [columns, onChange, hasControl]);
+  }, [columns, onChange, hasControl, freeze]);
   var handleReverse = useCallback(function (value) {
     var _ref2 = value,
       type = _ref2.type,
@@ -167,6 +216,103 @@ var Table = function Table(_ref) {
       }
     });
   }, [columns.length, columnsTitle, draggable, headSelection, hasChildren]);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showRemarkPop = _useState4[0],
+    setShowRemark = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    remarkInfo = _useState6[0],
+    setRemarkInfo = _useState6[1];
+  var handleCellClick = useCallback(function (cell) {
+    var _columns$dataIndex, _data$row, _data$row2;
+    var _ref4 = cell !== null && cell !== void 0 ? cell : {},
+      col = _ref4.col,
+      row = _ref4.row;
+    if (!cell || !(columns !== null && columns !== void 0 && columns.length) || !(data !== null && data !== void 0 && data.length) || !columns[col - offset]) {
+      //remove pop
+      setShowRemark(false);
+      return;
+    }
+    var columnKey = (_columns$dataIndex = columns[col - offset].dataIndex) !== null && _columns$dataIndex !== void 0 ? _columns$dataIndex : '';
+    setRemarkInfo({
+      cell: cell,
+      columnKey: columnKey,
+      id: data === null || data === void 0 || (_data$row = data[row]) === null || _data$row === void 0 || (_data$row = _data$row[col]) === null || _data$row === void 0 || (_data$row = _data$row.record) === null || _data$row === void 0 ? void 0 : _data$row.id
+    });
+    console.log(data);
+    setShowRemark(!!(data !== null && data !== void 0 && (_data$row2 = data[row]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2[col]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.record) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.remarks) !== null && _data$row2 !== void 0 && _data$row2.includes(columnKey)));
+  }, [offset, columns, data]);
+  var remarkElement = useMemo(function () {
+    if (!showRemark || !remarkInfo || !RemarkRender) {
+      return null;
+    }
+    return /*#__PURE__*/_jsx(RemarkRender, _objectSpread(_objectSpread({}, remarkInfo), {}, {
+      close: function close() {
+        return setShowRemark(false);
+      }
+    }));
+  }, [RemarkRender, remarkInfo, showRemark, data]);
+  var addRemark = useCallback(function (value) {
+    handleAddRemark === null || handleAddRemark === void 0 || handleAddRemark(value);
+    setShowRemark(true);
+  }, [handleAddRemark]);
+  var menuRenderer = args.menuRenderer;
+  var wrappMenuRenderer = useMemo(function () {
+    var remarkMenu = /*#__PURE__*/_jsx("div", {
+      className: "harvest-menu-item",
+      onClick: function onClick() {
+        return addRemark(remarkInfo);
+      },
+      children: "\u6DFB\u52A0\u8BC4\u8BBA"
+    }, "remark");
+    if (!menuRenderer) {
+      if (showRemark) {
+        return function (props) {
+          var _data$row3, _target$record, _target$record$includ;
+          var cell = props.cell;
+          var _ref5 = cell !== null && cell !== void 0 ? cell : {},
+            _ref5$col = _ref5.col,
+            col = _ref5$col === void 0 ? -1 : _ref5$col,
+            _ref5$row = _ref5.row,
+            row = _ref5$row === void 0 ? -1 : _ref5$row;
+          var target = data === null || data === void 0 || (_data$row3 = data[row]) === null || _data$row3 === void 0 ? void 0 : _data$row3[col + 1];
+          var cellHasRemark = (_target$record = target.record) === null || _target$record === void 0 || (_target$record = _target$record.remarks) === null || _target$record === void 0 || (_target$record$includ = _target$record.includes) === null || _target$record$includ === void 0 ? void 0 : _target$record$includ.call(_target$record, target.dataIndex);
+          if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
+            return /*#__PURE__*/_jsx("div", {
+              className: "harvest-menu",
+              style: _objectSpread({}, props.position),
+              children: remarkMenu
+            });
+          }
+          return null;
+        };
+      }
+      return undefined;
+    } else {
+      return function (props) {
+        var _data$row4, _target$record2, _target$record2$inclu;
+        var cell = props.cell;
+        var _ref6 = cell !== null && cell !== void 0 ? cell : {},
+          _ref6$col = _ref6.col,
+          col = _ref6$col === void 0 ? -1 : _ref6$col,
+          _ref6$row = _ref6.row,
+          row = _ref6$row === void 0 ? -1 : _ref6$row;
+        var target = data === null || data === void 0 || (_data$row4 = data[row]) === null || _data$row4 === void 0 ? void 0 : _data$row4[col + 1];
+        var MenuFC = menuRenderer;
+        var cellHasRemark = (_target$record2 = target.record) === null || _target$record2 === void 0 || (_target$record2 = _target$record2.remarks) === null || _target$record2 === void 0 || (_target$record2$inclu = _target$record2.includes) === null || _target$record2$inclu === void 0 ? void 0 : _target$record2$inclu.call(_target$record2, target.dataIndex);
+        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
+          return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+            target: target,
+            children: remarkMenu
+          }));
+        }
+        return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+          target: target
+        }));
+      };
+    }
+  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo, addRemark, data]);
   return /*#__PURE__*/_jsx(ConfigProvider, {
     renderEmpty: function renderEmpty() {
       return /*#__PURE__*/_jsx(Empty, {
@@ -184,11 +330,15 @@ var Table = function Table(_ref) {
           onChange: setGroupConfig
         },
         children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+          freeze: freeze,
+          menuRenderer: wrappMenuRenderer,
+          showRemark: showRemarkPop,
           sheetInstance: sheetInstance,
           sheetRenderer: WrappedTableShell,
           data: data,
           onCellsChanged: handleChanges,
           handleAdd: handleAdd,
+          remarkElement: remarkElement,
           children: [/*#__PURE__*/_jsx(SelectionEvent, {
             hasChildren: hasChildren,
             rowSelection: rowSelection,
@@ -201,12 +351,14 @@ var Table = function Table(_ref) {
           }), /*#__PURE__*/_jsx(SheetEvent, {
             name: "reverse",
             handler: handleReverse
-          }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
+          }, "_reverse"), /*#__PURE__*/_jsx(RemarkEvent, {
+            handler: handleCellClick
+          }), Object.keys(eventHandler || {}).map(function (key) {
             return /*#__PURE__*/_jsx(SheetEvent, {
               name: key,
               handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
             }, key);
-          }), /*#__PURE__*/_jsx(AddButton, {
+          }), freeze ? null : /*#__PURE__*/_jsx(AddButton, {
             handleAdd: handleAdd,
             handleBatchAdd: handleBatchAdd
           })]

package/dist/core/table/index.less

@@ -9,4 +9,23 @@
       }
     }
   }
+}
+.remark-cell{
+  position: relative !important;
+  overflow: hidden;
+  &::before{
+    position: absolute;
+    transform: translate(6px,-6px);
+    content: '';
+    top:4px;
+    right:4px;
+    border:4px solid transparent;
+    border-top-color: red;
+    border-right-color: red;
+  }
+}
+.harvest-menu-divider{
+  margin: 5px 8px;
+  height: 1px;
+  background-color: rgb(235, 235, 235);
 }

package/dist/core/table/remarkEvent.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { SheetType } from "../../type";
+export declare const RemarkEvent: React.FC<{
+    handler: (value: SheetType.CellPosition) => void;
+}>;

package/dist/core/table/remarkEvent.js

@@ -0,0 +1,9 @@
+import { SheetEvent } from "../sheet/Event";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var RemarkEvent = function RemarkEvent(_ref) {
+  var handler = _ref.handler;
+  return /*#__PURE__*/_jsx(SheetEvent, {
+    name: "cell-select-single",
+    handler: handler
+  }, "cell-select-single");
+};

package/dist/core/table/useGroupConfig.d.ts

@@ -2,4 +2,4 @@ import type { SheetTableType, SheetType } from "../../type";
 export declare const useGroupConfig: (dataSource: Record<string, unknown>[], tableGroupConfig?: SheetTableType.TableGroupConfig, hasChildren?: boolean) => [SheetType.RowGroupConfig & {
     configMap: SheetType.GroupMap;
 }, (value: SheetType.RowGroupConfig) => void];
-export declare const formatGroupData: (param: Pick<SheetTableType.TableProps, 'dataSource' | 'columns' | 'rowKey'>) => SheetType.Cell[][];
+export declare const formatGroupData: (param: Pick<SheetTableType.TableProps, 'dataSource' | 'columns' | 'rowKey' | 'showRemark'>) => SheetType.Cell[][];

package/dist/core/table/useGroupConfig.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { flatten, isNil } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { groupConfigToGroupMap } from "../util";
+import { classNames, groupConfigToGroupMap } from "../util";
 import { GroupViewer } from "../viewer";
 import { dataSourceToRowConfig } from "./util";
 export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig, hasChildren) {
@@ -104,7 +104,8 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
 export var formatGroupData = function formatGroupData(param) {
   var dataSource = param.dataSource,
     columns = param.columns,
-    rowKey = param.rowKey;
+    rowKey = param.rowKey,
+    showRemark = param.showRemark;
   var data = [];
   var currentIndex = 0;
   dataSource.forEach(function (item, row) {
@@ -147,8 +148,9 @@ export var formatGroupData = function formatGroupData(param) {
         className: 'sheet-control'
       });
       columns.forEach(function (colInfo, col) {
-        var _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
+        var _itemRow$remarks, _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
         var value = itemRow[colInfo.dataIndex || ''];
+        var hasRemark = showRemark && (itemRow === null || itemRow === void 0 || (_itemRow$remarks = itemRow.remarks) === null || _itemRow$remarks === void 0 ? void 0 : _itemRow$remarks.includes(colInfo.dataIndex));
         dataRow.push({
           id: rowId,
           value: value,
@@ -161,7 +163,7 @@ export var formatGroupData = function formatGroupData(param) {
           dataEditor: colInfo.editor ? colInfo.editor : undefined,
           searchKey: colInfo.searchKey,
           row: currentIndex,
-          className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex),
+          className: classNames(!(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex), hasRemark ? 'remark-cell' : null),
           dataIndex: colInfo.dataIndex,
           key: colInfo.key,
           allowClear: colInfo.allowClear,

package/dist/core/table/useRowSelection.d.ts

@@ -1,5 +1,5 @@
 import { SheetTableType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
-export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "rowSelection"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
     checked: boolean[];
 }) => any[][];

package/dist/core/table/useRowSelection.js

@@ -6,6 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { CheckViewer } from "../..";
 import { useEffect, useRef, useState } from 'react';
+import { classNames } from "../util";
 export var useRowSelection = function useRowSelection(dataSource, rowSelection, hasChildren) {
   var _dataSource$length;
   var _useState = useState(Array((_dataSource$length = dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) !== null && _dataSource$length !== void 0 ? _dataSource$length : 0).fill(false)),
@@ -28,7 +29,8 @@ export var formatSelectionData = function formatSelectionData(param) {
     columns = param.columns,
     checked = param.checked,
     rowKey = param.rowKey,
-    rowSelection = param.rowSelection;
+    rowSelection = param.rowSelection,
+    showRemark = param.showRemark;
   return dataSource.map(function (item, row) {
     var rowId = item.id || item.key || String(row);
     if (rowKey) {
@@ -64,8 +66,9 @@ export var formatSelectionData = function formatSelectionData(param) {
       });
     }
     columns.forEach(function (colInfo, col) {
-      var _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
+      var _item$remarks, _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
       var value = item[colInfo.dataIndex || ''];
+      var hasRemark = showRemark && (item === null || item === void 0 || (_item$remarks = item.remarks) === null || _item$remarks === void 0 ? void 0 : _item$remarks.includes(colInfo.dataIndex));
       rows.push({
         id: rowId,
         value: value,
@@ -77,7 +80,7 @@ export var formatSelectionData = function formatSelectionData(param) {
         valueViewer: colInfo.render ? colInfo.render : undefined,
         dataEditor: colInfo.editor ? colInfo.editor : undefined,
         searchKey: colInfo.searchKey,
-        className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, item, row),
+        className: classNames(!(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, item, row), hasRemark ? 'remark-cell' : null),
         row: row,
         col: col,
         dataIndex: colInfo.dataIndex,