tntd 2.8.0-beta.8 → 2.8.1

package/lib/table/style/index.less

@@ -95,7 +95,7 @@
         .@{table-prefix-cls}-column-sorter-up,
         .@{table-prefix-cls}-column-sorter-down {
           .iconfont-size-under-12px(11px);
-
+          font-size: 12px !important;
           display: block;
           height: 1em;
           line-height: 1em;
@@ -234,23 +234,23 @@
     transition: all 0.3s, height 0s;
     &.@{table-prefix-cls}-row-hover,
     &:hover {
-      &:not(.@{table-prefix-cls}-expanded-row):not(.@{table-prefix-cls}-row-selected) > td {
+      &:not(.@{table-prefix-cls}-expanded-row) > td {
         background: @table-row-hover-bg;
       }
     }
-    &.@{table-prefix-cls}-row-selected > td {
-      &.@{table-prefix-cls}-column-sort {
-        background: @table-body-selected-sort-bg;
-      }
-    }
-    &:hover {
-      &.@{table-prefix-cls}-row-selected > td {
-        background: @table-selected-row-hover-bg;
-        &.@{table-prefix-cls}-column-sort {
-          background: @table-body-selected-sort-bg;
-        }
-      }
-    }
+    // &.@{table-prefix-cls}-row-selected > td {
+    //   &.@{table-prefix-cls}-column-sort {
+    //     background: @table-body-selected-sort-bg;
+    //   }
+    // }
+    // &:hover {
+    //   &.@{table-prefix-cls}-row-selected > td {
+    //     background: @table-selected-row-hover-bg;
+    //     &.@{table-prefix-cls}-column-sort {
+    //       background: @table-body-selected-sort-bg;
+    //     }
+    //   }
+    // }
   }
 
   &-thead > tr:hover {
@@ -258,12 +258,11 @@
   }
 
   &-footer {
-    position: relative;
+    // position: relative;
     padding: @table-padding-vertical @table-padding-horizontal;
     color: @table-footer-color;
     background: @table-footer-bg;
     border-top: @border-width-base @border-style-base @border-color-split;
-    border-radius: 0 0 @table-border-radius-base @table-border-radius-base;
     &::before {
       position: absolute;
       top: -1px;
@@ -275,26 +274,25 @@
     }
   }
 
-  &.@{table-prefix-cls}-bordered &-footer {
-    border: @border-width-base @border-style-base @border-color-split;
-  }
+  // &.@{table-prefix-cls}-bordered &-footer {
+  //   border: @border-width-base @border-style-base @border-color-split;
+  // }
 
   &-title {
-    position: relative;
-    top: 1px;
+    // position: relative;
+    // top: 1px;
     padding: @table-padding-vertical 0;
-    border-radius: @table-border-radius-base @table-border-radius-base 0 0;
   }
 
   &.@{table-prefix-cls}-bordered &-title {
     padding-right: @table-padding-horizontal;
     padding-left: @table-padding-horizontal;
-    border: @border-width-base @border-style-base @border-color-split;
+    border-bottom: @border-width-base @border-style-base @border-color-split;
   }
 
   &-title + &-content {
     position: relative;
-    border-radius: @table-border-radius-base @table-border-radius-base 0 0;
+    // border-radius: @table-border-radius-base @table-border-radius-base 0 0;
 
     .@{table-prefix-cls}-bordered & {
       &,
@@ -318,8 +316,22 @@
   }
 
   &-tbody > tr.@{table-prefix-cls}-row-selected td {
-    color: @table-selected-row-color;
-    background: @table-selected-row-bg;
+    // color: @table-selected-row-color;
+    // background: @table-selected-row-bg;
+    &.@{table-prefix-cls}-selection-column {
+      position: relative;
+      &::after {
+        content: ' ';
+        width: 4px;
+        height: calc(100% - 10px);
+        background: @blue-5;
+        display: block;
+        position: absolute;
+        top: 5px;
+        left: 0;
+        border-radius: 0 4px 4px 0;
+      }
+    }
   }
 
   &-thead > tr > th.@{table-prefix-cls}-column-sort {
@@ -375,19 +387,23 @@
   }
 
   &-bordered {
-    .@{table-prefix-cls}-header > table,
-    .@{table-prefix-cls}-body > table,
-    .@{table-prefix-cls}-fixed-left table,
-    .@{table-prefix-cls}-fixed-right table {
-      border: @border-width-base @border-style-base @border-color-split;
-      border-right: 0;
-      border-bottom: 0;
-    }
+    border: @border-width-base @border-style-base @border-color-split;
+    border-radius: @border-radius-base;
+    overflow: hidden;
+    // .@{table-prefix-cls}-header > table,
+    // .@{table-prefix-cls}-body > table,
+    // .@{table-prefix-cls}-fixed-left table,
+    // .@{table-prefix-cls}-fixed-right table {
+    //   border: @border-width-base @border-style-base @border-color-split;
+    //   border-right: 0;
+    //   border-bottom: 0;
+    // }
 
     &.@{table-prefix-cls}-empty {
       .@{table-prefix-cls}-placeholder {
-        border-right: @border-width-base @border-style-base @border-color-split;
-        border-left: @border-width-base @border-style-base @border-color-split;
+        // border-right: @border-width-base @border-style-base @border-color-split;
+        // border-left: @border-width-base @border-style-base @border-color-split;
+        border-bottom: 0;
       }
     }
 
@@ -414,6 +430,27 @@
     .@{table-prefix-cls}-thead > tr > th,
     .@{table-prefix-cls}-tbody > tr > td {
       border-right: @border-width-base @border-style-base @border-color-split;
+      &:last-child {
+        border-right: 0;
+      }
+    }
+    .@{table-prefix-cls}-fixed-left {
+      .@{table-prefix-cls}-thead > tr > th,
+      .@{table-prefix-cls}-tbody > tr > td {
+        &:last-child {
+          border-right: @border-width-base @border-style-base @border-color-split;
+        }
+      }
+    }
+    .@{table-prefix-cls}-content:has(.@{table-prefix-cls}-fixed-right) .@{table-prefix-cls}-scroll {
+      .@{table-prefix-cls}-thead > tr > th {
+        &:last-child {
+          border-right: @border-width-base @border-style-base @border-color-split;
+        }
+      }
+    }
+    .@{table-prefix-cls}-tbody > tr:last-child > td {
+      border-bottom: 0;
     }
   }
 
@@ -428,7 +465,7 @@
     background: @component-background;
     border-top: @border-width-base @border-style-base @border-color-split;
     border-bottom: @border-width-base @border-style-base @border-color-split;
-    border-radius: 0 0 @border-radius-base @border-radius-base;
+    // border-radius: 0 0 @border-radius-base @border-radius-base;
   }
 
   &-pagination.@{ant-prefix}-pagination {
@@ -604,7 +641,8 @@
     }
 
     td > .@{table-prefix-cls}-wrapper {
-      margin: -@table-padding-vertical -@table-padding-horizontal calc(-@table-padding-vertical - 1px);
+      margin: -@table-padding-vertical -@table-padding-horizontal
+        calc(-@table-padding-vertical - 1px);
     }
   }
 

