tdesign-react 0.19.0 → 0.20.2

package/lib/table/base/TableBody.js

@@ -1,37 +1,46 @@
 /**
- * tdesign v0.19.0
+ * tdesign v0.20.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-53c6c586.js';
+import { _ as _defineProperty } from '../../_chunks/dep-2e97cc0d.js';
 import React__default, { forwardRef } from 'react';
-import { i as isFunction_1 } from '../../_chunks/dep-02f1a98a.js';
-import { g as get_1 } from '../../_chunks/dep-ca288302.js';
+import { i as isFunction_1 } from '../../_chunks/dep-60b80c40.js';
+import { g as get_1 } from '../../_chunks/dep-447962b9.js';
 import useConfig from '../../_util/useConfig.js';
 import TableRow from './TableRow.js';
-import '../../_chunks/dep-3072ff80.js';
-import '../../_chunks/dep-601473bd.js';
-import '../../_chunks/dep-204550b9.js';
-import '../../_chunks/dep-abf70528.js';
-import '../../_chunks/dep-785f8869.js';
-import '../../_chunks/dep-7f56083b.js';
-import '../../_chunks/dep-aa8beec4.js';
-import '../../_chunks/dep-62256c26.js';
-import '../../_chunks/dep-31aba762.js';
-import '../../_chunks/dep-42f70fd8.js';
+import '../../_chunks/dep-a0170b8a.js';
+import '../../_chunks/dep-759bc4af.js';
+import '../../_chunks/dep-4bcb4398.js';
+import '../../_chunks/dep-e96866d8.js';
+import '../../_chunks/dep-8139cd34.js';
+import '../../_chunks/dep-fb3be3f7.js';
+import '../../_chunks/dep-18586a72.js';
+import '../../_chunks/dep-98e66b66.js';
+import '../../_chunks/dep-77677472.js';
+import '../../_chunks/dep-ce5f7bb9.js';
 import '../../config-provider/ConfigContext.js';
 import '../../locale/zh_CN.js';
-import '../../_chunks/dep-b3d60655.js';
+import '../../_chunks/dep-3d9b45dc.js';
 import './TableContext.js';
 import './TableCell.js';
-import '../../_chunks/dep-fff59b5a.js';
-import '../../_chunks/dep-4c3606c3.js';
+import '../../_chunks/dep-85854991.js';
+import '../../_chunks/dep-38c06164.js';
 import 'classnames';
 
-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 rowEventsMap = {
+  onClick: "onRowClick",
+  onDoubleClick: "onRowDbClick",
+  onMouseOver: "onRowHover",
+  onMouseDown: "onRowMousedown",
+  onMouseEnter: "onRowMouseenter",
+  onMouseLeave: "onRowMouseleave",
+  onMouseUp: "onRowMouseup"
+};
 var TableBody = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useConfig = useConfig(),
       classPrefix = _useConfig.classPrefix;
@@ -41,13 +50,13 @@ var TableBody = /*#__PURE__*/forwardRef(function (props, ref) {
       rowKey = props.rowKey,
       rowClassName = props.rowClassName,
       expandedRow = props.expandedRow,
-      _props$expandOnRowCli = props.expandOnRowClick,
-      expandOnRowClick = _props$expandOnRowCli === void 0 ? false : _props$expandOnRowCli,
-      _onTrClick = props.onTrClick,
-      rowspanAndColspan = props.rowspanAndColspan,
-      renderExpandRow = props.renderExpandRow;
+      expandOnRowClick = props.expandOnRowClick,
+      handleExpandChange = props.handleExpandChange,
+      renderExpandRow = props.renderExpandRow,
+      rowspanAndColspan = props.rowspanAndColspan;
   var rowSkipTdSpanColIndexsMap = {};
   var isRowspanAndColspanFn = isFunction_1(rowspanAndColspan);
+  var rowEvents = getRowEvents();
   var rows = data.map(function (row, index) {
     var rowKeyValue = get_1(row, rowKey) || index;
     return /* @__PURE__ */React__default.createElement(React__default.Fragment, {
@@ -55,19 +64,34 @@ var TableBody = /*#__PURE__*/forwardRef(function (props, ref) {
     }, /* @__PURE__ */React__default.createElement(TableRow, _objectSpread(_objectSpread({
       record: row,
       rowIndex: index,
-      rowClassName: rowClassName
-    }, expandedRow && expandOnRowClick ? {
-      onTrClick: function onTrClick() {
-        return _onTrClick(row, rowKeyValue);
-      },
-      expandOnRowClick: expandOnRowClick
-    } : {}), isRowspanAndColspanFn ? {
+      rowKey: rowKey,
+      rowClassName: rowClassName,
+      expandedRow: expandedRow,
+      expandOnRowClick: expandOnRowClick,
+      handleExpandChange: handleExpandChange
+    }, isRowspanAndColspanFn ? {
       isRowspanAndColspanFn: isRowspanAndColspanFn,
       rowspanAndColspan: rowspanAndColspan,
       rowSkipTdSpanColIndexsMap: rowSkipTdSpanColIndexsMap,
       dataLength: data.length
-    } : {})), expandedRow ? renderExpandRow(row, index, rowKeyValue) : null);
+    } : {}), {}, {
+      rowEvents: rowEvents
+    })), expandedRow ? renderExpandRow(row, index, rowKeyValue) : null);
   });
