@oceanbase/design 1.0.0-alpha.2 → 1.0.0-alpha.21

package/es/style/reset.css

@@ -1 +1,2 @@
-@import '~antd/dist/reset.css';
+/* antd/dist/reset.css is imported in global.tsx */
+/* reserve this file for compatibility with antd */

package/es/switch/index.js

@@ -1,3 +1,4 @@
+"use client";
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["prefixCls", "className"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -5,6 +6,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Switch as AntSwitch } from 'antd';
@@ -22,9 +29,10 @@ var InternalSwitch = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('switch', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR;
+    _useStyle2 = _slicedToArray(_useStyle, 1),
+    wrapCSSVar = _useStyle2[0];
   var switchCls = classNames(className);
-  return wrapSSR( /*#__PURE__*/_jsx(AntSwitch, _objectSpread({
+  return wrapCSSVar( /*#__PURE__*/_jsx(AntSwitch, _objectSpread({
     ref: ref,
     prefixCls: customizePrefixCls,
     className: switchCls

package/es/switch/style/index.d.ts

@@ -1,9 +1,6 @@
 /// <reference types="react" />
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
+import type { FullToken, GenerateStyle } from '../../theme/interface';
 export type SwitchToken = FullToken<'Switch'>;
 export declare const genSwitchStyle: GenerateStyle<SwitchToken>;
-declare const _default: (prefixCls: string) => {
-    wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    hashId: string;
-};
+declare const _default: (prefixCls: string, rootCls?: string) => readonly [(node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, string, string];
 export default _default;

package/es/switch/style/index.js

@@ -2,16 +2,15 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
+import { genStyleHooks } from "../../_util/genComponentStyleHook";
 export var genSwitchStyle = function genSwitchStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-checked):not(").concat(componentCls, "-disabled):not(").concat(componentCls, "-loading)"), {
+  return _defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-checked):not(").concat(componentCls, "-disabled):not(").concat(componentCls, "-loading)"), _defineProperty({
     background: token.colorTextTertiary
-  });
+  }, "&:hover", {
+    background: token.colorTextSecondary
+  }));
 };
-export default (function (prefixCls) {
-  var useStyle = genComponentStyleHook('Switch', function (token) {
-    return [genSwitchStyle(token)];
-  });
-  return useStyle(prefixCls);
+export default genStyleHooks('Switch', function (token) {
+  return [genSwitchStyle(token)];
 });

package/es/table/index.d.ts

@@ -41,10 +41,7 @@ declare const _default: (<RecordType extends AnyObject = AnyObject>(props: Table
     Column: <RecordType extends import("antd/es/_util/type").AnyObject>(_: import("antd").TableColumnProps<RecordType>) => null;
     ColumnGroup: <RecordType_1 extends import("antd/es/_util/type").AnyObject>(_: import("antd/es/table/ColumnGroup").ColumnGroupProps<RecordType_1>) => null;
     Summary: typeof Summary;
-    useStyle: (prefixCls: string) => {
-        wrapSSR: (node: ReactNode) => ReactElement<any, string | React.JSXElementConstructor<any>>;
-        hashId: string;
-    };
+    useStyle: (prefixCls: string, rootCls?: string) => readonly [(node: ReactElement<any, string | React.JSXElementConstructor<any>>) => ReactElement<any, string | React.JSXElementConstructor<any>>, string, string];
     useDefaultPagination: (pagination?: false | import("antd").TablePaginationConfig) => false | import("antd").TablePaginationConfig;
 };
 export default _default;

package/es/table/index.js

@@ -1,22 +1,24 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+"use client";
 var _excluded = ["batchOperationBar", "emptyText"];
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Popover, Space, Table as AntTable } from 'antd';
+import { Popover, Space, Table as AntTable, theme } from 'antd';
 import classNames from 'classnames';
 import { isEmpty } from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
+import { FilterOutlined, SwapRightOutlined } from '@oceanbase/icons';
 import ConfigProvider from "../config-provider";
 import Typography from "../typography";
 import Empty from "../empty";
@@ -27,12 +29,122 @@ import enUS from "../locale/en-US";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export * from 'antd/es/table';
+
+/** 第一个非 hidden 的叶子列（支持 column 分组） */
+function getFirstLeafColumn(cols) {
+  if (!cols) {
+    return null;
+  }
+  for (var _i = 0, _arr = cols; _i < _arr.length; _i++) {
+    var _item$children;
+    var item = _arr[_i];
+    if (item.hidden) {
+      continue;
+    }
+    if ((_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) {
+      var found = getFirstLeafColumn(item.children);
+      if (found) {
+        return found;
+      }
+    } else {
+      return item;
+    }
+  }
+  return null;
+}
+
+/** 最后一个非 hidden 的叶子列 */
+function getLastLeafColumn(cols) {
+  if (!cols) {
+    return null;
+  }
+  for (var i = cols.length - 1; i >= 0; i--) {
+    var _item$children2;
+    var item = cols[i];
+    if (item.hidden) {
+      continue;
+    }
+    if ((_item$children2 = item.children) !== null && _item$children2 !== void 0 && _item$children2.length) {
+      var found = getLastLeafColumn(item.children);
+      if (found) {
+        return found;
+      }
+    } else {
+      return item;
+    }
+  }
+  return null;
+}
+
+/** 叶子列数量（与 rc-table 扁平列顺序一致：深度优先跳过 hidden） */
+function countLeafColumns(cols) {
+  if (!(cols !== null && cols !== void 0 && cols.length)) {
+    return 0;
+  }
+  var n = 0;
+  var walk = function walk(items) {
+    for (var _i2 = 0, _arr2 = items; _i2 < _arr2.length; _i2++) {
+      var _item$children3;
+      var item = _arr2[_i2];
+      if (item.hidden) {
+        continue;
+      }
+      if ((_item$children3 = item.children) !== null && _item$children3 !== void 0 && _item$children3.length) {
+        walk(item.children);
+      } else {
+        n += 1;
+      }
+    }
+  };
+  walk(cols);
+  return n;
+}
+
+/**
+ * onCell 写入 data-ob-user-col / 末列 data-ob-user-col-tail，供 Card 无横向 body padding 时纠偏 rowspan 与 :first/:last-child 不一致。
+ * 仅在首列或末列存在 rowspan 时由调用方注入，避免无合并表格多出 DOM 属性。
+ */
+function injectUserColumnCellMeta(cols) {
+  if (!(cols !== null && cols !== void 0 && cols.length)) {
+    return cols;
+  }
+  var tailIdx = countLeafColumns(cols) - 1;
+  var leafIndex = 0;
+  var walk = function walk(items) {
+    return items.map(function (item) {
+      var _item$children4;
+      if (item.hidden) {
+        return item;
+      }
+      if ((_item$children4 = item.children) !== null && _item$children4 !== void 0 && _item$children4.length) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          children: walk(item.children)
+        });
+      }
+      var myIndex = leafIndex;
+      leafIndex += 1;
+      var origOnCell = item.onCell;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        onCell: function onCell(record, rowIndex) {
+          var base = typeof origOnCell === 'function' ? origOnCell(record, rowIndex) || {} : {};
+          return _objectSpread(_objectSpread({}, base), {}, {
+            'data-ob-user-col': String(myIndex)
+          }, myIndex === tailIdx ? {
+            'data-ob-user-col-tail': '1'
+          } : {});
+        }
+      });
+    });
+  };
+  return walk(cols);
+}
 function Table(props, ref) {
   var _enUS$Table, _locale$Table;
   var customLocale = props.locale,
     size = props.size,
     bordered = props.bordered,
     innerBordered = props.innerBordered,
+    dataSource = props.dataSource,
     columns = props.columns,
     footer = props.footer,
     customPagination = props.pagination,
@@ -45,6 +157,8 @@ function Table(props, ref) {
     collapseText = props.collapseText,
     openText = props.openText,
     expandable = props.expandable,
+    scroll = props.scroll,
+    virtual = props.virtual,
     _props$hiddenCancelBt = props.hiddenCancelBtn,
     hiddenCancelBtn = _props$hiddenCancelBt === void 0 ? false : _props$hiddenCancelBt,
     customizePrefixCls = props.prefixCls,
@@ -65,9 +179,76 @@ function Table(props, ref) {
     }) : _customLocale$batchOp2,
     restLocale = _objectWithoutProperties(_customLocale$batchOp, _excluded);
   var prefixCls = getPrefixCls('table', customizePrefixCls);
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token;
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR;
-  var tableCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-expandable"), !isEmpty(expandable)), "".concat(prefixCls, "-selectable"), !!rowSelection), "".concat(prefixCls, "-has-footer"), !!footer), "".concat(prefixCls, "-inner-bordered"), innerBordered), className);
+    _useStyle2 = _slicedToArray(_useStyle, 1),
+    wrapCSSVar = _useStyle2[0];
+  var noPagination = pagination === false || pagination === null;
+  var noData = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0;
+
+  /** 基于原始 columns 检测，避免依赖注入后的 onCell；needsColMeta 为真时才注入 data-* */
+  var _React$useMemo = React.useMemo(function () {
+      var empty = {
+        needsColMeta: false,
+        hasFirstColumnRowSpan: false,
+        hasLastColumnRowSpan: false
+      };
+      if (!(columns !== null && columns !== void 0 && columns.length) || !(dataSource !== null && dataSource !== void 0 && dataSource.length)) {
+        return empty;
+      }
+      var firstCol = getFirstLeafColumn(columns);
+      var lastCol = getLastLeafColumn(columns);
+      var leafHasRowSpan = function leafHasRowSpan(col) {
+        if (typeof (col === null || col === void 0 ? void 0 : col.onCell) !== 'function') {
+          return false;
+        }
+        for (var i = 0; i < dataSource.length; i++) {
+          var _col$onCell;
+          var rs = (_col$onCell = col.onCell(dataSource[i], i)) === null || _col$onCell === void 0 ? void 0 : _col$onCell.rowSpan;
+          if (rs === 0 || typeof rs === 'number' && rs > 1) {
+            return true;
+          }
+        }
+        return false;
+      };
+      var first = leafHasRowSpan(firstCol);
+      var last = firstCol === lastCol ? first : leafHasRowSpan(lastCol);
+      return {
+        needsColMeta: first || last,
+        hasFirstColumnRowSpan: first,
+        hasLastColumnRowSpan: last
+      };
+    }, [columns, dataSource]),
+    needsColMeta = _React$useMemo.needsColMeta,
+    hasFirstColumnRowSpan = _React$useMemo.hasFirstColumnRowSpan,
+    hasLastColumnRowSpan = _React$useMemo.hasLastColumnRowSpan;
+  var columnsWithCellMeta = React.useMemo(function () {
+    return needsColMeta ? injectUserColumnCellMeta(columns) : columns;
+  }, [columns, needsColMeta]);
+  var hasMultipleTheadRows = React.useMemo(function () {
+    if (!(columns !== null && columns !== void 0 && columns.length)) {
+      return false;
+    }
+    return columns.some(function (col) {
+      return Array.isArray(col === null || col === void 0 ? void 0 : col.children) && col.children.length > 0;
+    });
+  }, [columns]);
+
+  /** 包装器上只挂一个 class：has-rowspan-first | has-rowspan-last | has-rowspan-both（与 antd 一致 class 在 wrapper） */
+  var rowspanSuffix = React.useMemo(function () {
+    if (!hasFirstColumnRowSpan && !hasLastColumnRowSpan) {
+      return null;
+    }
+    if (hasFirstColumnRowSpan && hasLastColumnRowSpan) {
+      return 'both';
+    }
+    if (hasFirstColumnRowSpan) {
+      return 'first';
+    }
+    return 'last';
+  }, [hasFirstColumnRowSpan, hasLastColumnRowSpan]);
+  var tableCls = classNames(_objectSpread(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-expandable"), !isEmpty(expandable)), "".concat(prefixCls, "-selectable"), !!rowSelection), "".concat(prefixCls, "-has-footer"), !!footer), rowspanSuffix ? _defineProperty({}, "".concat(prefixCls, "-has-rowspan-").concat(rowspanSuffix), true) : {}), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-thead-multiple-rows"), hasMultipleTheadRows), "".concat(prefixCls, "-inner-bordered"), innerBordered), "".concat(prefixCls, "-no-pagination"), noPagination), "".concat(prefixCls, "-has-empty"), noData), "".concat(prefixCls, "-virtual"), !!virtual)), className);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     openPopover = _useState2[0],
@@ -87,14 +268,68 @@ function Table(props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     currentSelectedInfo = _useState6[0],
     setCurrentSelectedInfo = _useState6[1];
-  var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
+
+  // 递归处理嵌套的 columns，为所有层级的列添加排序和筛选图标
+  var processColumn = React.useCallback(function (item) {
+    var newItem = _objectSpread({}, item);
+    // 自定义排序图标，根据排序状态高亮不同的图标
+    if (item.sorter && !item.sortIcon) {
+      newItem.sortIcon = function (_ref2) {
+        var sortOrder = _ref2.sortOrder;
+        return /*#__PURE__*/_jsxs("span", {
+          className: "".concat(prefixCls, "-column-sorter"),
+          children: [/*#__PURE__*/_jsx(SwapRightOutlined, {
+            rotate: -90,
+            style: sortOrder === 'ascend' ? {
+              color: token.colorPrimary
+            } : {}
+          }), /*#__PURE__*/_jsx(SwapRightOutlined, {
+            rotate: 90,
+            style: _objectSpread(_objectSpread({}, sortOrder === 'descend' ? {
+              color: token.colorPrimary
+            } : {}), {}, {
+              marginLeft: -6,
+              marginRight: -4
+            })
+          })]
+        });
+      };
+    }
+    // 自定义筛选图标
+    if ((item.filters || item.filterDropdown) && !item.filterIcon) {
+      newItem.filterIcon = function () {
+        return /*#__PURE__*/_jsx(FilterOutlined, {});
+      };
+    }
+    // 递归处理 children
+    if (item.children && Array.isArray(item.children)) {
+      newItem.children = item.children.map(function (child) {
+        return processColumn(child);
+      });
+    }
+    return newItem;
+  }, [prefixCls, token.colorPrimary]);
+
+  // 找到最后一个非 hidden 的列索引
+  var lastVisibleColumnIndex = React.useMemo(function () {
+    if (!columnsWithCellMeta) return -1;
+    for (var i = columnsWithCellMeta.length - 1; i >= 0; i--) {
+      if (!columnsWithCellMeta[i].hidden) {
+        return i;
+      }
+    }
+    return -1;
+  }, [columnsWithCellMeta]);
+  var newColumns = columnsWithCellMeta === null || columnsWithCellMeta === void 0 ? void 0 : columnsWithCellMeta.map(function (item, colIndex) {
+    var isLastVisibleColumn = colIndex === lastVisibleColumnIndex;
+    var newItem = processColumn(item);
     if (item.ellipsis) {
-      return _objectSpread(_objectSpread({}, item), {}, {
+      newItem = _objectSpread(_objectSpread({}, newItem), {}, {
         ellipsis: item.ellipsis === true ? item.ellipsis : _objectSpread({
           showTitle: false
         }, item.ellipsis),
-        render: function render(text, record, index) {
-          var element = item.render ? item.render(text, record, index) : record[item.dataIndex];
+        render: function render(text, record, rowIndex) {
+          var element = item.render ? item.render(text, record, rowIndex) : record[item.dataIndex];
           var elementType = element === null || element === void 0 ? void 0 : element.type;
           // 如果目标元素已经被 Tooltip 包裹，则去掉默认的 Tooltip，避免有两个 Tooltip
           return (elementType === null || elementType === void 0 ? void 0 : elementType.__ANT_TOOLTIP) === true ? element : /*#__PURE__*/_jsx(Typography.Text, {
@@ -111,7 +346,16 @@ function Table(props, ref) {
         }
       });
     }
-    return item;
+    // 为最后一个可见列添加 className，用于 innerBordered 模式下正确识别视觉上的最后一列
+    if (isLastVisibleColumn) {
+      return _objectSpread(_objectSpread({}, newItem), {}, {
+        className: classNames(newItem.className, "".concat(prefixCls, "-cell-last-column"))
+      });
+    }
+    return newItem;
+  });
+  var hasEllipsisColumn = newColumns.some(function (item) {
+    return item.ellipsis;
   });
   var handleSelectedData = function handleSelectedData(selectedRowKeys, selectedRows, info) {
     setCurrentSelectedRowKeys(selectedRowKeys);
@@ -146,16 +390,9 @@ function Table(props, ref) {
           style: {
             marginRight: 24
           },
-          children: [toolAlertRender && toolAlertRender(currentSelectedRowKeys, currentSelectedRows), !toolAlertRender && toolAlertRender !== false && /*#__PURE__*/_jsxs("span", {
+          children: [toolAlertRender && toolAlertRender(currentSelectedRowKeys, currentSelectedRows), !toolAlertRender && toolAlertRender !== false && /*#__PURE__*/_jsx("span", {
             className: "".concat(prefixCls, "-batch-operation-selection"),
-            children: [/*#__PURE__*/_jsx("span", {
-              children: batchOperationBar === null || batchOperationBar === void 0 ? void 0 : batchOperationBar.selected
-            }), /*#__PURE__*/_jsx("span", {
-              className: "".concat(prefixCls, "-batch-operation-selection-count"),
-              children: (currentSelectedRowKeys === null || currentSelectedRowKeys === void 0 ? void 0 : currentSelectedRowKeys.length) || 0
-            }), /*#__PURE__*/_jsx("span", {
-              children: batchOperationBar === null || batchOperationBar === void 0 ? void 0 : batchOperationBar.object
-            })]
+            children: "".concat(batchOperationBar === null || batchOperationBar === void 0 ? void 0 : batchOperationBar.selected, " ").concat((currentSelectedRowKeys === null || currentSelectedRowKeys === void 0 ? void 0 : currentSelectedRowKeys.length) || 0, " ").concat(batchOperationBar === null || batchOperationBar === void 0 ? void 0 : batchOperationBar.object)
           }), !hiddenCancelBtn && /*#__PURE__*/_jsx("a", {
             onClick: handleOptionsCancel,
             children: cancelText !== null && cancelText !== void 0 ? cancelText : batchOperationBar === null || batchOperationBar === void 0 ? void 0 : batchOperationBar.cancel
@@ -181,7 +418,7 @@ function Table(props, ref) {
       })]
     });
   };
-  return wrapSSR( /*#__PURE__*/_jsx(AntTable, _objectSpread(_objectSpread({}, props), {}, {
+  return wrapCSSVar( /*#__PURE__*/_jsx(AntTable, _objectSpread(_objectSpread({}, props), {}, {
     ref: ref,
     prefixCls: customizePrefixCls,
     className: tableCls,
@@ -193,6 +430,7 @@ function Table(props, ref) {
     }),
     size: size,
     bordered: bordered || innerBordered,
+    dataSource: dataSource,
     columns: newColumns,
     rowClassName: function rowClassName() {
       return classNames(typeof _rowClassName === 'function' ? _rowClassName.apply(void 0, arguments) : _rowClassName, _defineProperty({}, "".concat(prefixCls, "-expand-row-by-click"), expandable === null || expandable === void 0 ? void 0 : expandable.expandRowByClick));
@@ -209,8 +447,12 @@ function Table(props, ref) {
         rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang2 = rowSelection.onChange) === null || _rowSelection$onChang2 === void 0 || _rowSelection$onChang2.call(rowSelection, selectedRowKeys, selectedRows, info);
       }
     }) : undefined,
+    scroll: _objectSpread({
+      // enable auto x scroll when there is no ellipsis column
+      x: hasEllipsisColumn ? undefined : 'max-content'
+    }, scroll),
     footer: footer,
-    pagination: pagination === false ? false : _objectSpread(_objectSpread({}, pagination), {}, {
+    pagination: noPagination ? false : _objectSpread(_objectSpread({}, pagination), {}, {
       hideOnSinglePage: toolAlertRender || toolOptionsRender || toolSelectedContent || pagination !== null && pagination !== void 0 && pagination.showSizeChanger ? false : (pagination === null || pagination === void 0 ? void 0 : pagination.hideOnSinglePage) !== undefined ? pagination === null || pagination === void 0 ? void 0 : pagination.hideOnSinglePage : extendedContext.hideOnSinglePage,
       showTotal: renderOptionsBar
     })

package/es/table/style/index.d.ts

@@ -1,10 +1,7 @@
 /// <reference types="react" />
 import type { CSSObject } from '@ant-design/cssinjs';
-import type { FullToken } from 'antd/es/theme/internal';
+import type { FullToken } from '../../theme/interface';
 export type TableToken = FullToken<'Table'>;
 export declare const genTableStyle: (token: TableToken) => CSSObject;
-declare const _default: (prefixCls: string) => {
-    wrapSSR: (node: import("react").ReactNode) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
-    hashId: string;
-};
+declare const _default: (prefixCls: string, rootCls?: string) => readonly [(node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, string, string];
 export default _default;