tdesign-react 0.24.2 → 0.25.2

package/esm/table/base/TableCell.js

@@ -1,37 +1,56 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-77e8c4b5.js';
-import { _ as _slicedToArray } from '../../_chunks/dep-227e0bb8.js';
-import React, { useState, useRef, useLayoutEffect } from 'react';
+import { _ as _defineProperty } from '../../_chunks/dep-1dcd6f7a.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-301db282.js';
+import React, { useState, useRef } from 'react';
 import classNames from 'classnames';
 import useConfig from '../../_util/useConfig.js';
 import { useTableContext } from './TableContext.js';
-import '../../_chunks/dep-61b31811.js';
-import '../../_chunks/dep-27f1e824.js';
-import '../../_chunks/dep-5eae925d.js';
-import '../../_chunks/dep-35873096.js';
-import '../../_chunks/dep-6fade4e3.js';
-import '../../_chunks/dep-2c2a1ed3.js';
-import '../../_chunks/dep-042bedbb.js';
-import '../../_chunks/dep-727523bf.js';
-import '../../_chunks/dep-e2c3e976.js';
-import '../../_chunks/dep-c5ce2ac5.js';
-import '../../_chunks/dep-a47c4980.js';
-import '../../_chunks/dep-3c451e24.js';
-import '../../_chunks/dep-9bca7361.js';
-import '../../_chunks/dep-932974e4.js';
-import '../../_chunks/dep-830a9fa5.js';
-import '../../_chunks/dep-d8fd6317.js';
-import '../../_chunks/dep-a442ec03.js';
-import '../../_chunks/dep-8aa68030.js';
-import '../../_chunks/dep-e5760bc1.js';
+import { isNodeOverflow } from '../../_util/dom.js';
+import useIsomorphicLayoutEffect from '../../_util/useLayoutEffect.js';
+import { Popup } from '../../popup/index.js';
+import '../../_chunks/dep-5e33104a.js';
+import '../../_chunks/dep-0c32a524.js';
+import '../../_chunks/dep-04a6c042.js';
+import '../../_chunks/dep-a64706b5.js';
+import '../../_chunks/dep-50c12e42.js';
+import '../../_chunks/dep-70c9bb2d.js';
+import '../../_chunks/dep-98412f1b.js';
+import '../../_chunks/dep-8aee3ad0.js';
+import '../../_chunks/dep-e4bd3f59.js';
+import '../../_chunks/dep-5a75ddfa.js';
+import '../../_chunks/dep-75144258.js';
+import '../../_chunks/dep-aabdac78.js';
+import '../../_chunks/dep-0529bc9f.js';
+import '../../_chunks/dep-1aa31dc5.js';
+import '../../_chunks/dep-10b8d252.js';
+import '../../_chunks/dep-0c0fc89b.js';
+import '../../_chunks/dep-8a07113f.js';
+import '../../_chunks/dep-6fb8cfe3.js';
+import '../../_chunks/dep-3e5f80c6.js';
 import '../../locale/zh_CN.js';
 import '../../_common/js/locale/zh_CN.js';
 import '../../config-provider/defaultConfig.js';
+import 'raf';
+import '../../_chunks/dep-ac5499d2.js';
+import '../../_util/easing.js';
+import '../../popup/Popup.js';
+import 'react-transition-group';
+import 'react-popper';
+import '../../_util/useDefault.js';
+import '../../_util/noop.js';
+import '../../_util/composeRefs.js';
+import '../../common/Portal.js';
+import 'react-dom';
+import '../../popup/hooks/useTriggerProps.js';
+import '../../_util/useClickOutside.js';
+import '../../popup/utils/getTransitionParams.js';
+import '../../popup/style/index.js';
+import '../../popup/type.js';
 
 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; }
 