+
+  function getRowEvents() {
+    var rowEventProps = {};
+    Object.keys(rowEventsMap).forEach(function (eventName) {
+      var apiEventName = rowEventsMap[eventName];
+      var apiEvent = props[apiEventName];
+
+      if (apiEvent) {
+        rowEventProps[eventName] = apiEvent;
+      }
+    });
+    return rowEventProps;
+  }
+
   return /* @__PURE__ */React__default.createElement("tbody", {
     ref: ref,
     className: "".concat(classPrefix, "-table__body")

package/lib/table/base/TableBody.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableBody.js","sources":["../../../src/table/base/TableBody.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\nimport isFunction from 'lodash/isFunction';\nimport get from 'lodash/get';\nimport { TdPrimaryTableProps } from '../type';\nimport useConfig from '../../_util/useConfig';\nimport TableRow from './TableRow';\nimport { ExpandProps } from './Table';\n\nexport interface RowSkipTdSpanColIndexsMap {\n  [key: number]: number[];\n}\n\nconst TableBody = forwardRef(\n  (props: TdPrimaryTableProps & ExpandProps, ref: React.Ref<HTMLTableSectionElement>): any => {\n    const { classPrefix } = useConfig();\n    const {\n      data = [],\n      rowKey,\n      rowClassName,\n      expandedRow,\n      expandOnRowClick = false,\n      onTrClick,\n      rowspanAndColspan,\n      renderExpandRow,\n    } = props;\n    const rowSkipTdSpanColIndexsMap: RowSkipTdSpanColIndexsMap = {}; // 引用，不可重置。eg: { 0: [1, 3] } 表示第1行，第2、4列两个cell不渲染\n    const isRowspanAndColspanFn = isFunction(rowspanAndColspan);\n\n    // ==================== render ====================\n    const rows = data.map((row, index) => {\n      const rowKeyValue = get(row, rowKey) || index;\n\n      return (\n        <React.Fragment key={rowKeyValue}>\n          <TableRow\n            record={row}\n            rowIndex={index}\n            rowClassName={rowClassName}\n            {...(expandedRow && expandOnRowClick\n              ? { onTrClick: () => onTrClick(row, rowKeyValue), expandOnRowClick }\n              : {})}\n            {...(isRowspanAndColspanFn\n              ? {\n                  isRowspanAndColspanFn,\n                  rowspanAndColspan,\n                  rowSkipTdSpanColIndexsMap,\n                  dataLength: data.length,\n                }\n              : {})}\n          />\n          {expandedRow ? renderExpandRow(row, index, rowKeyValue) : null}\n        </React.Fragment>\n      );\n    });\n\n    return (\n      <tbody ref={ref} className={`${classPrefix}-table__body`}>\n        {rows}\n      </tbody>\n    );\n  },\n);\n\nexport default TableBody;\n"],"names":["TableBody","forwardRef","props","ref","useConfig","classPrefix","data","rowKey","rowClassName","expandedRow","expandOnRowClick","onTrClick","rowspanAndColspan","renderExpandRow","rowSkipTdSpanColIndexsMap","isRowspanAndColspanFn","isFunction","rows","map","row","index","rowKeyValue","get","React","Fragment","key","TableRow","record","rowIndex","dataLength","length","className"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYMA,yBAAYC,WAChB,UAACC,KAAD,EAA2CC,GAA3C,EAA4F;mBAClEC;MAAhBC,yBAAAA;;oBAUJH,MARFI;MAAAA,gCAAO;MACPC,SAOEL,MAPFK;MACAC,eAMEN,MANFM;MACAC,cAKEP,MALFO;8BAKEP,MAJFQ;MAAAA,sDAAmB;MACnBC,aAGET,MAHFS;MACAC,oBAEEV,MAFFU;MACAC,kBACEX,MADFW;MAEIC,4BAAuD;MACvDC,wBAAwBC,aAAWJ;MAGnCK,OAAOX,KAAKY,GAAL,CAAS,UAACC,GAAD,EAAMC,KAAN,EAAgB;QAC9BC,cAAcC,MAAIH,KAAKZ,OAAT,IAAoBa;uDAGrCG,eAAMC,UAAP;AAAgBC,MAAAA,KAAKJ;AAArB,mDACGK;AACCC,MAAAA,QAAQR;AACRS,MAAAA,UAAUR;AACVZ,MAAAA,cAAAA;OACKC,eAAeC,gBAAf,GACD;AAAEC,MAAAA,WAAW;AAAA,eAAMA,WAAUQ,KAAKE,YAArB;AAAA,OAAb;AAAgDX,MAAAA,kBAAAA;AAAhD,KADC,GAED,KACCK,wBACD;AACEA,MAAAA,uBAAAA,qBADF;AAEEH,MAAAA,mBAAAA,iBAFF;AAGEE,MAAAA,2BAAAA,yBAHF;AAIEe,MAAAA,YAAYvB,KAAKwB;AAJnB,QAMA,MAELrB,cAAcI,gBAAgBM,KAAKC,OAAOC,eAAe;GArBnD;qDA2BV,SAAD;AAAOlB,IAAAA,KAAAA,GAAP;AAAiB4B,IAAAA,qBAAc1B;AAA/B,KACGY;;;;;"}
+{"version":3,"file":"TableBody.js","sources":["../../../src/table/base/TableBody.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\nimport isFunction from 'lodash/isFunction';\nimport get from 'lodash/get';\nimport { TdPrimaryTableProps } from '../type';\nimport useConfig from '../../_util/useConfig';\nimport TableRow from './TableRow';\nimport { ExpandInnerProps } from './Table';\n\nexport interface RowSkipTdSpanColIndexsMap {\n  [key: number]: number[];\n}\n\ntype RowEventName =\n  | 'onClick'\n  | 'onDoubleClick'\n  | 'onMouseOver'\n  | 'onMouseDown'\n  | 'onMouseEnter'\n  | 'onMouseLeave'\n  | 'onMouseUp';\ntype APIRowEventName =\n  | 'onRowClick'\n  | 'onRowDbClick'\n  | 'onRowHover'\n  | 'onRowMousedown'\n  | 'onRowMouseenter'\n  | 'onRowMouseleave'\n  | 'onRowMouseup';\nexport type RowEvents = Record<RowEventName, React.MouseEventHandler<HTMLElement>> | { [key: string]: Function };\n\nconst rowEventsMap: Record<RowEventName, APIRowEventName> = {\n  onClick: 'onRowClick',\n  onDoubleClick: 'onRowDbClick',\n  onMouseOver: 'onRowHover',\n  onMouseDown: 'onRowMousedown',\n  onMouseEnter: 'onRowMouseenter',\n  onMouseLeave: 'onRowMouseleave',\n  onMouseUp: 'onRowMouseup',\n};\n\nconst TableBody = forwardRef(\n  (props: TdPrimaryTableProps & ExpandInnerProps, ref: React.Ref<HTMLTableSectionElement>): any => {\n    const { classPrefix } = useConfig();\n    const {\n      data = [],\n      rowKey,\n      rowClassName,\n      expandedRow,\n      expandOnRowClick,\n      handleExpandChange,\n      renderExpandRow,\n      rowspanAndColspan,\n    } = props;\n    const rowSkipTdSpanColIndexsMap: RowSkipTdSpanColIndexsMap = {}; // 引用，不可重置。eg: { 0: [1, 3] } 表示第1行，第2、4列两个cell不渲染\n    const isRowspanAndColspanFn = isFunction(rowspanAndColspan);\n\n    const rowEvents = getRowEvents();\n\n    // ==================== render ====================\n    const rows = data.map((row, index) => {\n      const rowKeyValue = get(row, rowKey) || index;\n\n      return (\n        <React.Fragment key={rowKeyValue}>\n          <TableRow\n            record={row}\n            rowIndex={index}\n            rowKey={rowKey}\n            rowClassName={rowClassName}\n            expandedRow={expandedRow}\n            expandOnRowClick={expandOnRowClick}\n            handleExpandChange={handleExpandChange}\n            {...(isRowspanAndColspanFn\n              ? {\n                  isRowspanAndColspanFn,\n                  rowspanAndColspan,\n                  rowSkipTdSpanColIndexsMap,\n                  dataLength: data.length,\n                }\n              : {})}\n            rowEvents={rowEvents}\n          />\n          {expandedRow ? renderExpandRow(row, index, rowKeyValue) : null}\n        </React.Fragment>\n      );\n    });\n\n    function getRowEvents(): RowEvents {\n      const rowEventProps = {};\n      Object.keys(rowEventsMap).forEach((eventName) => {\n        const apiEventName = rowEventsMap[eventName];\n        const apiEvent = props[apiEventName];\n        if (apiEvent) {\n          rowEventProps[eventName] = apiEvent;\n        }\n      });\n      return rowEventProps;\n    }\n\n    return (\n      <tbody ref={ref} className={`${classPrefix}-table__body`}>\n        {rows}\n      </tbody>\n    );\n  },\n);\n\nexport default TableBody;\n"],"names":["rowEventsMap","onClick","onDoubleClick","onMouseOver","onMouseDown","onMouseEnter","onMouseLeave","onMouseUp","TableBody","forwardRef","props","ref","useConfig","classPrefix","data","rowKey","rowClassName","expandedRow","expandOnRowClick","handleExpandChange","renderExpandRow","rowspanAndColspan","rowSkipTdSpanColIndexsMap","isRowspanAndColspanFn","isFunction","rowEvents","getRowEvents","rows","map","row","index","rowKeyValue","get","React","Fragment","key","TableRow","record","rowIndex","dataLength","length","rowEventProps","keys","forEach","eventName","apiEventName","apiEvent","className"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,IAAMA,eAAsD;AAC1DC,EAAAA,SAAS,YADiD;AAE1DC,EAAAA,eAAe,cAF2C;AAG1DC,EAAAA,aAAa,YAH6C;AAI1DC,EAAAA,aAAa,gBAJ6C;AAK1DC,EAAAA,cAAc,iBAL4C;AAM1DC,EAAAA,cAAc,iBAN4C;AAO1DC,EAAAA,WAAW;AAP+C,CAA5D;IAUMC,yBAAYC,WAChB,UAACC,KAAD,EAAgDC,GAAhD,EAAiG;mBACvEC;MAAhBC,yBAAAA;;oBAUJH,MARFI;MAAAA,gCAAO;MACPC,SAOEL,MAPFK;MACAC,eAMEN,MANFM;MACAC,cAKEP,MALFO;MACAC,mBAIER,MAJFQ;MACAC,qBAGET,MAHFS;MACAC,kBAEEV,MAFFU;MACAC,oBACEX,MADFW;MAEIC,4BAAuD;MACvDC,wBAAwBC,aAAWH;MAEnCI,YAAYC;MAGZC,OAAOb,KAAKc,GAAL,CAAS,UAACC,GAAD,EAAMC,KAAN,EAAgB;QAC9BC,cAAcC,MAAIH,KAAKd,OAAT,IAAoBe;uDAGrCG,eAAMC,UAAP;AAAgBC,MAAAA,KAAKJ;AAArB,mDACGK;AACCC,MAAAA,QAAQR;AACRS,MAAAA,UAAUR;AACVf,MAAAA,QAAAA;AACAC,MAAAA,cAAAA;AACAC,MAAAA,aAAAA;AACAC,MAAAA,kBAAAA;AACAC,MAAAA,oBAAAA;OACKI,wBACD;AACEA,MAAAA,uBAAAA,qBADF;AAEEF,MAAAA,mBAAAA,iBAFF;AAGEC,MAAAA,2BAAAA,yBAHF;AAIEiB,MAAAA,YAAYzB,KAAK0B;AAJnB,QAMA;AACJf,MAAAA,WAAAA;SAEDR,cAAcG,gBAAgBS,KAAKC,OAAOC,eAAe;GAvBnD;;0BA4BsB;QAC3BU,gBAAgB;WACfC,KAAK1C,cAAc2C,QAAQ,UAACC,SAAD,EAAe;UACzCC,eAAe7C,aAAa4C;UAC5BE,WAAWpC,MAAMmC;;UACnBC,UAAU;sBACEF,aAAaE;;;WAGxBL;;;qDAIN,SAAD;AAAO9B,IAAAA,KAAAA,GAAP;AAAiBoC,IAAAA,qBAAclC;AAA/B,KACGc;;;;;"}

package/lib/table/base/TableCell.d.ts

@@ -10,6 +10,7 @@ export interface CellProps<D extends DataType> extends BaseTableCol<DataType> {
     rowSpan?: number;
     colSpan?: number;
     customRender: Function;
+    isFirstChildTdSetBorderWidth?: Boolean;
 }
-declare const TableCell: <D extends DataType>(props: React.PropsWithChildren<CellProps<D>>) => JSX.Element;
+declare const TableCell: <D extends import("../type").TableRowData>(props: React.PropsWithChildren<CellProps<D>>) => JSX.Element;
 export default TableCell;

package/lib/table/base/TableCell.js

@@ -1,22 +1,22 @@
 /**
- * tdesign v0.19.0
+ * tdesign v0.20.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-53c6c586.js';
-import { _ as _slicedToArray } from '../../_chunks/dep-fff59b5a.js';
+import { _ as _defineProperty } from '../../_chunks/dep-2e97cc0d.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-85854991.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-4c3606c3.js';
+import '../../_chunks/dep-38c06164.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/lib/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/lib/table/base/TableColGroup.js

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

package/lib/table/base/TableContext.js

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

package/lib/table/base/TableEmptyBody.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.19.0
+ * tdesign v0.20.2
  * (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/lib/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/lib/table/base/TableFooter.js

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

package/lib/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/lib/table/base/TableHeader.js

@@ -1,20 +1,20 @@
 /**
- * tdesign v0.19.0
+ * tdesign v0.20.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _toConsumableArray } from '../../_chunks/dep-f405fda4.js';
-import { _ as _defineProperty } from '../../_chunks/dep-53c6c586.js';
-import { _ as _objectWithoutProperties } from '../../_chunks/dep-b3d60655.js';
+import { _ as _toConsumableArray } from '../../_chunks/dep-0ab6329f.js';
+import { _ as _defineProperty } from '../../_chunks/dep-2e97cc0d.js';
+import { _ as _objectWithoutProperties } from '../../_chunks/dep-3d9b45dc.js';
 import React__default, { isValidElement } from 'react';
-import { i as isFunction_1 } from '../../_chunks/dep-02f1a98a.js';
+import { i as isFunction_1 } from '../../_chunks/dep-60b80c40.js';
 import TableCell from './TableCell.js';
-import '../../_chunks/dep-4c3606c3.js';
-import '../../_chunks/dep-3072ff80.js';
-import '../../_chunks/dep-601473bd.js';
-import '../../_chunks/dep-204550b9.js';
-import '../../_chunks/dep-fff59b5a.js';
+import '../../_chunks/dep-38c06164.js';
+import '../../_chunks/dep-a0170b8a.js';
+import '../../_chunks/dep-759bc4af.js';
+import '../../_chunks/dep-4bcb4398.js';
+import '../../_chunks/dep-85854991.js';
 import 'classnames';
 import '../../_util/useConfig.js';
 import '../../config-provider/ConfigContext.js';
@@ -24,9 +24,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;
@@ -154,9 +154,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,
@@ -169,6 +185,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,
@@ -176,7 +197,8 @@ var TableHeader = function TableHeader(props) {
         colIndex: colIndex,
         customRender: customRender,
         rowSpan: rowSpan,
-        colSpan: colSpan
+        colSpan: colSpan,
+        isFirstChildTdSetBorderWidth: isFirstChildTdSetBorderWidth
       }, rest));
     }));
   }));

package/lib/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/lib/table/base/TableLoadingBody.js

@@ -1,13 +1,13 @@
 /**
- * tdesign v0.19.0
+ * tdesign v0.20.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { i as isFunction_1 } from '../../_chunks/dep-02f1a98a.js';
-import '../../_chunks/dep-3072ff80.js';
-import '../../_chunks/dep-601473bd.js';
-import '../../_chunks/dep-204550b9.js';
+import { i as isFunction_1 } from '../../_chunks/dep-60b80c40.js';
+import '../../_chunks/dep-a0170b8a.js';
+import '../../_chunks/dep-759bc4af.js';
+import '../../_chunks/dep-4bcb4398.js';
 
 function TableLoadingBody(props) {
   var loading = props.loading;

package/lib/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;