tdesign-react 0.19.1 → 0.20.0

package/esm/table/base/TableCell.js

@@ -1,22 +1,22 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-bd2ff6be.js';
-import { _ as _slicedToArray } from '../../_chunks/dep-c5e94c83.js';
+import { _ as _defineProperty } from '../../_chunks/dep-31796d32.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-81bda54a.js';
 import React__default, { useState, useRef, useLayoutEffect } from 'react';
 import classNames from 'classnames';
 import useConfig from '../../_util/useConfig.js';
 import { useTableContext } from './TableContext.js';
-import '../../_chunks/dep-4ca264a0.js';
+import '../../_chunks/dep-88fe1571.js';
 import '../../config-provider/ConfigContext.js';
 import '../../locale/zh_CN.js';
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var TableCell = function TableCell(props) {
   var _classnames;
@@ -36,7 +36,8 @@ var TableCell = function TableCell(props) {
       rowIndex = props.rowIndex,
       className = props.className,
       rowSpan = props.rowSpan,
-      colSpan = props.colSpan;
+      colSpan = props.colSpan,
+      isFirstChildTdSetBorderWidth = props.isFirstChildTdSetBorderWidth;
 
   var _useConfig = useConfig(),
       classPrefix = _useConfig.classPrefix;
@@ -91,15 +92,18 @@ var TableCell = function TableCell(props) {
     cellStyle[fixed] = offset;
   }
 
-  if (width) {
-    style.overflow = "hidden";
+  if (width && !fixed) {
+    cellStyle.overflow = "hidden";
   }
 
-  var Component = "td";
-  return /* @__PURE__ */React__default.createElement(Component, {
+  if (isFirstChildTdSetBorderWidth) {
+    cellStyle.borderWidth = 1;
+  }
+
+  return /* @__PURE__ */React__default.createElement("td", {
     ref: ref,
     style: cellStyle,
-    className: classNames((_classnames = {}, _defineProperty(_classnames, "".concat(classPrefix, "-table__cell--fixed-").concat(fixed), fixed), _defineProperty(_classnames, "".concat(classPrefix, "-table__cell--fixed-").concat(fixed, "-").concat(fixed === "left" ? "last" : "first"), fixed && isBoundary), _defineProperty(_classnames, "align-".concat(align), align), _defineProperty(_classnames, "text-ellipsis", ellipsis), _defineProperty(_classnames, "".concat(className), !!className), _classnames)),
+    className: classNames((_classnames = {}, _defineProperty(_classnames, "".concat(classPrefix, "-table__cell--fixed-").concat(fixed), fixed), _defineProperty(_classnames, "".concat(classPrefix, "-table__cell--fixed-").concat(fixed, "-").concat(fixed === "left" ? "last" : "first"), fixed && isBoundary), _defineProperty(_classnames, "".concat(classPrefix, "-align-").concat(align), align), _defineProperty(_classnames, "".concat(classPrefix, "-text-ellipsis"), ellipsis), _defineProperty(_classnames, "".concat(className), !!className), _classnames)),
     rowSpan: rowSpan,
     colSpan: colSpan
   }, cellNode);

package/esm/table/base/TableCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableCell.js","sources":["../../../src/table/base/TableCell.tsx"],"sourcesContent":["import React, { CSSProperties, useRef, useLayoutEffect, useState, PropsWithChildren } from 'react';\nimport classnames from 'classnames';\nimport { BaseTableCol, DataType } from '../type';\nimport useConfig from '../../_util/useConfig';\nimport { useTableContext } from './TableContext';\n\nexport interface CellProps<D extends DataType> extends BaseTableCol<DataType> {\n  columns?: BaseTableCol[];\n  type?: 'cell' | 'title';\n  record?: D;\n  style?: CSSProperties;\n  rowIndex?: number;\n  colIndex?: number;\n  rowSpan?: number;\n  colSpan?: number;\n  customRender: Function;\n}\n\nconst TableCell = <D extends DataType>(props: PropsWithChildren<CellProps<D>>) => {\n  const {\n    style = {},\n    width,\n    type,\n    record,\n    colKey,\n    customRender,\n    colIndex,\n    fixed,\n    align,\n    ellipsis,\n    columns,\n    rowIndex,\n    className,\n    rowSpan,\n    colSpan,\n  } = props;\n\n  const { classPrefix } = useConfig();\n  const { flattenColumns } = useTableContext();\n  const [offset, setOffset] = useState(0);\n  const [isBoundary, setIsBoundary] = useState(false);\n\n  const ref = useRef<HTMLTableDataCellElement | HTMLTableHeaderCellElement>();\n\n  useLayoutEffect(() => {\n    if (ref.current) {\n      let offset = 0;\n      const { clientWidth } = ref.current;\n      const fixedColumns = flattenColumns.filter((column) => column.fixed === fixed);\n      const indexInFixedColumns = fixedColumns.findIndex(({ colKey: key }) => key === colKey);\n\n      fixedColumns.forEach((_, cur) => {\n        if ((fixed === 'right' && cur > indexInFixedColumns) || (fixed === 'left' && cur < indexInFixedColumns)) {\n          offset += clientWidth;\n        }\n      });\n      setOffset(offset);\n\n      const isBoundary = fixed === 'left' ? indexInFixedColumns === fixedColumns.length - 1 : indexInFixedColumns === 0;\n      setIsBoundary(isBoundary);\n    }\n  }, [ref, flattenColumns, colKey, fixed]);\n\n  const cellNode = customRender({ type, row: record, rowIndex, col: columns?.[colIndex], colIndex });\n\n  // ==================== styles ====================\n  const cellStyle = { ...style };\n  if (fixed) {\n    cellStyle.position = 'sticky';\n    cellStyle[fixed] = offset;\n  }\n  if (width) {\n    style.overflow = 'hidden';\n  }\n\n  // 样式依靠 td，之后实现请改为 th\n  // const Component = type === 'title' ? 'td' : 'td'; // codecc error\n  const Component = 'td';\n  return (\n    <Component\n      ref={ref}\n      style={cellStyle}\n      className={classnames({\n        [`${classPrefix}-table__cell--fixed-${fixed}`]: fixed,\n        [`${classPrefix}-table__cell--fixed-${fixed}-${fixed === 'left' ? 'last' : 'first'}`]: fixed && isBoundary,\n        [`align-${align}`]: align,\n        'text-ellipsis': ellipsis,\n        [`${className}`]: !!className,\n      })}\n      rowSpan={rowSpan}\n      colSpan={colSpan}\n    >\n      {cellNode}\n    </Component>\n  );\n};\n\nexport default TableCell;\n"],"names":["TableCell","props","style","width","type","record","colKey","customRender","colIndex","fixed","align","ellipsis","columns","rowIndex","className","rowSpan","colSpan","useConfig","classPrefix","useTableContext","flattenColumns","useState","offset","setOffset","isBoundary","setIsBoundary","ref","useRef","current","offset2","clientWidth","fixedColumns","filter","column","indexInFixedColumns","findIndex","key","forEach","_","cur","isBoundary2","length","cellNode","row","col","cellStyle","position","overflow","Component","classnames"],"mappings":";;;;;;;;;;;;;;;;;;;;IAkBMA,YAAY,SAAZA,SAAY,CAAqBC,KAArB,EAAgE;AAAA;;qBAiB5EA,MAfFC;MAAAA,kCAAQ;MACRC,QAcEF,MAdFE;MACAC,OAaEH,MAbFG;MACAC,SAYEJ,MAZFI;MACAC,SAWEL,MAXFK;MACAC,eAUEN,MAVFM;MACAC,WASEP,MATFO;MACAC,QAQER,MARFQ;MACAC,QAOET,MAPFS;MACAC,WAMEV,MANFU;MACAC,UAKEX,MALFW;MACAC,WAIEZ,MAJFY;MACAC,YAGEb,MAHFa;MACAC,UAEEd,MAFFc;MACAC,UACEf,MADFe;;mBAGsBC;MAAhBC,yBAAAA;;yBACmBC;MAAnBC,kCAAAA;;kBACoBC,SAAS;;MAA9BC;MAAQC;;mBACqBF,SAAS;;MAAtCG;MAAYC;;MAEbC,MAAMC;kBAEI,YAAM;QAChBD,IAAIE,SAAS;UACXC,UAAS;UACLC,cAAgBJ,IAAIE,QAApBE;UACFC,eAAeX,eAAeY,MAAf,CAAsB,UAACC,MAAD;AAAA,eAAYA,OAAOxB,KAAP,KAAiBA,KAA7B;AAAA,OAAtB;UACfyB,sBAAsBH,aAAaI,SAAb,CAAuB;AAAA,YAAWC,GAAX,QAAG9B,MAAH;AAAA,eAAqB8B,QAAQ9B,MAA7B;AAAA,OAAvB;mBAEf+B,QAAQ,UAACC,CAAD,EAAIC,GAAJ,EAAY;YAC1B9B,UAAU,OAAV,IAAqB8B,MAAML,mBAA3B,IAAoDzB,UAAU,MAAV,IAAoB8B,MAAML,qBAAsB;qBAC7FJ;;;gBAGJD;UAEJW,cAAa/B,UAAU,MAAV,GAAmByB,wBAAwBH,aAAaU,MAAb,GAAsB,CAAjE,GAAqEP,wBAAwB;oBAClGM;;KAEf,CAACd,GAAD,EAAMN,cAAN,EAAsBd,MAAtB,EAA8BG,KAA9B;MAEGiC,WAAWnC,aAAa;AAAEH,IAAAA,MAAAA,IAAF;AAAQuC,IAAAA,KAAKtC,MAAb;AAAqBQ,IAAAA,UAAAA,QAArB;AAA+B+B,IAAAA,KAAKhC,oBAAAA,8BAAAA,QAAUJ,SAA9C;AAAyDA,IAAAA,UAAAA;AAAzD;;MAGxBqC,8BAAiB3C;;MACnBO,OAAO;cACCqC,WAAW;cACXrC,SAASa;;;MAEjBnB,OAAO;UACH4C,WAAW;;;MAKbC,YAAY;qDAEfA,WAAD;AACEtB,IAAAA,KAAAA,GADF;AAEExB,IAAAA,OAAO2C,SAFT;AAGE/B,IAAAA,WAAWmC,qEACL/B,4CAAkCT,QAAUA,+CAC5CS,4CAAkCT,mBAASA,UAAU,MAAV,GAAmB,MAAnB,GAA4B,UAAYA,SAASe,0DACtFd,QAAUA,qCACpB,iBAAiBC,kDACbG,YAAc,CAAC,CAACA,yBARxB;AAUEC,IAAAA,SAAAA,OAVF;AAWEC,IAAAA,SAAAA;AAXF,KAaG0B;;;;;"}
+{"version":3,"file":"TableCell.js","sources":["../../../src/table/base/TableCell.tsx"],"sourcesContent":["import React, { CSSProperties, useRef, useLayoutEffect, useState, PropsWithChildren } from 'react';\nimport classnames from 'classnames';\nimport { BaseTableCol, DataType } from '../type';\nimport useConfig from '../../_util/useConfig';\nimport { useTableContext } from './TableContext';\n\nexport interface CellProps<D extends DataType> extends BaseTableCol<DataType> {\n  columns?: BaseTableCol[];\n  type?: 'cell' | 'title';\n  record?: D;\n  style?: CSSProperties;\n  rowIndex?: number;\n  colIndex?: number;\n  rowSpan?: number;\n  colSpan?: number;\n  customRender: Function;\n  isFirstChildTdSetBorderWidth?: Boolean;\n}\n\nconst TableCell = <D extends DataType>(props: PropsWithChildren<CellProps<D>>) => {\n  const {\n    style = {},\n    width,\n    type,\n    record,\n    colKey,\n    customRender,\n    colIndex,\n    fixed,\n    align,\n    ellipsis,\n    columns,\n    rowIndex,\n    className,\n    rowSpan,\n    colSpan,\n    isFirstChildTdSetBorderWidth,\n  } = props;\n\n  const { classPrefix } = useConfig();\n  const { flattenColumns } = useTableContext();\n  const [offset, setOffset] = useState(0);\n  const [isBoundary, setIsBoundary] = useState(false);\n\n  const ref = useRef<HTMLTableDataCellElement | HTMLTableHeaderCellElement>();\n\n  useLayoutEffect(() => {\n    if (ref.current) {\n      let offset = 0;\n      const { clientWidth } = ref.current;\n      const fixedColumns = flattenColumns.filter((column) => column.fixed === fixed);\n      const indexInFixedColumns = fixedColumns.findIndex(({ colKey: key }) => key === colKey);\n\n      fixedColumns.forEach((_, cur) => {\n        if ((fixed === 'right' && cur > indexInFixedColumns) || (fixed === 'left' && cur < indexInFixedColumns)) {\n          offset += clientWidth;\n        }\n      });\n      setOffset(offset);\n\n      const isBoundary = fixed === 'left' ? indexInFixedColumns === fixedColumns.length - 1 : indexInFixedColumns === 0;\n      setIsBoundary(isBoundary);\n    }\n  }, [ref, flattenColumns, colKey, fixed]);\n\n  const cellNode = customRender({ type, row: record, rowIndex, col: columns?.[colIndex], colIndex });\n\n  // ==================== styles ====================\n  const cellStyle = { ...style };\n  if (fixed) {\n    cellStyle.position = 'sticky';\n    cellStyle[fixed] = offset;\n  }\n  if (width && !fixed) {\n    cellStyle.overflow = 'hidden';\n  }\n  if (isFirstChildTdSetBorderWidth) {\n    cellStyle.borderWidth = 1;\n  }\n\n  return (\n    <td\n      ref={ref}\n      style={cellStyle}\n      className={classnames({\n        [`${classPrefix}-table__cell--fixed-${fixed}`]: fixed,\n        [`${classPrefix}-table__cell--fixed-${fixed}-${fixed === 'left' ? 'last' : 'first'}`]: fixed && isBoundary,\n        [`${classPrefix}-align-${align}`]: align,\n        [`${classPrefix}-text-ellipsis`]: ellipsis,\n        [`${className}`]: !!className,\n      })}\n      rowSpan={rowSpan}\n      colSpan={colSpan}\n    >\n      {cellNode}\n    </td>\n  );\n};\n\nexport default TableCell;\n"],"names":["TableCell","props","style","width","type","record","colKey","customRender","colIndex","fixed","align","ellipsis","columns","rowIndex","className","rowSpan","colSpan","isFirstChildTdSetBorderWidth","useConfig","classPrefix","useTableContext","flattenColumns","useState","offset","setOffset","isBoundary","setIsBoundary","ref","useRef","current","offset2","clientWidth","fixedColumns","filter","column","indexInFixedColumns","findIndex","key","forEach","_","cur","isBoundary2","length","cellNode","row","col","cellStyle","position","overflow","borderWidth","classnames"],"mappings":";;;;;;;;;;;;;;;;;;;;IAmBMA,YAAY,SAAZA,SAAY,CAAqBC,KAArB,EAAgE;AAAA;;qBAkB5EA,MAhBFC;MAAAA,kCAAQ;MACRC,QAeEF,MAfFE;MACAC,OAcEH,MAdFG;MACAC,SAaEJ,MAbFI;MACAC,SAYEL,MAZFK;MACAC,eAWEN,MAXFM;MACAC,WAUEP,MAVFO;MACAC,QASER,MATFQ;MACAC,QAQET,MARFS;MACAC,WAOEV,MAPFU;MACAC,UAMEX,MANFW;MACAC,WAKEZ,MALFY;MACAC,YAIEb,MAJFa;MACAC,UAGEd,MAHFc;MACAC,UAEEf,MAFFe;MACAC,+BACEhB,MADFgB;;mBAGsBC;MAAhBC,yBAAAA;;yBACmBC;MAAnBC,kCAAAA;;kBACoBC,SAAS;;MAA9BC;MAAQC;;mBACqBF,SAAS;;MAAtCG;MAAYC;;MAEbC,MAAMC;kBAEI,YAAM;QAChBD,IAAIE,SAAS;UACXC,UAAS;UACLC,cAAgBJ,IAAIE,QAApBE;UACFC,eAAeX,eAAeY,MAAf,CAAsB,UAACC,MAAD;AAAA,eAAYA,OAAOzB,KAAP,KAAiBA,KAA7B;AAAA,OAAtB;UACf0B,sBAAsBH,aAAaI,SAAb,CAAuB;AAAA,YAAWC,GAAX,QAAG/B,MAAH;AAAA,eAAqB+B,QAAQ/B,MAA7B;AAAA,OAAvB;mBAEfgC,QAAQ,UAACC,CAAD,EAAIC,GAAJ,EAAY;YAC1B/B,UAAU,OAAV,IAAqB+B,MAAML,mBAA3B,IAAoD1B,UAAU,MAAV,IAAoB+B,MAAML,qBAAsB;qBAC7FJ;;;gBAGJD;UAEJW,cAAahC,UAAU,MAAV,GAAmB0B,wBAAwBH,aAAaU,MAAb,GAAsB,CAAjE,GAAqEP,wBAAwB;oBAClGM;;KAEf,CAACd,GAAD,EAAMN,cAAN,EAAsBf,MAAtB,EAA8BG,KAA9B;MAEGkC,WAAWpC,aAAa;AAAEH,IAAAA,MAAAA,IAAF;AAAQwC,IAAAA,KAAKvC,MAAb;AAAqBQ,IAAAA,UAAAA,QAArB;AAA+BgC,IAAAA,KAAKjC,oBAAAA,8BAAAA,QAAUJ,SAA9C;AAAyDA,IAAAA,UAAAA;AAAzD;;MAGxBsC,8BAAiB5C;;MACnBO,OAAO;cACCsC,WAAW;cACXtC,SAASc;;;MAEjBpB,SAAS,CAACM,OAAO;cACTuC,WAAW;;;MAEnB/B,8BAA8B;cACtBgC,cAAc;;;qDAIvB,MAAD;AACEtB,IAAAA,KAAAA,GADF;AAEEzB,IAAAA,OAAO4C,SAFT;AAGEhC,IAAAA,WAAWoC,qEACL/B,4CAAkCV,QAAUA,+CAC5CU,4CAAkCV,mBAASA,UAAU,MAAV,GAAmB,MAAnB,GAA4B,UAAYA,SAASgB,oDAC5FN,+BAAqBT,QAAUA,+CAC/BS,gCAA8BR,kDAC9BG,YAAc,CAAC,CAACA,yBARxB;AAUEC,IAAAA,SAAAA,OAVF;AAWEC,IAAAA,SAAAA;AAXF,KAaG2B;;;;;"}

package/esm/table/base/TableColGroup.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */

package/esm/table/base/TableContext.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */

package/esm/table/base/TableEmptyBody.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
@@ -16,7 +16,7 @@ function TableEmptyBody(props) {
   var _props$empty = props.empty,
       empty = _props$empty === void 0 ? "\u6682\u65E0\u6570\u636E" : _props$empty;
   return /* @__PURE__ */React__default.createElement("div", {
-    className: "".concat(classPrefix, "-table--empty"),
+    className: "".concat(classPrefix, "-table__empty"),
     style: {
       borderBottom: 0
     }

package/esm/table/base/TableEmptyBody.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableEmptyBody.js","sources":["../../../src/table/base/TableEmptyBody.tsx"],"sourcesContent":["import React from 'react';\nimport useConfig from '../../_util/useConfig';\n\nexport default function TableEmptyBody(props) {\n  const { classPrefix } = useConfig();\n  const { empty = '暂无数据' } = props;\n\n  return (\n    <div className={`${classPrefix}-table--empty`} style={{ borderBottom: 0 }}>\n      {typeof empty === 'function' ? empty() : empty}\n    </div>\n  );\n}\n"],"names":["props","useConfig","classPrefix","empty","className","style","borderBottom"],"mappings":";;;;;;;;;;;wBAGuCA,OAAO;mBACpBC;MAAhBC,yBAAAA;;qBACmBF,MAAnBG;MAAAA,kCAAQ;qDAGb,OAAD;AAAKC,IAAAA,qBAAcF,6BAAnB;AAA+CG,IAAAA,OAAO;AAAEC,MAAAA,cAAc;AAAhB;AAAtD,KACG,OAAOH,KAAP,KAAiB,UAAjB,GAA8BA,OAA9B,GAAwCA;;;;;"}
+{"version":3,"file":"TableEmptyBody.js","sources":["../../../src/table/base/TableEmptyBody.tsx"],"sourcesContent":["import React from 'react';\nimport useConfig from '../../_util/useConfig';\n\nexport default function TableEmptyBody(props) {\n  const { classPrefix } = useConfig();\n  const { empty = '暂无数据' } = props;\n\n  return (\n    <div className={`${classPrefix}-table__empty`} style={{ borderBottom: 0 }}>\n      {typeof empty === 'function' ? empty() : empty}\n    </div>\n  );\n}\n"],"names":["props","useConfig","classPrefix","empty","className","style","borderBottom"],"mappings":";;;;;;;;;;;wBAGuCA,OAAO;mBACpBC;MAAhBC,yBAAAA;;qBACmBF,MAAnBG;MAAAA,kCAAQ;qDAGb,OAAD;AAAKC,IAAAA,qBAAcF,6BAAnB;AAA+CG,IAAAA,OAAO;AAAEC,MAAAA,cAAc;AAAhB;AAAtD,KACG,OAAOH,KAAP,KAAiB,UAAjB,GAA8BA,OAA9B,GAAwCA;;;;;"}

package/esm/table/base/TableFooter.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */

package/esm/table/base/TableHeader.d.ts

@@ -6,5 +6,5 @@ interface TableHeaderProps<D extends DataType> {
         style?: Styles;
     })[];
 }
-declare const TableHeader: <D extends DataType>(props: TableHeaderProps<D>) => JSX.Element;
+declare const TableHeader: <D extends import("../type").TableRowData>(props: TableHeaderProps<D>) => JSX.Element;
 export default TableHeader;

package/esm/table/base/TableHeader.js

@@ -1,22 +1,22 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _toConsumableArray } from '../../_chunks/dep-6d27991d.js';
-import { _ as _defineProperty } from '../../_chunks/dep-bd2ff6be.js';
-import { _ as _objectWithoutProperties } from '../../_chunks/dep-21185a7d.js';
+import { _ as _toConsumableArray } from '../../_chunks/dep-ff66d271.js';
+import { _ as _defineProperty } from '../../_chunks/dep-31796d32.js';
+import { _ as _objectWithoutProperties } from '../../_chunks/dep-252337e0.js';
 import React__default, { isValidElement } from 'react';
-import { i as isFunction_1 } from '../../_chunks/dep-dabea1d1.js';
+import { i as isFunction_1 } from '../../_chunks/dep-27282969.js';
 import TableCell from './TableCell.js';
-import '../../_chunks/dep-4ca264a0.js';
-import '../../_chunks/dep-3796d701.js';
-import '../../_chunks/dep-a17dbe80.js';
-import '../../_chunks/dep-a6296075.js';
-import '../../_chunks/dep-7e18698b.js';
-import '../../_chunks/dep-b48a9335.js';
-import '../../_chunks/dep-c5e94c83.js';
+import '../../_chunks/dep-88fe1571.js';
+import '../../_chunks/dep-e2373ef6.js';
+import '../../_chunks/dep-cebb3b28.js';
+import '../../_chunks/dep-bf215a19.js';
+import '../../_chunks/dep-c3526061.js';
+import '../../_chunks/dep-7c1ece64.js';
+import '../../_chunks/dep-81bda54a.js';
 import 'classnames';
 import '../../_util/useConfig.js';
 import '../../config-provider/ConfigContext.js';
@@ -26,9 +26,9 @@ import './TableContext.js';
 var _excluded = ["children"],
     _excluded2 = ["title", "colKey", "rowSpan", "colSpan", "render"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var TableHeader = function TableHeader(props) {
   var columns = props.columns;
@@ -156,9 +156,25 @@ var TableHeader = function TableHeader(props) {
     };
   }
 
-  return /* @__PURE__ */React__default.createElement("thead", null, trsColumns.map(function (trsColumnsItem, index) {
+  function getIsFirstChildTdSetBorderWidth(_ref5) {
+    var trsColumns2 = _ref5.trsColumns,
+        rowIndex = _ref5.rowIndex,
+        colIndex = _ref5.colIndex;
+
+    if (colIndex === 0 && rowIndex > 0) {
+      var preRowColumns = trsColumns2[rowIndex - 1];
+
+      if (preRowColumns[0].rowSpan > 1) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  return /* @__PURE__ */React__default.createElement("thead", null, trsColumns.map(function (trsColumnsItem, rowIndex) {
     return /* @__PURE__ */React__default.createElement("tr", {
-      key: index
+      key: rowIndex
     }, trsColumnsItem.map(function (column, colIndex) {
       var title = column.title,
           colKey = column.colKey,
@@ -171,6 +187,11 @@ var TableHeader = function TableHeader(props) {
         title: title,
         render: render
       });
+      var isFirstChildTdSetBorderWidth = getIsFirstChildTdSetBorderWidth({
+        trsColumns: trsColumns,
+        rowIndex: rowIndex,
+        colIndex: colIndex
+      });
       return /* @__PURE__ */React__default.createElement(TableCell, _objectSpread({
         type: "title",
         key: colKey,
@@ -178,7 +199,8 @@ var TableHeader = function TableHeader(props) {
         colIndex: colIndex,
         customRender: customRender,
         rowSpan: rowSpan,
-        colSpan: colSpan
+        colSpan: colSpan,
+        isFirstChildTdSetBorderWidth: isFirstChildTdSetBorderWidth
       }, rest));
     }));
   }));

package/esm/table/base/TableHeader.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableHeader.js","sources":["../../../src/table/base/TableHeader.tsx"],"sourcesContent":["import React, { isValidElement } from 'react';\nimport isFunction from 'lodash/isFunction';\nimport { BaseTableCol, DataType } from '../type';\nimport TableCell, { CellProps } from './TableCell';\nimport { Styles } from '../../common';\n\ninterface TableHeaderProps<D extends DataType> {\n  columns: (BaseTableCol<D> & { style?: Styles })[];\n}\n\nconst TableHeader = <D extends DataType>(props: TableHeaderProps<D>) => {\n  const { columns } = props;\n  const columnsDepth = getNodeDepth(columns);\n  const trsColumns = getTrsColumns(columns, columnsDepth);\n\n  function getTrsColumns(nodes, columnsDepth, currentDepth = 1, trsColumns = []): CellProps<D>[][] {\n    let trsColumnsNew = trsColumns;\n    nodes.forEach((item) => {\n      const { children, ...rest } = item;\n      if (item.children) {\n        trsColumnsNew = getTrsColumns(children, columnsDepth, currentDepth + 1, trsColumnsNew);\n      }\n      const trIndex = currentDepth - 1;\n      const currentTr = trsColumns[trIndex];\n      const { rowSpan, colSpan } = getRowSpanAndColSpan({ node: item, columnsDepth, currentDepth });\n      const tdIndex = !currentTr ? 0 : currentTr.length;\n      const currentTd = { colKey: `tr-${trIndex}_td-${tdIndex}`, ...rest, rowSpan, colSpan };\n      if (!currentTr) {\n        trsColumnsNew[trIndex] = [currentTd];\n      } else {\n        trsColumnsNew[trIndex] = [...currentTr, currentTd];\n      }\n    });\n    return trsColumnsNew;\n  }\n\n  function getRowSpanAndColSpan({ node, columnsDepth, currentDepth }) {\n    let rowSpan = 1;\n    let colSpan = 1;\n    if (node.children) {\n      rowSpan = 1;\n      colSpan = getLeafNodeCount(node.children);\n    } else {\n      rowSpan = columnsDepth - currentDepth + 1;\n      colSpan = 1;\n    }\n    return {\n      rowSpan,\n      colSpan,\n    };\n  }\n\n  function getNodeDepth(nodes, currentDepth = 1, depth = 1) {\n    let depthNew = depth;\n    let currentDepthNew = currentDepth;\n    nodes?.forEach(({ children }) => {\n      if (children) {\n        currentDepthNew += 1;\n        if (currentDepthNew > depthNew) {\n          depthNew = currentDepthNew;\n        }\n        depthNew = getNodeDepth(children, currentDepthNew, depthNew);\n      }\n    });\n    return depthNew;\n  }\n\n  function getLeafNodeCount(nodes, count = 0) {\n    let countNew = count;\n    nodes.forEach(({ children }) => {\n      if (children) {\n        countNew = getLeafNodeCount(children, countNew);\n      } else {\n        countNew += 1;\n      }\n    });\n    return countNew;\n  }\n\n  function getCustomRender({ title, render }) {\n    if (typeof title === 'string' || isValidElement(title)) {\n      return () => title;\n    }\n    if (isFunction(title)) {\n      return title;\n    }\n    if (isFunction(render)) {\n      return render;\n    }\n    return () => null;\n  }\n\n  return (\n    <thead>\n      {trsColumns.map((trsColumnsItem: CellProps<D>[], index) => (\n        <tr key={index}>\n          {trsColumnsItem.map((column: CellProps<D>, colIndex) => {\n            const { title, colKey, rowSpan, colSpan, render, ...rest } = column;\n            const customRender = getCustomRender({ title, render });\n\n            return (\n              <TableCell\n                type=\"title\"\n                key={colKey}\n                colKey={colKey}\n                colIndex={colIndex}\n                customRender={customRender}\n                rowSpan={rowSpan}\n                colSpan={colSpan}\n                {...rest}\n              ></TableCell>\n            );\n          })}\n        </tr>\n      ))}\n    </thead>\n  );\n};\n\nexport default TableHeader;\n"],"names":["TableHeader","props","columns","columnsDepth","getNodeDepth","trsColumns","getTrsColumns","nodes","columnsDepth2","currentDepth","trsColumns2","trsColumnsNew","forEach","item","children","rest","trIndex","currentTr","getRowSpanAndColSpan","node","rowSpan","colSpan","tdIndex","length","currentTd","colKey","getLeafNodeCount","depth","depthNew","currentDepthNew","count","countNew","title","render","isValidElement","isFunction","map","trsColumnsItem","index","key","column","colIndex","customRender","getCustomRender","TableCell","type"],"mappings":"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"}
+{"version":3,"file":"TableHeader.js","sources":["../../../src/table/base/TableHeader.tsx"],"sourcesContent":["import React, { isValidElement } from 'react';\nimport isFunction from 'lodash/isFunction';\nimport { BaseTableCol, DataType } from '../type';\nimport TableCell, { CellProps } from './TableCell';\nimport { Styles } from '../../common';\n\ninterface TableHeaderProps<D extends DataType> {\n  columns: (BaseTableCol<D> & { style?: Styles })[];\n}\n\nconst TableHeader = <D extends DataType>(props: TableHeaderProps<D>) => {\n  const { columns } = props;\n  const columnsDepth = getNodeDepth(columns);\n  const trsColumns = getTrsColumns(columns, columnsDepth);\n\n  function getTrsColumns(nodes, columnsDepth, currentDepth = 1, trsColumns = []): CellProps<D>[][] {\n    let trsColumnsNew = trsColumns;\n    nodes.forEach((item) => {\n      const { children, ...rest } = item;\n      if (item.children) {\n        trsColumnsNew = getTrsColumns(children, columnsDepth, currentDepth + 1, trsColumnsNew);\n      }\n      const trIndex = currentDepth - 1;\n      const currentTr = trsColumns[trIndex];\n      const { rowSpan, colSpan } = getRowSpanAndColSpan({ node: item, columnsDepth, currentDepth });\n      const tdIndex = !currentTr ? 0 : currentTr.length;\n      const currentTd = { colKey: `tr-${trIndex}_td-${tdIndex}`, ...rest, rowSpan, colSpan };\n      if (!currentTr) {\n        trsColumnsNew[trIndex] = [currentTd];\n      } else {\n        trsColumnsNew[trIndex] = [...currentTr, currentTd];\n      }\n    });\n    return trsColumnsNew;\n  }\n\n  function getRowSpanAndColSpan({ node, columnsDepth, currentDepth }) {\n    let rowSpan = 1;\n    let colSpan = 1;\n    if (node.children) {\n      rowSpan = 1;\n      colSpan = getLeafNodeCount(node.children);\n    } else {\n      rowSpan = columnsDepth - currentDepth + 1;\n      colSpan = 1;\n    }\n    return {\n      rowSpan,\n      colSpan,\n    };\n  }\n\n  function getNodeDepth(nodes, currentDepth = 1, depth = 1) {\n    let depthNew = depth;\n    let currentDepthNew = currentDepth;\n    nodes?.forEach(({ children }) => {\n      if (children) {\n        currentDepthNew += 1;\n        if (currentDepthNew > depthNew) {\n          depthNew = currentDepthNew;\n        }\n        depthNew = getNodeDepth(children, currentDepthNew, depthNew);\n      }\n    });\n    return depthNew;\n  }\n\n  function getLeafNodeCount(nodes, count = 0) {\n    let countNew = count;\n    nodes.forEach(({ children }) => {\n      if (children) {\n        countNew = getLeafNodeCount(children, countNew);\n      } else {\n        countNew += 1;\n      }\n    });\n    return countNew;\n  }\n\n  function getCustomRender({ title, render }) {\n    if (typeof title === 'string' || isValidElement(title)) {\n      return () => title;\n    }\n    if (isFunction(title)) {\n      return title;\n    }\n    if (isFunction(render)) {\n      return render;\n    }\n    return () => null;\n  }\n\n  /**\n   * 行的第一列td css设置borderWidth为0（其余列默认为1），上一行第一列存在跨行时，需补回该borderWidth为1\n   */\n  function getIsFirstChildTdSetBorderWidth({ trsColumns, rowIndex, colIndex }) {\n    if (colIndex === 0 && rowIndex > 0) {\n      const preRowColumns = trsColumns[rowIndex - 1];\n      if (preRowColumns[0].rowSpan > 1) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  return (\n    <thead>\n      {trsColumns.map((trsColumnsItem: CellProps<D>[], rowIndex) => (\n        <tr key={rowIndex}>\n          {trsColumnsItem.map((column: CellProps<D>, colIndex) => {\n            const { title, colKey, rowSpan, colSpan, render, ...rest } = column;\n            const customRender = getCustomRender({ title, render });\n            const isFirstChildTdSetBorderWidth = getIsFirstChildTdSetBorderWidth({ trsColumns, rowIndex, colIndex });\n\n            return (\n              <TableCell\n                type=\"title\"\n                key={colKey}\n                colKey={colKey}\n                colIndex={colIndex}\n                customRender={customRender}\n                rowSpan={rowSpan}\n                colSpan={colSpan}\n                isFirstChildTdSetBorderWidth={isFirstChildTdSetBorderWidth}\n                {...rest}\n              ></TableCell>\n            );\n          })}\n        </tr>\n      ))}\n    </thead>\n  );\n};\n\nexport default TableHeader;\n"],"names":["TableHeader","props","columns","columnsDepth","getNodeDepth","trsColumns","getTrsColumns","nodes","columnsDepth2","currentDepth","trsColumns2","trsColumnsNew","forEach","item","children","rest","trIndex","currentTr","getRowSpanAndColSpan","node","rowSpan","colSpan","tdIndex","length","currentTd","colKey","getLeafNodeCount","depth","depthNew","currentDepthNew","count","countNew","title","render","isValidElement","isFunction","rowIndex","colIndex","preRowColumns","map","trsColumnsItem","key","column","customRender","getCustomRender","isFirstChildTdSetBorderWidth","getIsFirstChildTdSetBorderWidth","TableCell","type"],"mappings":"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"}

package/esm/table/base/TableLoadingBody.js

@@ -1,15 +1,15 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { i as isFunction_1 } from '../../_chunks/dep-dabea1d1.js';
-import '../../_chunks/dep-3796d701.js';
-import '../../_chunks/dep-a17dbe80.js';
-import '../../_chunks/dep-a6296075.js';
-import '../../_chunks/dep-7e18698b.js';
-import '../../_chunks/dep-b48a9335.js';
+import { i as isFunction_1 } from '../../_chunks/dep-27282969.js';
+import '../../_chunks/dep-e2373ef6.js';
+import '../../_chunks/dep-cebb3b28.js';
+import '../../_chunks/dep-bf215a19.js';
+import '../../_chunks/dep-c3526061.js';
+import '../../_chunks/dep-7c1ece64.js';
 
 function TableLoadingBody(props) {
   var loading = props.loading;

package/esm/table/base/TableRow.d.ts

@@ -1,18 +1,23 @@
 /// <reference types="react" />
-import { DataType, TdBaseTableProps } from '../type';
-import { RowSkipTdSpanColIndexsMap } from './TableBody';
+import { DataType, TdBaseTableProps, TdPrimaryTableProps } from '../type';
+import { RowSkipTdSpanColIndexsMap, RowEvents } from './TableBody';
+import { ExpandInnerProps } from './Table';
 interface MergeCellsProps {
     rowspanAndColspan?: TdBaseTableProps['rowspanAndColspan'];
     isRowspanAndColspanFn?: boolean;
     rowSkipTdSpanColIndexsMap?: RowSkipTdSpanColIndexsMap;
     dataLength?: number;
 }
-interface RowProps<D extends DataType> extends MergeCellsProps {
+interface ExpandProps extends ExpandInnerProps {
+    expandedRow?: TdPrimaryTableProps['expandedRow'];
+    expandOnRowClick?: TdPrimaryTableProps['expandOnRowClick'];
+}
+interface RowProps<D extends DataType> extends MergeCellsProps, ExpandProps {
     record: D;
     rowClassName?: TdBaseTableProps['rowClassName'];
     rowIndex?: number;
-    onTrClick?: () => void;
-    expandOnRowClick?: boolean;
+    rowEvents?: RowEvents;
+    rowKey: TdBaseTableProps['rowKey'];
 }
-declare const TableRow: <D extends DataType>(props: RowProps<D>) => JSX.Element;
+declare const TableRow: <D extends import("../type").TableRowData>(props: RowProps<D>) => JSX.Element;
 export default TableRow;

package/esm/table/base/TableRow.js

@@ -1,32 +1,32 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-bd2ff6be.js';
-import { _ as _objectWithoutProperties } from '../../_chunks/dep-21185a7d.js';
+import { _ as _defineProperty } from '../../_chunks/dep-31796d32.js';
+import { _ as _objectWithoutProperties } from '../../_chunks/dep-252337e0.js';
 import React__default, { isValidElement } from 'react';
-import { g as get_1 } from '../../_chunks/dep-02952992.js';
-import { i as isFunction_1 } from '../../_chunks/dep-dabea1d1.js';
+import { g as get_1 } from '../../_chunks/dep-9025a74a.js';
+import { i as isFunction_1 } from '../../_chunks/dep-27282969.js';
 import { useTableContext } from './TableContext.js';
 import TableCell from './TableCell.js';
-import '../../_chunks/dep-3796d701.js';
-import '../../_chunks/dep-00019a7f.js';
-import '../../_chunks/dep-43b6ec11.js';
-import '../../_chunks/dep-53bb8c23.js';
-import '../../_chunks/dep-a6296075.js';
-import '../../_chunks/dep-c060cbaa.js';
-import '../../_chunks/dep-a17dbe80.js';
-import '../../_chunks/dep-88b2f549.js';
-import '../../_chunks/dep-52f056ee.js';
-import '../../_chunks/dep-4cfb170f.js';
-import '../../_chunks/dep-7e18698b.js';
-import '../../_chunks/dep-b48a9335.js';
-import '../../_chunks/dep-fbe7c735.js';
-import '../../_chunks/dep-c8d6ce97.js';
-import '../../_chunks/dep-c5e94c83.js';
-import '../../_chunks/dep-4ca264a0.js';
+import '../../_chunks/dep-e2373ef6.js';
+import '../../_chunks/dep-48be8fe9.js';
+import '../../_chunks/dep-02feec19.js';
+import '../../_chunks/dep-0f564970.js';
+import '../../_chunks/dep-bf215a19.js';
+import '../../_chunks/dep-4eebb4d5.js';
+import '../../_chunks/dep-cebb3b28.js';
+import '../../_chunks/dep-1cc29dd4.js';
+import '../../_chunks/dep-3959eba0.js';
+import '../../_chunks/dep-28a3624e.js';
+import '../../_chunks/dep-c3526061.js';
+import '../../_chunks/dep-7c1ece64.js';
+import '../../_chunks/dep-9fc2fb1e.js';
+import '../../_chunks/dep-7ed5b2c7.js';
+import '../../_chunks/dep-81bda54a.js';
+import '../../_chunks/dep-88fe1571.js';
 import 'classnames';
 import '../../_util/useConfig.js';
 import '../../config-provider/ConfigContext.js';
@@ -34,20 +34,24 @@ import '../../locale/zh_CN.js';
 
 var _excluded = ["colKey", "cell", "render"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var TableRow = function TableRow(props) {
   var record = props.record,
       rowClassName = props.rowClassName,
       rowIndex = props.rowIndex,
+      rowKey = props.rowKey,
       rowspanAndColspan = props.rowspanAndColspan,
       isRowspanAndColspanFn = props.isRowspanAndColspanFn,
       rowSkipTdSpanColIndexsMap = props.rowSkipTdSpanColIndexsMap,
       dataLength = props.dataLength,
-      onTrClick = props.onTrClick,
-      expandOnRowClick = props.expandOnRowClick;
+      _props$rowEvents = props.rowEvents,
+      rowEvents = _props$rowEvents === void 0 ? {} : _props$rowEvents,
+      expandedRow = props.expandedRow,
+      expandOnRowClick = props.expandOnRowClick,
+      handleExpandChange = props.handleExpandChange;
 
   var _useTableContext = useTableContext(),
       flattenColumns = _useTableContext.flattenColumns;
@@ -70,7 +74,8 @@ var TableRow = function TableRow(props) {
     }),
         isSkipRenderTd = _getRowSpanAndColSpan.isSkipRenderTd,
         rowSpan = _getRowSpanAndColSpan.rowSpan,
-        colSpan = _getRowSpanAndColSpan.colSpan;
+        colSpan = _getRowSpanAndColSpan.colSpan,
+        isFirstChildTdSetBorderWidth = _getRowSpanAndColSpan.isFirstChildTdSetBorderWidth;
 
     if (isSkipRenderTd) {
       return null;
@@ -92,7 +97,8 @@ var TableRow = function TableRow(props) {
       columns: flattenColumns,
       customRender: customRender,
       rowSpan: rowSpan,
-      colSpan: colSpan
+      colSpan: colSpan,
+      isFirstChildTdSetBorderWidth: isFirstChildTdSetBorderWidth
     }, restColumnProps));
   });
   var classes = rowClassName;
@@ -140,6 +146,7 @@ var TableRow = function TableRow(props) {
     var rowSpan;
     var colSpan;
     var isSkipRenderTd = false;
+    var isFirstChildTdSetBorderWidth = false;
 
     if (isRowspanAndColspanFn2) {
       var _rowSkipTdSpanColInde;
@@ -189,12 +196,17 @@ var TableRow = function TableRow(props) {
       }
 
       isSkipRenderTd = (_rowSkipTdSpanColInde = rowSkipTdSpanColIndexsMap2[rowIndex2]) === null || _rowSkipTdSpanColInde === void 0 ? void 0 : _rowSkipTdSpanColInde.includes(colIndex);
+      isFirstChildTdSetBorderWidth = getIsFirstChildTdSetBorderWidth({
+        rowSkipTdSpanColIndexsMap: rowSkipTdSpanColIndexsMap2,
+        rowIndex: rowIndex2
+      });
     }
 
     return {
       rowSpan: rowSpan,
       colSpan: colSpan,
-      isSkipRenderTd: isSkipRenderTd
+      isSkipRenderTd: isSkipRenderTd,
+      isFirstChildTdSetBorderWidth: isFirstChildTdSetBorderWidth
     };
   }
 
@@ -214,11 +226,49 @@ var TableRow = function TableRow(props) {
     return rowSkipTdSpanColIndexs;
   }
 
-  return /* @__PURE__ */React__default.createElement("tr", _objectSpread({
+  function getIsFirstChildTdSetBorderWidth(_ref4) {
+    var rowSkipTdSpanColIndexsMap2 = _ref4.rowSkipTdSpanColIndexsMap,
+        rowIndex2 = _ref4.rowIndex;
+
+    if (rowIndex2 > 0) {
+      var rowSkipTdSpanColIndexs = rowSkipTdSpanColIndexsMap2 === null || rowSkipTdSpanColIndexsMap2 === void 0 ? void 0 : rowSkipTdSpanColIndexsMap2[rowIndex2];
+
+      if (rowSkipTdSpanColIndexs && rowSkipTdSpanColIndexs[0] === 0) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  function getExpandOnClickEvent() {
+    if (expandOnRowClick && expandedRow) {
+      var apiEvent = rowEvents.onClick;
+      var rowKeyValue = get_1(record, rowKey) || rowIndex;
+      var onClick;
+
+      if (apiEvent) {
+        onClick = function onClick(e) {
+          apiEvent(e);
+          handleExpandChange(record, rowKeyValue);
+        };
+      } else {
+        onClick = function onClick() {
+          handleExpandChange(record, rowKeyValue);
+        };
+      }
+
+      return {
+        onClick: onClick
+      };
+    }
+
+    return {};
+  }
+
+  return /* @__PURE__ */React__default.createElement("tr", _objectSpread(_objectSpread({
     className: classes
-  }, expandOnRowClick ? {
-    onClick: onTrClick
-  } : {}), baseRow);
+  }, rowEvents), getExpandOnClickEvent()), baseRow);
 };
 
 export { TableRow as default };

package/esm/table/base/TableRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableRow.js","sources":["../../../src/table/base/TableRow.tsx"],"sourcesContent":["import React, { isValidElement } from 'react';\nimport get from 'lodash/get';\nimport isFunction from 'lodash/isFunction';\nimport { useTableContext } from './TableContext';\nimport TableCell from './TableCell';\nimport { DataType, TdBaseTableProps, RowspanColspan, RowspanAndColspanParams } from '../type';\nimport { RowSkipTdSpanColIndexsMap } from './TableBody';\n\ninterface MergeCellsProps {\n  rowspanAndColspan?: TdBaseTableProps['rowspanAndColspan'];\n  isRowspanAndColspanFn?: boolean;\n  rowSkipTdSpanColIndexsMap?: RowSkipTdSpanColIndexsMap;\n  dataLength?: number;\n}\n\ninterface RowProps<D extends DataType> extends MergeCellsProps {\n  record: D;\n  rowClassName?: TdBaseTableProps['rowClassName'];\n  rowIndex?: number;\n  onTrClick?: () => void;\n  expandOnRowClick?: boolean;\n}\n\nconst TableRow = <D extends DataType>(props: RowProps<D>) => {\n  const {\n    record,\n    rowClassName,\n    rowIndex,\n    rowspanAndColspan,\n    isRowspanAndColspanFn,\n    rowSkipTdSpanColIndexsMap,\n    dataLength,\n    onTrClick,\n    expandOnRowClick,\n  } = props;\n  const { flattenColumns } = useTableContext();\n  const flattenColumnsLength = flattenColumns?.length;\n\n  const baseRow = flattenColumns.map((column, colIndex) => {\n    const { colKey, cell, render, ...restColumnProps } = column;\n\n    const { isSkipRenderTd, rowSpan, colSpan } = getRowSpanAndColSpanAndIsSkipRenderTd({\n      isRowspanAndColspanFn,\n      rowspanAndColspan,\n      rowSkipTdSpanColIndexsMap,\n      rowIndex,\n      colIndex,\n      col: column,\n      row: record,\n    });\n\n    if (isSkipRenderTd) {\n      return null;\n    }\n\n    const customRender = getCustomRender({ record, colKey, cell, render });\n\n    return (\n      <TableCell\n        key={colKey}\n        type=\"cell\"\n        rowIndex={rowIndex}\n        colIndex={colIndex}\n        record={record}\n        colKey={colKey}\n        columns={flattenColumns}\n        customRender={customRender}\n        rowSpan={rowSpan}\n        colSpan={colSpan}\n        {...restColumnProps}\n      />\n    );\n  });\n\n  let classes = rowClassName as string;\n  if (typeof rowClassName === 'function') {\n    classes = rowClassName({ row: record, rowIndex });\n  }\n\n  function getCustomRender({ record, colKey, cell, render }) {\n    if (typeof cell === 'string' || isValidElement(cell)) {\n      return () => cell;\n    }\n    if (isFunction(cell)) {\n      return cell;\n    }\n    if (isFunction(render)) {\n      return render;\n    }\n    return () => get(record, colKey);\n  }\n\n  function getRowSpanAndColSpanAndIsSkipRenderTd({\n    isRowspanAndColspanFn,\n    rowspanAndColspan,\n    rowSkipTdSpanColIndexsMap,\n    rowIndex,\n    colIndex,\n    col,\n    row,\n  }: MergeCellsProps & RowspanAndColspanParams<DataType>): {\n    rowSpan: number | undefined;\n    colSpan: number | undefined;\n    isSkipRenderTd: boolean;\n  } {\n    let rowSpan;\n    let colSpan;\n    let isSkipRenderTd = false;\n\n    if (isRowspanAndColspanFn) {\n      const rowspanAndColspanValue: RowspanColspan = rowspanAndColspan({\n        rowIndex,\n        colIndex,\n        col,\n        row,\n      });\n\n      const isRowspanAndColspanValueValid =\n        rowspanAndColspanValue && (rowspanAndColspanValue.rowspan || rowspanAndColspanValue.colspan);\n      if (isRowspanAndColspanValueValid) {\n        rowSpan = rowspanAndColspanValue.rowspan;\n        colSpan = rowspanAndColspanValue.colspan;\n\n        if (colSpan && colSpan > 1 && colSpan < flattenColumnsLength) {\n          const minIndex = colIndex + 1;\n          const maxIndex = colIndex + colSpan;\n          const rowSkipTdSpanColIndexs = getRowSkipTdSpanColIndexs({\n            minIndex,\n            maxIndex,\n            rowSkipTdSpanColIndexsMap,\n            rowIndex,\n          });\n          rowSkipTdSpanColIndexsMap[rowIndex] = rowSkipTdSpanColIndexs; // eslint-disable-line\n        }\n\n        if (rowSpan && rowSpan > 1 && rowSpan < dataLength) {\n          const minRowIndex = rowIndex + 1;\n          const maxRowIndex = rowIndex + rowSpan;\n          const minIndex = colIndex;\n          const maxIndex = colIndex + colSpan;\n          Array.from(new Array(maxRowIndex - minRowIndex)).forEach((item, index) => {\n            const skipRowIndex = index + minRowIndex;\n            const rowSkipTdSpanColIndexs = getRowSkipTdSpanColIndexs({\n              minIndex,\n              maxIndex,\n              rowSkipTdSpanColIndexsMap,\n              rowIndex: skipRowIndex,\n            });\n            rowSkipTdSpanColIndexsMap[skipRowIndex] = rowSkipTdSpanColIndexs; // eslint-disable-line\n          });\n        }\n      }\n      isSkipRenderTd = rowSkipTdSpanColIndexsMap[rowIndex]?.includes(colIndex);\n    }\n\n    return {\n      rowSpan,\n      colSpan,\n      isSkipRenderTd,\n    };\n  }\n\n  function getRowSkipTdSpanColIndexs({ minIndex, maxIndex, rowSkipTdSpanColIndexsMap, rowIndex }): number[] {\n    const rowSkipTdSpanColIndexs = rowSkipTdSpanColIndexsMap[rowIndex] || [];\n\n    Array.from(new Array(maxIndex - minIndex)).forEach((item, index) => {\n      const skipColIndex = index + minIndex;\n      if (!rowSkipTdSpanColIndexs.includes(skipColIndex)) {\n        rowSkipTdSpanColIndexs.push(skipColIndex);\n      }\n    });\n\n    return rowSkipTdSpanColIndexs;\n  }\n\n  return (\n    <tr className={classes} {...(expandOnRowClick ? { onClick: onTrClick } : {})}>\n      {baseRow}\n    </tr>\n  );\n};\n\nexport default TableRow;\n"],"names":["TableRow","props","record","rowClassName","rowIndex","rowspanAndColspan","isRowspanAndColspanFn","rowSkipTdSpanColIndexsMap","dataLength","onTrClick","expandOnRowClick","useTableContext","flattenColumns","flattenColumnsLength","length","baseRow","map","column","colIndex","colKey","cell","render","restColumnProps","getRowSpanAndColSpanAndIsSkipRenderTd","col","row","isSkipRenderTd","rowSpan","colSpan","customRender","getCustomRender","TableCell","key","type","columns","classes","isValidElement","isFunction","get","record2","isRowspanAndColspanFn2","rowspanAndColspanValue","rowspanAndColspan2","isRowspanAndColspanValueValid","rowspan","colspan","minIndex","maxIndex","rowSkipTdSpanColIndexs","getRowSkipTdSpanColIndexs","rowIndex2","minRowIndex","maxRowIndex","from","Array","forEach","item","index","skipRowIndex","rowSkipTdSpanColIndexsMap2","includes","skipColIndex","push","className","onClick"],"mappings":"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"}
+{"version":3,"file":"TableRow.js","sources":["../../../src/table/base/TableRow.tsx"],"sourcesContent":["import React, { isValidElement } from 'react';\nimport get from 'lodash/get';\nimport isFunction from 'lodash/isFunction';\nimport { useTableContext } from './TableContext';\nimport TableCell from './TableCell';\nimport { DataType, TdBaseTableProps, RowspanColspan, RowspanAndColspanParams, TdPrimaryTableProps } from '../type';\nimport { RowSkipTdSpanColIndexsMap, RowEvents } from './TableBody';\nimport { ExpandInnerProps } from './Table';\n\ninterface MergeCellsProps {\n  rowspanAndColspan?: TdBaseTableProps['rowspanAndColspan'];\n  isRowspanAndColspanFn?: boolean;\n  rowSkipTdSpanColIndexsMap?: RowSkipTdSpanColIndexsMap;\n  dataLength?: number;\n}\ninterface ExpandProps extends ExpandInnerProps {\n  expandedRow?: TdPrimaryTableProps['expandedRow'];\n  expandOnRowClick?: TdPrimaryTableProps['expandOnRowClick'];\n}\ninterface RowProps<D extends DataType> extends MergeCellsProps, ExpandProps {\n  record: D;\n  rowClassName?: TdBaseTableProps['rowClassName'];\n  rowIndex?: number;\n  rowEvents?: RowEvents;\n  rowKey: TdBaseTableProps['rowKey'];\n}\n\nconst TableRow = <D extends DataType>(props: RowProps<D>) => {\n  const {\n    record,\n    rowClassName,\n    rowIndex,\n    rowKey,\n    rowspanAndColspan,\n    isRowspanAndColspanFn,\n    rowSkipTdSpanColIndexsMap,\n    dataLength,\n    rowEvents = {},\n    expandedRow,\n    expandOnRowClick,\n    handleExpandChange,\n  } = props;\n  const { flattenColumns } = useTableContext();\n  const flattenColumnsLength = flattenColumns?.length;\n  const baseRow = flattenColumns.map((column, colIndex) => {\n    const { colKey, cell, render, ...restColumnProps } = column;\n\n    const { isSkipRenderTd, rowSpan, colSpan, isFirstChildTdSetBorderWidth } = getRowSpanAndColSpanAndIsSkipRenderTd({\n      isRowspanAndColspanFn,\n      rowspanAndColspan,\n      rowSkipTdSpanColIndexsMap,\n      rowIndex,\n      colIndex,\n      col: column,\n      row: record,\n    });\n\n    if (isSkipRenderTd) {\n      return null;\n    }\n\n    const customRender = getCustomRender({ record, colKey, cell, render });\n\n    return (\n      <TableCell\n        key={colKey}\n        type=\"cell\"\n        rowIndex={rowIndex}\n        colIndex={colIndex}\n        record={record}\n        colKey={colKey}\n        columns={flattenColumns}\n        customRender={customRender}\n        rowSpan={rowSpan}\n        colSpan={colSpan}\n        isFirstChildTdSetBorderWidth={isFirstChildTdSetBorderWidth}\n        {...restColumnProps}\n      />\n    );\n  });\n\n  let classes = rowClassName as string;\n  if (typeof rowClassName === 'function') {\n    classes = rowClassName({ row: record, rowIndex });\n  }\n\n  function getCustomRender({ record, colKey, cell, render }) {\n    if (typeof cell === 'string' || isValidElement(cell)) {\n      return () => cell;\n    }\n    if (isFunction(cell)) {\n      return cell;\n    }\n    if (isFunction(render)) {\n      return render;\n    }\n    return () => get(record, colKey);\n  }\n\n  function getRowSpanAndColSpanAndIsSkipRenderTd({\n    isRowspanAndColspanFn,\n    rowspanAndColspan,\n    rowSkipTdSpanColIndexsMap,\n    rowIndex,\n    colIndex,\n    col,\n    row,\n  }: MergeCellsProps & RowspanAndColspanParams<DataType>): {\n    rowSpan: number | undefined;\n    colSpan: number | undefined;\n    isSkipRenderTd: boolean;\n    isFirstChildTdSetBorderWidth: boolean;\n  } {\n    let rowSpan;\n    let colSpan;\n    let isSkipRenderTd = false;\n    let isFirstChildTdSetBorderWidth = false;\n\n    if (isRowspanAndColspanFn) {\n      const rowspanAndColspanValue: RowspanColspan = rowspanAndColspan({\n        rowIndex,\n        colIndex,\n        col,\n        row,\n      });\n\n      const isRowspanAndColspanValueValid =\n        rowspanAndColspanValue && (rowspanAndColspanValue.rowspan || rowspanAndColspanValue.colspan);\n      if (isRowspanAndColspanValueValid) {\n        rowSpan = rowspanAndColspanValue.rowspan;\n        colSpan = rowspanAndColspanValue.colspan;\n\n        if (colSpan && colSpan > 1 && colSpan < flattenColumnsLength) {\n          const minIndex = colIndex + 1;\n          const maxIndex = colIndex + colSpan;\n          const rowSkipTdSpanColIndexs = getRowSkipTdSpanColIndexs({\n            minIndex,\n            maxIndex,\n            rowSkipTdSpanColIndexsMap,\n            rowIndex,\n          });\n          rowSkipTdSpanColIndexsMap[rowIndex] = rowSkipTdSpanColIndexs; // eslint-disable-line\n        }\n\n        if (rowSpan && rowSpan > 1 && rowSpan < dataLength) {\n          const minRowIndex = rowIndex + 1;\n          const maxRowIndex = rowIndex + rowSpan;\n          const minIndex = colIndex;\n          const maxIndex = colIndex + colSpan;\n          Array.from(new Array(maxRowIndex - minRowIndex)).forEach((item, index) => {\n            const skipRowIndex = index + minRowIndex;\n            const rowSkipTdSpanColIndexs = getRowSkipTdSpanColIndexs({\n              minIndex,\n              maxIndex,\n              rowSkipTdSpanColIndexsMap,\n              rowIndex: skipRowIndex,\n            });\n            rowSkipTdSpanColIndexsMap[skipRowIndex] = rowSkipTdSpanColIndexs; // eslint-disable-line\n          });\n        }\n      }\n      isSkipRenderTd = rowSkipTdSpanColIndexsMap[rowIndex]?.includes(colIndex);\n      isFirstChildTdSetBorderWidth = getIsFirstChildTdSetBorderWidth({ rowSkipTdSpanColIndexsMap, rowIndex });\n    }\n\n    return {\n      rowSpan,\n      colSpan,\n      isSkipRenderTd,\n      isFirstChildTdSetBorderWidth,\n    };\n  }\n\n  function getRowSkipTdSpanColIndexs({ minIndex, maxIndex, rowSkipTdSpanColIndexsMap, rowIndex }): number[] {\n    const rowSkipTdSpanColIndexs = rowSkipTdSpanColIndexsMap[rowIndex] || [];\n\n    Array.from(new Array(maxIndex - minIndex)).forEach((item, index) => {\n      const skipColIndex = index + minIndex;\n      if (!rowSkipTdSpanColIndexs.includes(skipColIndex)) {\n        rowSkipTdSpanColIndexs.push(skipColIndex);\n      }\n    });\n\n    return rowSkipTdSpanColIndexs;\n  }\n\n  /**\n   * 行的第一列td css设置borderWidth为0（其余列默认为1）上一行第一列存在跨行时，需补回该borderWidth为1\n   */\n  function getIsFirstChildTdSetBorderWidth({ rowSkipTdSpanColIndexsMap, rowIndex }) {\n    if (rowIndex > 0) {\n      const rowSkipTdSpanColIndexs = rowSkipTdSpanColIndexsMap?.[rowIndex];\n      // 简化条件判断：rowSkipTdSpanColIndexs对应第一列td不渲染时，说明上一行存在跨行，当前行所有列borderWidth都设为1\n      if (rowSkipTdSpanColIndexs && rowSkipTdSpanColIndexs[0] === 0) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  function getExpandOnClickEvent() {\n    if (expandOnRowClick && expandedRow) {\n      const apiEvent = rowEvents.onClick;\n      const rowKeyValue = get(record, rowKey) || rowIndex;\n      let onClick;\n      if (apiEvent) {\n        onClick = (e) => {\n          apiEvent(e);\n          handleExpandChange(record, rowKeyValue);\n        };\n      } else {\n        onClick = () => {\n          handleExpandChange(record, rowKeyValue);\n        };\n      }\n\n      return {\n        onClick,\n      };\n    }\n    return {};\n  }\n\n  return (\n    <tr className={classes} {...rowEvents} {...getExpandOnClickEvent()}>\n      {baseRow}\n    </tr>\n  );\n};\n\nexport default TableRow;\n"],"names":["TableRow","props","record","rowClassName","rowIndex","rowKey","rowspanAndColspan","isRowspanAndColspanFn","rowSkipTdSpanColIndexsMap","dataLength","rowEvents","expandedRow","expandOnRowClick","handleExpandChange","useTableContext","flattenColumns","flattenColumnsLength","length","baseRow","map","column","colIndex","colKey","cell","render","restColumnProps","getRowSpanAndColSpanAndIsSkipRenderTd","col","row","isSkipRenderTd","rowSpan","colSpan","isFirstChildTdSetBorderWidth","customRender","getCustomRender","TableCell","key","type","columns","classes","isValidElement","isFunction","get","record2","isRowspanAndColspanFn2","rowspanAndColspanValue","rowspanAndColspan2","isRowspanAndColspanValueValid","rowspan","colspan","minIndex","maxIndex","rowSkipTdSpanColIndexs","getRowSkipTdSpanColIndexs","rowIndex2","minRowIndex","maxRowIndex","from","Array","forEach","item","index","skipRowIndex","rowSkipTdSpanColIndexsMap2","includes","getIsFirstChildTdSetBorderWidth","skipColIndex","push","apiEvent","onClick","rowKeyValue","e","className","getExpandOnClickEvent"],"mappings":"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"}

package/esm/table/hooks/useColumns.d.ts

@@ -1,4 +1,4 @@
 import { BaseTableCol, DataType } from '../type';
 export declare function useColumns<RowData extends DataType = DataType>(props: {
     columns?: BaseTableCol<RowData>[];
-}): BaseTableCol<DataType>[][];
+}): BaseTableCol<import("../type").TableRowData>[][];

package/esm/table/hooks/useColumns.js

@@ -1,17 +1,17 @@
 /**
- * tdesign v0.19.1
+ * tdesign v0.20.0
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-bd2ff6be.js';
-import { _ as _toConsumableArray } from '../../_chunks/dep-6d27991d.js';
+import { _ as _defineProperty } from '../../_chunks/dep-31796d32.js';
+import { _ as _toConsumableArray } from '../../_chunks/dep-ff66d271.js';
 import { useMemo } from 'react';
-import '../../_chunks/dep-4ca264a0.js';
+import '../../_chunks/dep-88fe1571.js';
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function flattenColumns(columns) {
   var result = [];