@@ -54,8 +73,8 @@ var TableCell = function TableCell(props) {
       columns = props.columns,
       rowIndex = props.rowIndex,
       className = props.className,
-      rowSpan = props.rowSpan,
-      colSpan = props.colSpan,
+      rowspan = props.rowspan,
+      colspan = props.colspan,
       isFirstChildTdSetBorderWidth = props.isFirstChildTdSetBorderWidth;
 
   var _useConfig = useConfig(),
@@ -76,11 +95,22 @@ var TableCell = function TableCell(props) {
       isBoundary = _useState4[0],
       setIsBoundary = _useState4[1];
 
+  var _useState5 = useState(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isCellNodeOverflow = _useState6[0],
+      setIsCellNodeOverflow = _useState6[1];
+
   var ref = useRef();
-  useLayoutEffect(function () {
+  var isEllipsis = ellipsis === true || typeof ellipsis === "function";
+  useIsomorphicLayoutEffect(function () {
+    var tdRef = ref.current;
+    if (!tdRef || !isEllipsis) return;
+    var isCellNodeOverflow2 = isNodeOverflow(tdRef);
+    setIsCellNodeOverflow(isCellNodeOverflow2);
+  }, [ref, isEllipsis]);
+  useIsomorphicLayoutEffect(function () {
     if (ref.current) {
       var offset2 = 0;
-      var clientWidth = ref.current.clientWidth;
       var fixedColumns = flattenColumns.filter(function (column) {
         return column.fixed === fixed;
       });
@@ -89,25 +119,45 @@ var TableCell = function TableCell(props) {
         return key === colKey;
       });
       if (indexInFixedColumns === -1) return;
-      fixedColumns.forEach(function (_, cur) {
-        if (fixed === "right" && cur > indexInFixedColumns || fixed === "left" && cur < indexInFixedColumns) {
-          offset2 += clientWidth;
-        }
+      var indexInCols = flattenColumns.findIndex(function (_ref2) {
+        var key = _ref2.colKey;
+        return key === colKey;
       });
+      var currentNode = ref.current;
+
+      if (fixed === "left") {
+        while (indexInCols > 0) {
+          var _flattenColumns;
+
+          var preEl = currentNode.previousElementSibling;
+
+          if ((_flattenColumns = flattenColumns[indexInCols - 1]) !== null && _flattenColumns !== void 0 && _flattenColumns.fixed) {
+            offset2 += (preEl === null || preEl === void 0 ? void 0 : preEl.clientWidth) || 0;
+          }
+
+          indexInCols -= 1;
+          currentNode = preEl;
+        }
+      } else if (fixed === "right") {
+        while (indexInCols < flattenColumns.length) {
+          var _flattenColumns2;
+
+          var nextEl = currentNode.nextElementSibling;
+
+          if ((_flattenColumns2 = flattenColumns[indexInCols + 1]) !== null && _flattenColumns2 !== void 0 && _flattenColumns2.fixed) {
+            offset2 += (nextEl === null || nextEl === void 0 ? void 0 : nextEl.clientWidth) || 0;
+          }
+
+          indexInCols += 1;
+          currentNode = nextEl;
+        }
+      }
+
       setOffset(offset2);
       var isBoundary2 = fixed === "left" ? indexInFixedColumns === fixedColumns.length - 1 : indexInFixedColumns === 0;
       setIsBoundary(isBoundary2);
     }
   }, [ref, flattenColumns, colKey, fixed]);
-  var cellNode = customRender({
-    type: type,
-    row: record,
-    rowIndex: rowIndex,
-    col: columns === null || columns === void 0 ? void 0 : columns[colIndex],
-    colIndex: colIndex,
-    flattenData: flattenData,
-    pageData: pageData
-  });
 
   var cellStyle = _objectSpread({}, style);
 
@@ -124,13 +174,58 @@ var TableCell = function TableCell(props) {
     cellStyle.borderWidth = 1;
   }
 
+  function getCellNode(className2) {
+    var cellNode = customRender({
+      type: type,
+      row: record,
+      rowIndex: rowIndex,
+      col: columns === null || columns === void 0 ? void 0 : columns[colIndex],
+      colIndex: colIndex,
+      flattenData: flattenData,
+      pageData: pageData,
+      className: className2
+    });
+    return cellNode;
+  }
+
+  function getOverflowCellNode() {
+    var className2 = "".concat(classPrefix, "-text-ellipsis");
+    var cellNode = getCellNode(className2);
+    var popupCellContent;
+
+    if (typeof ellipsis === "function") {
+      popupCellContent = ellipsis({
+        row: record,
+        col: columns === null || columns === void 0 ? void 0 : columns[colIndex],
+        rowIndex: rowIndex,
+        colIndex: colIndex
+      });
+    } else {
+      popupCellContent = cellNode;
+    }
+
+    return /* @__PURE__ */React.createElement(Popup, {
+      style: {
+        display: "inline"
+      },
+      overlayStyle: {
+        width: "100%",
+        maxWidth: 400,
+        wordBreak: "break-all"
+      },
+      placement: "bottom-left",
+      showArrow: false,
+      content: popupCellContent
+    }, cellNode);
+  }
+
   return /* @__PURE__ */React.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, "".concat(classPrefix, "-align-").concat(align), align), _defineProperty(_classnames, "".concat(classPrefix, "-text-ellipsis"), ellipsis), _defineProperty(_classnames, "".concat(className), !!className), _classnames)),
-    rowSpan: rowSpan,
-    colSpan: colSpan
-  }, cellNode);
+    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"), isEllipsis), _defineProperty(_classnames, "".concat(className), !!className), _classnames)),
+    rowSpan: rowspan,
+    colSpan: colspan
+  }, !isCellNodeOverflow ? getCellNode() : getOverflowCellNode());
 };
 
 export { TableCell as default };

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  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, flattenData, pageData } = 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      if (indexInFixedColumns === -1) return;\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({\n    type,\n    row: record,\n    rowIndex,\n    col: columns?.[colIndex],\n    colIndex,\n    flattenData,\n    pageData,\n  });\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","flattenData","pageData","useState","offset","setOffset","isBoundary","setIsBoundary","ref","useRef","useLayoutEffect","current","offset2","clientWidth","fixedColumns","filter","column","indexInFixedColumns","findIndex","key","forEach","_","cur","isBoundary2","length","cellNode","row","col","cellStyle","position","overflow","borderWidth","React","createElement","classnames"],"mappings":"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"}
+{"version":3,"file":"TableCell.js","sources":["../../../src/table/base/TableCell.tsx"],"sourcesContent":["import React, { CSSProperties, useRef, useState, PropsWithChildren } from 'react';\nimport classnames from 'classnames';\nimport { BaseTableCol, DataType } from '../type';\nimport useConfig from '../../_util/useConfig';\nimport { useTableContext } from './TableContext';\nimport { isNodeOverflow } from '../../_util/dom';\nimport useLayoutEffect from '../../_util/useLayoutEffect';\nimport Popup from '../../popup';\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, flattenData, pageData } = useTableContext();\n  const [offset, setOffset] = useState(0);\n  const [isBoundary, setIsBoundary] = useState(false);\n  const [isCellNodeOverflow, setIsCellNodeOverflow] = useState(false);\n\n  const ref = useRef<HTMLTableDataCellElement | HTMLTableHeaderCellElement>();\n  const isEllipsis = ellipsis === true || typeof ellipsis === 'function';\n\n  useLayoutEffect(() => {\n    const tdRef = ref.current;\n    if (!tdRef || !isEllipsis) return;\n\n    const isCellNodeOverflow = isNodeOverflow(tdRef);\n    setIsCellNodeOverflow(isCellNodeOverflow);\n  }, [ref, isEllipsis]);\n\n  useLayoutEffect(() => {\n    if (ref.current) {\n      let offset = 0;\n      const fixedColumns = flattenColumns.filter((column) => column.fixed === fixed);\n      const indexInFixedColumns = fixedColumns.findIndex(({ colKey: key }) => key === colKey);\n\n      if (indexInFixedColumns === -1) return;\n      let indexInCols = flattenColumns.findIndex(({ colKey: key }) => key === colKey);\n\n      //  fix issue #334\n      //  这里累加的宽度应该是兄弟节点的宽度\n      let currentNode: Element = ref.current;\n      if (fixed === 'left') {\n        while (indexInCols > 0) {\n          const preEl = currentNode.previousElementSibling;\n          if (flattenColumns[indexInCols - 1]?.fixed) {\n            offset += preEl?.clientWidth || 0;\n          }\n          indexInCols -= 1;\n          currentNode = preEl;\n        }\n      } else if (fixed === 'right') {\n        while (indexInCols < flattenColumns.length) {\n          const nextEl = currentNode.nextElementSibling;\n          if (flattenColumns[indexInCols + 1]?.fixed) {\n            offset += nextEl?.clientWidth || 0;\n          }\n          indexInCols += 1;\n          currentNode = nextEl;\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  // ==================== 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  function getCellNode(className?) {\n    const cellNode = customRender({\n      type,\n      row: record,\n      rowIndex,\n      col: columns?.[colIndex],\n      colIndex,\n      flattenData,\n      pageData,\n      className,\n    });\n    return cellNode;\n  }\n\n  function getOverflowCellNode() {\n    const className = `${classPrefix}-text-ellipsis`;\n    const cellNode = getCellNode(className);\n    let popupCellContent;\n    if (typeof ellipsis === 'function') {\n      popupCellContent = ellipsis({\n        row: record,\n        col: columns?.[colIndex],\n        rowIndex,\n        colIndex,\n      });\n    } else {\n      popupCellContent = cellNode;\n    }\n\n    return (\n      <Popup\n        style={{ display: 'inline' }}\n        overlayStyle={{\n          width: '100%',\n          maxWidth: 400,\n          wordBreak: 'break-all',\n        }}\n        placement=\"bottom-left\"\n        showArrow={false}\n        content={popupCellContent}\n      >\n        {cellNode}\n      </Popup>\n    );\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`]: isEllipsis,\n        [`${className}`]: !!className,\n      })}\n      rowSpan={rowspan}\n      colSpan={colspan}\n    >\n      {!isCellNodeOverflow ? getCellNode() : getOverflowCellNode()}\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","flattenData","pageData","useState","offset","setOffset","isBoundary","setIsBoundary","isCellNodeOverflow","setIsCellNodeOverflow","ref","useRef","isEllipsis","useLayoutEffect","tdRef","current","isCellNodeOverflow2","isNodeOverflow","offset2","fixedColumns","filter","column","indexInFixedColumns","findIndex","key","indexInCols","currentNode","preEl","previousElementSibling","clientWidth","length","nextEl","nextElementSibling","isBoundary2","cellStyle","position","overflow","borderWidth","getCellNode","className2","cellNode","row","col","getOverflowCellNode","popupCellContent","React","createElement","Popup","display","overlayStyle","maxWidth","wordBreak","placement","showArrow","content","classnames","rowSpan","colSpan"],"mappings":"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"}