package/lib/table/style/size.less

@@ -1,5 +1,6 @@
 @table-padding-vertical-md: @table-padding-vertical * 3 / 4;
 @table-padding-horizontal-md: @table-padding-horizontal / 2;
+@table-padding-horizontal-md: @table-padding-horizontal;
 @table-padding-vertical-sm: @table-padding-vertical / 2;
 @table-padding-horizontal-sm: @table-padding-horizontal / 2;
 

package/lib/table/table.d.ts

@@ -7,6 +7,7 @@ export declare type TableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {
     enableToolbar?: boolean;
     showCellBorders?: boolean;
     striped?: boolean;
+    sticky?: boolean;
     shadowed?: boolean;
     locale?: AntdTableProps<T>['locale'] & {
         loadingDescription?: string;
@@ -15,10 +16,11 @@ export declare type TableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {
     refresh?(): void;
     unUpperConverted?: boolean;
     unTooltip?: boolean;
+    smallPadding?: boolean;
     upperCaseIgnore?: string[];
 };
 export declare const Table: {
-    <T>({ className, locale, bordered, size, storageKey, columns, children, shadowed, striped, showCellBorders, enableToolbar, refresh, upperCaseIgnore, unUpperConverted, unTooltip, ...rest }: TableProps<T>): React.JSX.Element;
+    <T>({ className, locale, bordered, size, storageKey, columns, children, sticky, shadowed, striped, showCellBorders, enableToolbar, refresh, upperCaseIgnore, unUpperConverted, unTooltip, smallPadding, ...rest }: TableProps<T>): React.JSX.Element;
     Column: typeof Column;
     ColumnGroup: typeof ColumnGroup;
     displayName: string;

package/lib/table/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,IAAI,cAAc,EAI7B,MAAM,eAAe,CAAA;AAEtB,OAAO,MAAM,MAAM,sBAAsB,CAAA;AACzC,OAAO,WAAW,MAAM,2BAA2B,CAAA;AAEnD,OAAO,KAA0B,MAAM,OAAO,CAAA;AAgB9C,oBAAY,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG;QACrC,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,CAAC,IAAI,IAAI,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B,CAAA;AAmBD,eAAO,MAAM,KAAK;;;;;;CA2LjB,CAAA"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,IAAI,cAAc,EAI7B,MAAM,eAAe,CAAA;AAEtB,OAAO,MAAM,MAAM,sBAAsB,CAAA;AACzC,OAAO,WAAW,MAAM,2BAA2B,CAAA;AAEnD,OAAO,KAAoC,MAAM,OAAO,CAAA;AAmBxD,oBAAY,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG;QACrC,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;IACD,OAAO,CAAC,IAAI,IAAI,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B,CAAA;AAmBD,eAAO,MAAM,KAAK;;;;;;CAsOjB,CAAA"}

package/lib/table/table.js

@@ -19,6 +19,7 @@ var _utils = require("./utils");
 var _lang = require("../utils/lang");
 var _totalShower = require("./total-shower");
 var _prevLocale = require("../prev-locale");
+var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -75,6 +76,8 @@ var Table = exports.Table = function Table(_a) {
     storageKey = _a.storageKey,
     columns = _a.columns,
     children = _a.children,
+    _a$sticky = _a.sticky,
+    sticky = _a$sticky === void 0 ? false : _a$sticky,
     shadowed = _a.shadowed,
     _a$striped = _a.striped,
     striped = _a$striped === void 0 ? false : _a$striped,
@@ -86,7 +89,8 @@ var Table = exports.Table = function Table(_a) {
     upperCaseIgnore = _a.upperCaseIgnore,
     unUpperConverted = _a.unUpperConverted,
     unTooltip = _a.unTooltip,
-    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "shadowed", "striped", "showCellBorders", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip"]);
+    smallPadding = _a.smallPadding,
+    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "sticky", "shadowed", "striped", "showCellBorders", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip", "smallPadding"]);
   var tableContainer = (0, _react.useRef)(null);
   // const [innerSize, setInnerSize] = useLocalStorage<TableProps<T>['size']>(
   //   TABLE_SIZE_STORAGE_KEY,
@@ -100,6 +104,10 @@ var Table = exports.Table = function Table(_a) {
     displayColumns = _useColumnSetting2[0],
     columnSetting = _useColumnSetting2[1],
     setColumnSetting = _useColumnSetting2[2];
+  var _useState = (0, _react.useState)(Number),
+    _useState2 = _slicedToArray(_useState, 2),
+    fixedWidth = _useState2[0],
+    setFixedWidth = _useState2[1];
   var lang = (0, _prevLocale.getLanguage)();
   var newColumns = displayColumns;
   //   非中文做处理
@@ -179,6 +187,32 @@ var Table = exports.Table = function Table(_a) {
   //     setInnerSize(size)
   //   }
   // }, [setInnerSize, size])
+  /**
+   * expand 与 fix 兼容，expand悬浮
+   */
+  var _useExpandFixed = (0, _hooks.useExpandFixed)(),
+    _useExpandFixed2 = _slicedToArray(_useExpandFixed, 2),
+    tableKey = _useExpandFixed2[0],
+    trigger = _useExpandFixed2[1];
+  var stickyProps = (0, _react.useMemo)(function () {
+    return {
+      onExpandedRowsChange: function onExpandedRowsChange(arg) {
+        var key = arg && arg[arg.length - 1];
+        if (rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange) rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange([Number(key)]);
+        // 触发MutationObserver监听
+        trigger(key);
+      },
+      expandedRowRender: (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender) ? function (record, index, indent, expanded) {
+        var padding = 0;
+        return _react["default"].createElement("div", {
+          className: "ant-table-expanded-row-fixed",
+          style: {
+            width: fixedWidth + padding
+          }
+        }, (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender) && (rest === null || rest === void 0 ? void 0 : rest.expandedRowRender(record, index, indent, expanded)));
+      } : undefined
+    };
+  }, [rest === null || rest === void 0 ? void 0 : rest.expandedRowRender, rest === null || rest === void 0 ? void 0 : rest.onExpandedRowsChange, trigger]);
   return _react["default"].createElement(_context.TableContext.Provider, {
     value: {
       // size: innerSize,
@@ -200,15 +234,20 @@ var Table = exports.Table = function Table(_a) {
     }, function (localeObject) {
       //   const locale = localeObject as Record<string, string>
       //   const paginationConfig = pagination ? getDefaultPagination(locale) : pagination
-      return _react["default"].createElement(_table["default"], Object.assign({
+      return _react["default"].createElement(_rcResizeObserver["default"], {
+        onResize: function onResize(_ref2) {
+          var width = _ref2.width;
+          setFixedWidth(width);
+        }
+      }, _react["default"].createElement(_table["default"], Object.assign({
         className: (0, _classnames["default"])(
         // prefixCls,
-        'tnt-table-wrapper', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-borderless"), !bordered), "".concat(prefixCls, "-hide-cell-borders"), !showCellBorders), "".concat(prefixCls, "-size-small"), size === 'small'), "".concat(prefixCls, "-size-middle"), size === 'middle'), "".concat(prefixCls, "-striped"), striped), "".concat(prefixCls, "-shadowed"), shadowed), className),
+        'tnt-table-wrapper', "".concat(tableKey, " collapse-panel"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-borderless"), !bordered), "".concat(prefixCls, "-hide-cell-borders"), !showCellBorders), "".concat(prefixCls, "-size-small"), size === 'small'), "".concat(prefixCls, "-size-middle"), size === 'middle'), "".concat(prefixCls, "-striped"), striped), "".concat(prefixCls, "-shadowed"), shadowed), "".concat(prefixCls, "-small-padding"), smallPadding), "".concat(prefixCls, "-sticky"), sticky), className),
         locale: locale,
         bordered: bordered,
         size: size,
         columns: newColumns
-      }, rest));
+      }, rest, sticky ? stickyProps : {})));
     }));
   }));
 };

package/lib/table/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAwD;AACxD,4FAAmE;AAOnE,0DAAoD;AACpD,kEAAyC;AACzC,4EAAmD;AACnD,4DAAmC;AACnC,+CAA8C;AAC9C,2DAAkC;AAClC,uCAAwC;AACxC,mCAA0C;AAC1C,mCAA0C;AAC1C,wCAA8C;AAC9C,iDAA4C;AAC5C,gDAA4C;AAE5C,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;IACT,EAAE,EAAE,EAAE,EAAE,IAAI;CACb,CAAA;AAkBD,MAAM,oBAAoB,GAAG,CAAC,MAAsD,EAAE,EAAE,CAAC,CAAC;IACxF,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,8BAAC,0BAAW,IAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAI;CAC5E,CAAC,CAAA;AAEF,kBAAkB;AAClB,iDAAiD;AACjD,kCAAkC;AAClC,qCAAqC;AACrC,0DAA0D;AAC1D,mEAAmE;AACnE,0BAA0B;AAC1B,UAAU;AACV,QAAQ;AACR,MAAM;AACN,oBAAoB;AACpB,IAAI;AAEG,MAAM,KAAK,GAAG,CAAK,EAkBV,EAAE,EAAE;QAlBM,EACxB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,OAAO,GAAG,KAAK,EACf,eAAe,GAAG,KAAK;IACvB,gBAAgB;IAChB,aAAa,GAAG,KAAK,EACrB,OAAO,EACP,eAAe,EACf,gBAAgB,EAAE,SAAS;IAC3B,SAAS,OAEK,EADX,IAAI,cAjBiB,0MAkBzB,CADQ;IAEP,MAAM,cAAc,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IACnD,4EAA4E;IAC5E,4BAA4B;IAC5B,cAAc;IACd,IAAI;IACJ,MAAM,iBAAiB,GAAG,IAAA,eAAO,EAC/B,GAAG,EAAE,CAAC,OAAO,IAAI,IAAA,wBAAgB,EAAI,QAA+B,CAAC,EACrE,CAAC,QAAQ,EAAE,OAAO,CAAC,CACpB,CAAA;IACD,MAAM,CAAC,cAAc,EAAE,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,wBAAgB,EACxE,iBAAiB,EACjB,UAAU,CACX,CAAA;IAED,MAAM,IAAI,GAAG,IAAA,yBAAW,GAAE,CAAA;IAC1B,IAAI,UAAU,GAAG,cAAc,CAAA;IAC/B,WAAW;IACX,IAAI,IAAI,KAAK,IAAI,EAAE;QACjB,IAAI,CAAC,gBAAgB,EAAE;YACrB,UAAU,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1C,uCACK,MAAM,KACT,KAAK,EAAE,CAAC,OAIP,EAAE,EAAE;wBACH,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;wBACxB,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;4BAC/B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;yBACvB;wBAED,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;4BAC/B,MAAM,cAAc,GAAG,CAAC,QAAqB,EAAmB,EAAE;;gCAChE,IAAI,eAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oCAC7D,OAAO,MAAA,eAAK,aAAL,eAAK,uBAAL,eAAK,CAAE,QAAQ,0CAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;;wCAC9C,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;4CAC/B,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAQ,CAAA;4CAC7C,OAAO,eAAK,CAAC,YAAY,CAAC,KAAK,kCAC1B,UAAU,KACb,QAAQ,EAAE,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,MAAM;oDACnC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC;oDACrC,CAAC,CAAC,UAAU,CAAC,QAAQ,EACvB,KAAK,EAAE,IAAA,qBAAc,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EAAE,eAAe,CAAC,IACzD,CAAA;yCACH;6CAAM;4CACL,OAAO,IAAA,qBAAc,EAAC,KAAK,EAAE,eAAe,CAAC,CAAA;yCAC9C;oCACH,CAAC,CAAC,CAAA;iCACH;gCAED,OAAO,IAAA,qBAAc,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;4BAClD,CAAC,CAAA;4BAED,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;yBAC5C;wBAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BAC7B,OAAO,IAAA,qBAAc,EAAC,KAAK,EAAE,eAAe,CAAC,CAAA;yBAC9C;oBACH,CAAC,IACF;YACH,CAAC,CAAC,CAAA;SACH;QACD,IAAI,CAAC,SAAS,EAAE;YACd,UAAU,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC1D,OAAO,MAAM,CAAA;iBACd;qBAAM;oBACL,uCACK,MAAM,KACT,KAAK,EAAE,CAAC,OAIP,EAAE,EAAE;4BACH,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;4BACxB,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gCAC/B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;6BACvB;4BAED,IAAI,aAAa,GAAG,EAAE,CAAA;4BACtB,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gCACvD,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;gCACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oCAC7B,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;iCACtC;gCACD,aAAa,GAAG;oCACd,UAAU,EACR,MAAM,CAAC,KAAK,CAAC;wCACb,MAAM,CAAC,YAAY,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC;wCACvC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;iCAC3B,CAAA;6BACF;4BACD,OAAO,CACL,8BAAC,kBAAQ,oBACH,aAAa,IACjB,SAAS,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,SAAS,EACzC,KAAK,EAAE,KAAK,IACZ,CACH,CAAA;wBACH,CAAC,IACF;iBACF;YACH,CAAC,CAAC,CAAA;SACH;KACF;IAED;;OAEG;IACH,oBAAoB;IACpB,gBAAgB;IAChB,yBAAyB;IACzB,MAAM;IACN,2BAA2B;IAE3B,OAAO,CACL,8BAAC,sBAAY,CAAC,QAAQ,IACpB,KAAK,EAAE;YACL,mBAAmB;YACnB,cAAc;YACd,aAAa;YACb,OAAO;YACP,eAAe;YACf,yBAAyB;YACzB,gBAAgB;SACjB;QAED,8BAAC,gCAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YACpB,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACvC,OAAO,CACL,uCAAK,GAAG,EAAE,cAAc;gBACtB,8BAAC,wBAAc,IAAC,aAAa,EAAC,OAAO,EAAC,aAAa,EAAE,MAAM,IACxD,CAAC,YAAY,EAAE,EAAE;oBAChB,0DAA0D;oBAC1D,oFAAoF;oBACpF,OAAO,CACL,8BAAC,eAAS,kBACR,SAAS,EAAE,IAAA,oBAAU;wBACnB,aAAa;wBACb,mBAAmB,EACnB;4BACE,CAAC,GAAG,SAAS,aAAa,CAAC,EAAE,CAAC,QAAQ;4BACtC,CAAC,GAAG,SAAS,oBAAoB,CAAC,EAAE,CAAC,eAAe;4BACpD,CAAC,GAAG,SAAS,aAAa,CAAC,EAAE,IAAI,KAAK,OAAO;4BAC7C,CAAC,GAAG,SAAS,cAAc,CAAC,EAAE,IAAI,KAAK,QAAQ;4BAC/C,CAAC,GAAG,SAAS,UAAU,CAAC,EAAE,OAAO;4BACjC,CAAC,GAAG,SAAS,WAAW,CAAC,EAAE,QAAQ;yBACpC,EACD,SAAS,CACV,EACD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,UAAU,IACf,IAAI,EACR,CACH,CAAA;gBACH,CAAC,CACc,CACb,CACP,CAAA;QACH,CAAC,CACc,CACK,CACzB,CAAA;AACH,CAAC,CAAA;AA3LY,QAAA,KAAK,SA2LjB;AAED,aAAK,CAAC,MAAM,GAAG,gBAAM,CAAA;AACrB,aAAK,CAAC,WAAW,GAAG,qBAAW,CAAA;AAC/B,aAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAC3B,aAAK,CAAC,cAAc,GAAG,qBAAc,CAAA","sourcesContent":["import { ConfigConsumer } from 'antd/lib/config-provider'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport type {\n  TableProps as AntdTableProps,\n  ColumnProps,\n  TableStateFilters,\n  SortOrder,\n} from 'antd/lib/table'\nimport { default as AntdTable } from 'antd/lib/table'\nimport Column from 'antd/lib/table/Column'\nimport ColumnGroup from 'antd/lib/table/ColumnGroup'\nimport classNames from 'classnames'\nimport React, { useMemo, useRef } from 'react'\nimport Ellipsis from '../ellipsis'\nimport { TableContext } from './context'\nimport { useColumnSetting } from './hooks'\nimport { normalizeColumns } from './utils'\nimport { titleCaseUpper } from '../utils/lang'\nimport { TotalShower } from './total-shower'\nimport { getLanguage } from '../prev-locale'\n\nconst sizeWidthMap = {\n  default: 40, //20\n  middle: 20, //10\n  small: 20, //10\n  xs: 16, // 8\n}\n\nexport type TableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {\n  storageKey?: string\n  enableToolbar?: boolean\n  showCellBorders?: boolean\n  striped?: boolean\n  shadowed?: boolean\n  locale?: AntdTableProps<T>['locale'] & {\n    loadingDescription?: string\n    emptyText?: string\n  }\n  refresh?(): void\n  unUpperConverted?: boolean // 不要转换表头\n  unTooltip?: boolean // 不要tooltip\n  upperCaseIgnore?: string[]\n}\n\nconst getDefaultPagination = (locale: NonNullable<AntdTableProps<unknown>['locale']>) => ({\n  showTotal: (total: number) => <TotalShower total={total} locale={locale} />,\n})\n\n// 判断是否是特殊的tooltip\n// const checkIsPrompt = (dom: any): boolean => {\n//   let isPrompt: boolean = false\n//   if (React.isValidElement(dom)) {\n//     if (dom?.type && typeof dom?.type === 'function') {\n//       if (['Tooltip', 'Popconfirm'].includes(dom?.type?.name)) {\n//         isPrompt = true\n//       }\n//     }\n//   }\n//   return isPrompt\n// }\n\nexport const Table = <T,>({\n  className,\n  locale,\n  bordered,\n  size,\n  storageKey,\n  columns,\n  children,\n  shadowed,\n  striped = false,\n  showCellBorders = false,\n  //   pagination,\n  enableToolbar = false,\n  refresh,\n  upperCaseIgnore,\n  unUpperConverted, // 强制不要转换\n  unTooltip,\n  ...rest\n}: TableProps<T>) => {\n  const tableContainer = useRef<HTMLDivElement>(null)\n  // const [innerSize, setInnerSize] = useLocalStorage<TableProps<T>['size']>(\n  //   TABLE_SIZE_STORAGE_KEY,\n  //   'default'\n  // )\n  const normalizedColumns = useMemo(\n    () => columns || normalizeColumns<T>(children as React.ReactChildren),\n    [children, columns]\n  )\n  const [displayColumns, columnSetting, setColumnSetting] = useColumnSetting(\n    normalizedColumns,\n    storageKey\n  )\n\n  const lang = getLanguage()\n  let newColumns = displayColumns\n  //   非中文做处理\n  if (lang !== 'cn') {\n    if (!unUpperConverted) {\n      newColumns = displayColumns?.map((column) => {\n        return {\n          ...column,\n          title: (options: {\n            filters: TableStateFilters\n            sortOrder?: SortOrder\n            sortColumn?: ColumnProps<T> | null\n          }) => {\n            let title = column.title\n            if (typeof title === 'function') {\n              title = title(options)\n            }\n\n            if (React.isValidElement(title)) {\n              const renderChildren = (children: [] | string): React.ReactNode => {\n                if (React.isValidElement(children) || Array.isArray(children)) {\n                  return React?.Children?.map(children, (child) => {\n                    if (React.isValidElement(child)) {\n                      const childProps = (child.props || {}) as any\n                      return React.cloneElement(child, {\n                        ...childProps,\n                        children: childProps.children?.length\n                          ? renderChildren(childProps.children)\n                          : childProps.children,\n                        title: titleCaseUpper(childProps?.title, upperCaseIgnore),\n                      })\n                    } else {\n                      return titleCaseUpper(child, upperCaseIgnore)\n                    }\n                  })\n                }\n\n                return titleCaseUpper(children, upperCaseIgnore)\n              }\n\n              return renderChildren(title.props.children)\n            }\n\n            if (typeof title === 'string') {\n              return titleCaseUpper(title, upperCaseIgnore)\n            }\n          },\n        }\n      })\n    }\n    if (!unTooltip) {\n      newColumns = newColumns?.map((column) => {\n        if (!(column.width && !String(column.width).includes('%'))) {\n          return column\n        } else {\n          return {\n            ...column,\n            title: (options: {\n              filters: TableStateFilters\n              sortOrder?: SortOrder\n              sortColumn?: ColumnProps<T> | null\n            }) => {\n              let title = column.title\n              if (typeof title === 'function') {\n                title = title(options)\n              }\n\n              let widthLimitObj = {}\n              if (column.width && !String(column.width).includes('%')) {\n                let width = column.width\n                if (typeof width === 'string') {\n                  width = width?.replace(/[^\\d]/g, ' ')\n                }\n                widthLimitObj = {\n                  widthLimit:\n                    Number(width) -\n                    Number(sizeWidthMap[size || 'default']) -\n                    (column.sorter ? 20 : 0),\n                }\n              }\n              return (\n                <Ellipsis\n                  {...widthLimitObj}\n                  placement={column?.placement || 'topLeft'}\n                  title={title}\n                />\n              )\n            },\n          }\n        }\n      })\n    }\n  }\n\n  /**\n   * update the innerSize when props size changes\n   */\n  // useEffect(() => {\n  //   if (size) {\n  //     setInnerSize(size)\n  //   }\n  // }, [setInnerSize, size])\n\n  return (\n    <TableContext.Provider\n      value={{\n        // size: innerSize,\n        tableContainer,\n        columnSetting,\n        refresh,\n        upperCaseIgnore,\n        // setSize: setInnerSize,\n        setColumnSetting,\n      }}\n    >\n      <ConfigConsumer>\n        {({ getPrefixCls }) => {\n          const prefixCls = getPrefixCls('table')\n          return (\n            <div ref={tableContainer}>\n              <LocaleReceiver componentName=\"Table\" defaultLocale={locale}>\n                {(localeObject) => {\n                  //   const locale = localeObject as Record<string, string>\n                  //   const paginationConfig = pagination ? getDefaultPagination(locale) : pagination\n                  return (\n                    <AntdTable\n                      className={classNames(\n                        // prefixCls,\n                        'tnt-table-wrapper',\n                        {\n                          [`${prefixCls}-borderless`]: !bordered,\n                          [`${prefixCls}-hide-cell-borders`]: !showCellBorders,\n                          [`${prefixCls}-size-small`]: size === 'small',\n                          [`${prefixCls}-size-middle`]: size === 'middle',\n                          [`${prefixCls}-striped`]: striped,\n                          [`${prefixCls}-shadowed`]: shadowed,\n                        },\n                        className\n                      )}\n                      locale={locale}\n                      bordered={bordered}\n                      size={size}\n                      columns={newColumns}\n                      {...rest}\n                    />\n                  )\n                }}\n              </LocaleReceiver>\n            </div>\n          )\n        }}\n      </ConfigConsumer>\n    </TableContext.Provider>\n  )\n}\n\nTable.Column = Column\nTable.ColumnGroup = ColumnGroup\nTable.displayName = 'Table'\nTable.titleCaseUpper = titleCaseUpper\n"]}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/lib/config-provider'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport type {\n  TableProps as AntdTableProps,\n  ColumnProps,\n  TableStateFilters,\n  SortOrder,\n} from 'antd/lib/table'\nimport { default as AntdTable } from 'antd/lib/table'\nimport Column from 'antd/lib/table/Column'\nimport ColumnGroup from 'antd/lib/table/ColumnGroup'\nimport classNames from 'classnames'\nimport React, { useMemo, useRef, useState } from 'react'\nimport Ellipsis from '../ellipsis'\nimport { TableContext } from './context'\nimport { useColumnSetting, useExpandFixed } from './hooks'\nimport type { keyType } from './hooks'\nimport { normalizeColumns } from './utils'\nimport { titleCaseUpper } from '../utils/lang'\nimport { TotalShower } from './total-shower'\nimport { getLanguage } from '../prev-locale'\nimport ResizeObserver from 'rc-resize-observer'\nimport { debounce } from 'lodash'\n\nconst sizeWidthMap = {\n  default: 40, //20\n  middle: 20, //10\n  small: 20, //10\n  xs: 16, // 8\n}\n\nexport type TableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {\n  storageKey?: string\n  enableToolbar?: boolean\n  showCellBorders?: boolean\n  striped?: boolean\n  sticky?: boolean\n  shadowed?: boolean\n  locale?: AntdTableProps<T>['locale'] & {\n    loadingDescription?: string\n    emptyText?: string\n  }\n  refresh?(): void\n  unUpperConverted?: boolean // 不要转换表头\n  unTooltip?: boolean // 不要tooltip\n  smallPadding?: boolean // 缩小间距\n  upperCaseIgnore?: string[]\n}\n\nconst getDefaultPagination = (locale: NonNullable<AntdTableProps<unknown>['locale']>) => ({\n  showTotal: (total: number) => <TotalShower total={total} locale={locale} />,\n})\n\n// 判断是否是特殊的tooltip\n// const checkIsPrompt = (dom: any): boolean => {\n//   let isPrompt: boolean = false\n//   if (React.isValidElement(dom)) {\n//     if (dom?.type && typeof dom?.type === 'function') {\n//       if (['Tooltip', 'Popconfirm'].includes(dom?.type?.name)) {\n//         isPrompt = true\n//       }\n//     }\n//   }\n//   return isPrompt\n// }\n\nexport const Table = <T,>({\n  className,\n  locale,\n  bordered,\n  size,\n  storageKey,\n  columns,\n  children,\n  sticky = false,\n  shadowed,\n  striped = false,\n  showCellBorders = false,\n  //   pagination,\n  enableToolbar = false,\n  refresh,\n  upperCaseIgnore,\n  unUpperConverted, // 强制不要转换\n  unTooltip,\n  smallPadding,\n\n  ...rest\n}: TableProps<T>) => {\n  const tableContainer = useRef<HTMLDivElement>(null)\n  // const [innerSize, setInnerSize] = useLocalStorage<TableProps<T>['size']>(\n  //   TABLE_SIZE_STORAGE_KEY,\n  //   'default'\n  // )\n\n  const normalizedColumns = useMemo(\n    () => columns || normalizeColumns<T>(children as React.ReactChildren),\n    [children, columns]\n  )\n  const [displayColumns, columnSetting, setColumnSetting] = useColumnSetting(\n    normalizedColumns,\n    storageKey\n  )\n\n  const [fixedWidth, setFixedWidth] = useState(Number)\n\n  const lang = getLanguage()\n  let newColumns = displayColumns\n  //   非中文做处理\n  if (lang !== 'cn') {\n    if (!unUpperConverted) {\n      newColumns = displayColumns?.map((column) => {\n        return {\n          ...column,\n          title: (options: {\n            filters: TableStateFilters\n            sortOrder?: SortOrder\n            sortColumn?: ColumnProps<T> | null\n          }) => {\n            let title = column.title\n            if (typeof title === 'function') {\n              title = title(options)\n            }\n\n            if (React.isValidElement(title)) {\n              const renderChildren = (children: [] | string): React.ReactNode => {\n                if (React.isValidElement(children) || Array.isArray(children)) {\n                  return React?.Children?.map(children, (child) => {\n                    if (React.isValidElement(child)) {\n                      const childProps = (child.props || {}) as any\n                      return React.cloneElement(child, {\n                        ...childProps,\n                        children: childProps.children?.length\n                          ? renderChildren(childProps.children)\n                          : childProps.children,\n                        title: titleCaseUpper(childProps?.title, upperCaseIgnore),\n                      })\n                    } else {\n                      return titleCaseUpper(child, upperCaseIgnore)\n                    }\n                  })\n                }\n\n                return titleCaseUpper(children, upperCaseIgnore)\n              }\n\n              return renderChildren(title.props.children)\n            }\n\n            if (typeof title === 'string') {\n              return titleCaseUpper(title, upperCaseIgnore)\n            }\n          },\n        }\n      })\n    }\n    if (!unTooltip) {\n      newColumns = newColumns?.map((column) => {\n        if (!(column.width && !String(column.width).includes('%'))) {\n          return column\n        } else {\n          return {\n            ...column,\n            title: (options: {\n              filters: TableStateFilters\n              sortOrder?: SortOrder\n              sortColumn?: ColumnProps<T> | null\n            }) => {\n              let title = column.title\n              if (typeof title === 'function') {\n                title = title(options)\n              }\n\n              let widthLimitObj = {}\n              if (column.width && !String(column.width).includes('%')) {\n                let width = column.width\n                if (typeof width === 'string') {\n                  width = width?.replace(/[^\\d]/g, ' ')\n                }\n                widthLimitObj = {\n                  widthLimit:\n                    Number(width) -\n                    Number(sizeWidthMap[size || 'default']) -\n                    (column.sorter ? 20 : 0),\n                }\n              }\n              return (\n                <Ellipsis\n                  {...widthLimitObj}\n                  placement={column?.placement || 'topLeft'}\n                  title={title}\n                />\n              )\n            },\n          }\n        }\n      })\n    }\n  }\n\n  /**\n   * update the innerSize when props size changes\n   */\n  // useEffect(() => {\n  //   if (size) {\n  //     setInnerSize(size)\n  //   }\n  // }, [setInnerSize, size])\n\n  /**\n   * expand 与 fix 兼容，expand悬浮\n   */\n  const [tableKey, trigger] = useExpandFixed()\n\n  const stickyProps = useMemo(() => {\n    return {\n      onExpandedRowsChange: (arg: string[] | number[]) => {\n        const key: keyType = arg && arg[arg.length - 1]\n        if (rest?.onExpandedRowsChange) rest?.onExpandedRowsChange([Number(key)])\n        // 触发MutationObserver监听\n        trigger(key as string)\n      },\n      expandedRowRender: rest?.expandedRowRender\n        ? (record: T, index: number, indent: number, expanded: boolean) => {\n            const padding = 0\n            return (\n              <div className=\"ant-table-expanded-row-fixed\" style={{ width: fixedWidth + padding }}>\n                {rest?.expandedRowRender &&\n                  rest?.expandedRowRender(record, index, indent, expanded)}\n              </div>\n            )\n          }\n        : undefined,\n    }\n  }, [rest?.expandedRowRender, rest?.onExpandedRowsChange, trigger])\n\n  return (\n    <TableContext.Provider\n      value={{\n        // size: innerSize,\n        tableContainer,\n        columnSetting,\n        refresh,\n        upperCaseIgnore,\n        // setSize: setInnerSize,\n        setColumnSetting,\n      }}\n    >\n      <ConfigConsumer>\n        {({ getPrefixCls }) => {\n          const prefixCls = getPrefixCls('table')\n          return (\n            <div ref={tableContainer}>\n              <LocaleReceiver componentName=\"Table\" defaultLocale={locale}>\n                {(localeObject) => {\n                  //   const locale = localeObject as Record<string, string>\n                  //   const paginationConfig = pagination ? getDefaultPagination(locale) : pagination\n                  return (\n                    <ResizeObserver\n                      onResize={({ width }) => {\n                        setFixedWidth(width)\n                      }}\n                    >\n                      <AntdTable\n                        className={classNames(\n                          // prefixCls,\n                          'tnt-table-wrapper',\n                          `${tableKey} collapse-panel`,\n                          {\n                            [`${prefixCls}-borderless`]: !bordered,\n                            [`${prefixCls}-hide-cell-borders`]: !showCellBorders,\n                            [`${prefixCls}-size-small`]: size === 'small',\n                            [`${prefixCls}-size-middle`]: size === 'middle',\n                            [`${prefixCls}-striped`]: striped,\n                            [`${prefixCls}-shadowed`]: shadowed,\n                            [`${prefixCls}-small-padding`]: smallPadding,\n                            [`${prefixCls}-sticky`]: sticky,\n                          },\n                          className\n                        )}\n                        locale={locale}\n                        bordered={bordered}\n                        size={size}\n                        columns={newColumns}\n                        {...rest}\n                        {...(sticky ? stickyProps : {})}\n                      />\n                    </ResizeObserver>\n                  )\n                }}\n              </LocaleReceiver>\n            </div>\n          )\n        }}\n      </ConfigConsumer>\n    </TableContext.Provider>\n  )\n}\n\nTable.Column = Column\nTable.ColumnGroup = ColumnGroup\nTable.displayName = 'Table'\nTable.titleCaseUpper = titleCaseUpper\n"]}

package/lib/table/table.less

@@ -3,9 +3,8 @@
 @spin-prefix-cls: ~'@{ant-prefix}-spin';
 @table-borderless-shadow: 0 0 14px rgba(0, 0, 0, 0.08);
 
-
 // .@{table-prefix-cls} {
-.tnt-table-wrapper{
+.tnt-table-wrapper {
   background-color: @white;
   border-radius: @border-radius-base;
 
@@ -30,9 +29,9 @@
   }
 
   &.@{table-prefix-cls}-hide-cell-borders {
-    .@{table-prefix-cls}-thead > tr > th:not(:last-child),
-    .@{table-prefix-cls}-tbody > tr > td:not(:last-child) {
-      border-right: none;
+    .@{table-prefix-cls}-thead > tr > th,
+    .@{table-prefix-cls}-tbody > tr > td {
+      border-right: none !important;
     }
   }
 
@@ -68,6 +67,7 @@
   .@{table-prefix-cls}-placeholder {
     padding-top: @table-padding-horizontal;
     padding-bottom: @table-padding-horizontal;
+    border-bottom: 0;
   }
 
   // customize the loading of table

package/lib/table/table.stories.d.ts

@@ -1,32 +1,109 @@
-import type { Meta, Story } from '@tntd/storybook-react-storykit';
-import { TableProps } from './';
-declare const _default: Meta<import("@tntd/storybook-react-storykit").Args>;
+declare namespace _default {
+    export { Table as component };
+    export const title: string;
+    export namespace parameters {
+        namespace backgrounds {
+            const _default: string;
+            export { _default as default };
+            export const values: {
+                name: string;
+                value: string;
+            }[];
+        }
+    }
+}
 export default _default;
-export declare const Empty: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-export declare const Loading: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-export declare const Default: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-interface MockData {
-    key: string;
-    age: number;
-    address: string;
-    firstName: string;
-    lastName: string;
-    tags: string[];
+export function Empty(args: any): React.JSX.Element;
+export namespace Empty {
+    namespace args {
+        const columns: {
+            title: string;
+            dataIndex: string;
+            key: string;
+        }[];
+    }
+}
+export function Loading(args: any): React.JSX.Element;
+export namespace Loading {
+    export namespace args_1 {
+        const columns_1: {
+            title: string;
+            dataIndex: string;
+            key: string;
+        }[];
+        export { columns_1 as columns };
+        export const loading: boolean;
+    }
+    export { args_1 as args };
+}
+export function Default(args: any): React.JSX.Element;
+export namespace Default {
+    export namespace args_2 {
+        const columns_2: ({
+            title: string;
+            dataIndex: string;
+            key: string;
+            render?: undefined;
+        } | {
+            title: string;
+            dataIndex: string;
+            key: string;
+            render: (cellData: any) => React.JSX.Element;
+        })[];
+        export { columns_2 as columns };
+        export const dataSource: {
+            key: string;
+            name: string;
+            age: number;
+            address: string;
+        }[];
+        export namespace pagination {
+            const total: number;
+            const position: string;
+            const showSizeChanger: boolean;
+            const showQuickJumper: boolean;
+            function showTotal(total: any, range: any): string;
+        }
+        const loading_1: boolean;
+        export { loading_1 as loading };
+    }
+    export { args_2 as args };
+}
+export function ColumnFilter(args: any): React.JSX.Element;
+export namespace ColumnFilter {
+    export namespace args_3 {
+        const dataSource_1: {
+            key: string;
+            firstName: string;
+            lastName: string;
+            age: number;
+            address: string;
+            tags: string[];
+        }[];
+        export { dataSource_1 as dataSource };
+        export namespace pagination_1 {
+            const total_1: number;
+            export { total_1 as total };
+            const position_1: string;
+            export { position_1 as position };
+            const showSizeChanger_1: boolean;
+            export { showSizeChanger_1 as showSizeChanger };
+            const showQuickJumper_1: boolean;
+            export { showQuickJumper_1 as showQuickJumper };
+            export function showTotal_1(total: any, range: any): string;
+            export { showTotal_1 as showTotal };
+        }
+        export { pagination_1 as pagination };
+        const loading_2: boolean;
+        export { loading_2 as loading };
+    }
+    export { args_3 as args };
+}
+export function All(): React.JSX.Element;
+export namespace All {
+    const args_4: {};
+    export { args_4 as args };
 }
-export declare const ColumnFilter: Story<TableProps<MockData>>;
+import { Table } from "./table";
+import React from "react";
 //# sourceMappingURL=table.stories.d.ts.map

package/lib/table/table.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.stories.d.ts","sourceRoot":"","sources":["../../src/table/table.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAS,UAAU,EAAE,MAAM,IAAI,CAAA;;AAItC,wBASS;AAmBT,eAAO,MAAM,KAAK;SAfT,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAYmB,CAAA;AAsBtC,eAAO,MAAM,OAAO;SArCX,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAkCqB,CAAA;AAuBxC,eAAO,MAAM,OAAO;SA5DX,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAyDqB,CAAA;AA6CxC,UAAU,QAAQ;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAuCpD,CAAA"}
+{"version":3,"file":"table.stories.d.ts","sourceRoot":"","sources":["../../src/table/table.stories.jsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAkBA,oDAQC;;;;;;;;;;AARD,sDAQC;;;;;;;;;;;;;AARD,sDAQC;;;;;;;;;;;;;;;;;;;;;;;;;;YAuFc,mDAA2D;;;;;;;AAKnE,2DAuCN;;;;;;;;;;;;;;;;;;;;;YAkCc,4DAA6D;;;;;;;;;AAKrE,yCA0UN"}