package/esm/table/base/TableColGroup.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */

package/esm/table/base/TableContext.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */

package/esm/table/base/TableEmptyBody.js

@@ -1,33 +1,33 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */
 
-import { _ as _slicedToArray } from '../../_chunks/dep-227e0bb8.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-301db282.js';
 import React from 'react';
 import useConfig from '../../_util/useConfig.js';
 import { useLocaleReceiver } from '../../locale/LocalReceiver.js';
-import '../../_chunks/dep-61b31811.js';
-import '../../_chunks/dep-27f1e824.js';
-import '../../_chunks/dep-77e8c4b5.js';
-import '../../_chunks/dep-5eae925d.js';
-import '../../_chunks/dep-35873096.js';
-import '../../_chunks/dep-6fade4e3.js';
-import '../../_chunks/dep-2c2a1ed3.js';
-import '../../_chunks/dep-042bedbb.js';
-import '../../_chunks/dep-727523bf.js';
-import '../../_chunks/dep-e2c3e976.js';
-import '../../_chunks/dep-c5ce2ac5.js';
-import '../../_chunks/dep-a47c4980.js';
-import '../../_chunks/dep-3c451e24.js';
-import '../../_chunks/dep-9bca7361.js';
-import '../../_chunks/dep-932974e4.js';
-import '../../_chunks/dep-830a9fa5.js';
-import '../../_chunks/dep-d8fd6317.js';
-import '../../_chunks/dep-a442ec03.js';
-import '../../_chunks/dep-8aa68030.js';
-import '../../_chunks/dep-e5760bc1.js';
+import '../../_chunks/dep-5e33104a.js';
+import '../../_chunks/dep-0c32a524.js';
+import '../../_chunks/dep-1dcd6f7a.js';
+import '../../_chunks/dep-04a6c042.js';
+import '../../_chunks/dep-a64706b5.js';
+import '../../_chunks/dep-50c12e42.js';
+import '../../_chunks/dep-70c9bb2d.js';
+import '../../_chunks/dep-98412f1b.js';
+import '../../_chunks/dep-8aee3ad0.js';
+import '../../_chunks/dep-e4bd3f59.js';
+import '../../_chunks/dep-5a75ddfa.js';
+import '../../_chunks/dep-75144258.js';
+import '../../_chunks/dep-aabdac78.js';
+import '../../_chunks/dep-0529bc9f.js';
+import '../../_chunks/dep-1aa31dc5.js';
+import '../../_chunks/dep-10b8d252.js';
+import '../../_chunks/dep-0c0fc89b.js';
+import '../../_chunks/dep-8a07113f.js';
+import '../../_chunks/dep-6fb8cfe3.js';
+import '../../_chunks/dep-3e5f80c6.js';
 import '../../locale/zh_CN.js';
 import '../../_common/js/locale/zh_CN.js';
 import '../../config-provider/defaultConfig.js';

package/esm/table/base/TableFooter.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */

package/esm/table/base/TableHeader.js

@@ -1,43 +1,62 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */
 
-import { _ as _toConsumableArray } from '../../_chunks/dep-bce28960.js';
-import { _ as _defineProperty } from '../../_chunks/dep-77e8c4b5.js';
-import { _ as _objectWithoutProperties } from '../../_chunks/dep-f28d087e.js';
+import { _ as _toConsumableArray } from '../../_chunks/dep-ed38fb3f.js';
+import { _ as _defineProperty } from '../../_chunks/dep-1dcd6f7a.js';
+import { _ as _objectWithoutProperties } from '../../_chunks/dep-4b07e198.js';
 import React, { isValidElement } from 'react';
-import { i as isFunction_1 } from '../../_chunks/dep-042bedbb.js';
+import { i as isFunction_1 } from '../../_chunks/dep-98412f1b.js';
 import TableCell from './TableCell.js';
-import '../../_chunks/dep-61b31811.js';
-import '../../_chunks/dep-5eae925d.js';
-import '../../_chunks/dep-727523bf.js';
-import '../../_chunks/dep-e2c3e976.js';
-import '../../_chunks/dep-227e0bb8.js';
+import '../../_chunks/dep-5e33104a.js';
+import '../../_chunks/dep-04a6c042.js';
+import '../../_chunks/dep-8aee3ad0.js';
+import '../../_chunks/dep-e4bd3f59.js';
+import '../../_chunks/dep-301db282.js';
 import 'classnames';
 import '../../_util/useConfig.js';
-import '../../_chunks/dep-27f1e824.js';
-import '../../_chunks/dep-35873096.js';
-import '../../_chunks/dep-6fade4e3.js';
-import '../../_chunks/dep-2c2a1ed3.js';
-import '../../_chunks/dep-c5ce2ac5.js';
-import '../../_chunks/dep-a47c4980.js';
-import '../../_chunks/dep-3c451e24.js';
-import '../../_chunks/dep-9bca7361.js';
-import '../../_chunks/dep-932974e4.js';
-import '../../_chunks/dep-830a9fa5.js';
-import '../../_chunks/dep-d8fd6317.js';
-import '../../_chunks/dep-a442ec03.js';
-import '../../_chunks/dep-8aa68030.js';
-import '../../_chunks/dep-e5760bc1.js';
+import '../../_chunks/dep-0c32a524.js';
+import '../../_chunks/dep-a64706b5.js';
+import '../../_chunks/dep-50c12e42.js';
+import '../../_chunks/dep-70c9bb2d.js';
+import '../../_chunks/dep-5a75ddfa.js';
+import '../../_chunks/dep-75144258.js';
+import '../../_chunks/dep-aabdac78.js';
+import '../../_chunks/dep-0529bc9f.js';
+import '../../_chunks/dep-1aa31dc5.js';
+import '../../_chunks/dep-10b8d252.js';
+import '../../_chunks/dep-0c0fc89b.js';
+import '../../_chunks/dep-8a07113f.js';
+import '../../_chunks/dep-6fb8cfe3.js';
+import '../../_chunks/dep-3e5f80c6.js';
 import '../../locale/zh_CN.js';
 import '../../_common/js/locale/zh_CN.js';
 import '../../config-provider/defaultConfig.js';
 import './TableContext.js';
+import '../../_util/dom.js';
+import 'raf';
+import '../../_chunks/dep-ac5499d2.js';
+import '../../_util/easing.js';
+import '../../_util/useLayoutEffect.js';
+import '../../popup/index.js';
+import '../../popup/Popup.js';
+import 'react-transition-group';
+import 'react-popper';
+import '../../_util/useDefault.js';
+import '../../_util/noop.js';
+import '../../_util/composeRefs.js';
+import '../../common/Portal.js';
+import 'react-dom';
+import '../../popup/hooks/useTriggerProps.js';
+import '../../_util/useClickOutside.js';
+import '../../popup/utils/getTransitionParams.js';
+import '../../popup/style/index.js';
+import '../../popup/type.js';
 
 var _excluded = ["children"],
-    _excluded2 = ["title", "colKey", "rowSpan", "colSpan", "render"];
+    _excluded2 = ["title", "colKey", "rowspan", "colspan", "render"];
 
 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; }
 
@@ -63,21 +82,21 @@ var TableHeader = function TableHeader(props) {
       var trIndex = currentDepth - 1;
       var currentTr = trsColumns2[trIndex];
 
-      var _getRowSpanAndColSpan = getRowSpanAndColSpan({
+      var _getRowspanAndColspan = getRowspanAndColspan({
         node: item,
         columnsDepth: columnsDepth2,
         currentDepth: currentDepth
       }),
-          rowSpan = _getRowSpanAndColSpan.rowSpan,
-          colSpan = _getRowSpanAndColSpan.colSpan;
+          rowspan = _getRowspanAndColspan.rowspan,
+          colspan = _getRowspanAndColspan.colspan;
 
       var tdIndex = !currentTr ? 0 : currentTr.length;
 
       var currentTd = _objectSpread(_objectSpread({
         colKey: "tr-".concat(trIndex, "_td-").concat(tdIndex)
       }, rest), {}, {
-        rowSpan: rowSpan,
-        colSpan: colSpan
+        rowspan: rowspan,
+        colspan: colspan
       });
 
       if (!currentTr) {
@@ -89,24 +108,24 @@ var TableHeader = function TableHeader(props) {
     return trsColumnsNew;
   }
 
-  function getRowSpanAndColSpan(_ref) {
+  function getRowspanAndColspan(_ref) {
     var node = _ref.node,
         columnsDepth2 = _ref.columnsDepth,
         currentDepth = _ref.currentDepth;
-    var rowSpan = 1;
-    var colSpan = 1;
+    var rowspan = 1;
+    var colspan = 1;
 
     if (node.children) {
-      rowSpan = 1;
-      colSpan = getLeafNodeCount(node.children);
+      rowspan = 1;
+      colspan = getLeafNodeCount(node.children);
     } else {
-      rowSpan = columnsDepth2 - currentDepth + 1;
-      colSpan = 1;
+      rowspan = columnsDepth2 - currentDepth + 1;
+      colspan = 1;
     }
 
     return {
-      rowSpan: rowSpan,
-      colSpan: colSpan
+      rowspan: rowspan,
+      colspan: colspan
     };
   }
 
@@ -177,7 +196,7 @@ var TableHeader = function TableHeader(props) {
     if (colIndex === 0 && rowIndex > 0) {
       var preRowColumns = trsColumns2[rowIndex - 1];
 
-      if (preRowColumns[0].rowSpan > 1) {
+      if (preRowColumns[0].rowspan > 1) {
         return true;
       }
     }
@@ -191,8 +210,8 @@ var TableHeader = function TableHeader(props) {
     }, trsColumnsItem.map(function (column, colIndex) {
       var title = column.title,
           colKey = column.colKey,
-          rowSpan = column.rowSpan,
-          colSpan = column.colSpan,
+          rowspan = column.rowspan,
+          colspan = column.colspan,
           render = column.render,
           rest = _objectWithoutProperties(column, _excluded2);
 
@@ -211,8 +230,8 @@ var TableHeader = function TableHeader(props) {
         colKey: colKey,
         colIndex: colIndex,
         customRender: customRender,
-        rowSpan: rowSpan,
-        colSpan: colSpan,
+        rowspan: rowspan,
+        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  /**\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","getCustomRender","title","render","isValidElement","isFunction","getIsFirstChildTdSetBorderWidth","rowIndex","colIndex","preRowColumns","React","createElement","map","trsColumnsItem","key","column","customRender","isFirstChildTdSetBorderWidth","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","getCustomRender","title","render","isValidElement","isFunction","getIsFirstChildTdSetBorderWidth","rowIndex","colIndex","preRowColumns","React","createElement","map","trsColumnsItem","key","column","customRender","isFirstChildTdSetBorderWidth","TableCell","type"],"mappings":"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"}

package/esm/table/base/TableLoadingBody.js

@@ -1,13 +1,13 @@
 /**
- * tdesign v0.24.2
+ * tdesign v0.25.2
  * (c) 2022 tdesign
  * @license MIT
  */
 
-import { i as isFunction_1 } from '../../_chunks/dep-042bedbb.js';
-import '../../_chunks/dep-5eae925d.js';
-import '../../_chunks/dep-727523bf.js';
-import '../../_chunks/dep-e2c3e976.js';
+import { i as isFunction_1 } from '../../_chunks/dep-98412f1b.js';
+import '../../_chunks/dep-04a6c042.js';
+import '../../_chunks/dep-8aee3ad0.js';
+import '../../_chunks/dep-e4bd3f59.js';
 
 function TableLoadingBody(props) {
   var loading = props.loading;

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

@@ -1,12 +1,12 @@
 /// <reference types="react" />
+import { DragSortInnerProps } from '../../_util/useDragSorter';
 import { DataType, TdBaseTableProps, TdPrimaryTableProps } from '../type';
 import { RowSkipTdSpanColIndexsMap, RowEvents } from './TableBody';
-import { ExpandInnerProps, DragSortInnerProps } from './Table';
+import { ExpandInnerProps } from './Table';
 interface MergeCellsProps {
     rowspanAndColspan?: TdBaseTableProps['rowspanAndColspan'];
     isRowspanAndColspanFn?: boolean;
     rowSkipTdSpanColIndexsMap?: RowSkipTdSpanColIndexsMap;
-    dataLength?: number;
 }
 interface ExpandProps extends ExpandInnerProps {
     expandedRow?: TdPrimaryTableProps['expandedRow'];