tntd 3.0.27-beta.4 → 3.0.28

package/es/table/hooks/use-expand-fixed.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-expand-fixed.js","sourceRoot":"","sources":["../../../src/table/hooks/use-expand-fixed.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useRef } from 'react'\nimport { makeRandomCode } from '../utils'\n\nexport type keyType = string | number | null\n\ninterface OldDom {\n  main: HTMLDivElement | null\n  right: HTMLDivElement | null\n  left: HTMLDivElement | null\n}\n\nexport const useExpandFixed = () => {\n  const curTableKey = useRef<keyType>(makeRandomCode())\n  const activeKeyRef = useRef<string | null>(null)\n  const oldActiveKeyRef = useRef<OldDom>({\n    main: null,\n    right: null,\n    left: null,\n  })\n  const container = useRef<HTMLDivElement | null>(null)\n  const observer = useRef<MutationObserver | null>(null)\n\n  const getDom = (key: string | number | undefined) => {\n    const main =\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-scroll [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement) ||\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-default [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement)\n    const right = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-right [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    const left = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-left [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    return [main, right, left]\n  }\n\n  const expand = async () => {\n    const [main, right, left] = getDom(String(activeKeyRef.current) || '')\n    const border = 2\n    const height = main?.offsetHeight - border || 0\n    if (right) {\n      right.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (left) {\n      left.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (main) {\n      // 解决 expandIconAsCell为true 且 iconCell的td元素为display: none;时， 展开内容滚动到最右边，会多出一部分iconCell所占据的空间 的问题\n      const td = main.childNodes[1] as HTMLDivElement\n\n      const colspan = td.getAttribute('colspan') || 0\n      const Oldcolspan = td.getAttribute('oldcolspan') || 0\n      const newColspan = Oldcolspan ? Oldcolspan : Number(colspan) + 1 + ''\n      if (!Oldcolspan) td.setAttribute('oldcolspan', newColspan)\n\n      td.setAttribute('colspan', newColspan)\n      //\n    }\n\n    oldActiveKeyRef.current = {\n      main,\n      right,\n      left,\n    }\n  }\n\n  const ob = () => {\n    const classname = curTableKey.current\n    if (!classname) return\n\n    container.current = document.querySelector(\n      `.${classname}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    ) as HTMLDivElement\n\n    observer.current = new MutationObserver(expand)\n    if(container.current) {\n      observer.current.observe(container.current, {\n        childList: true, // 子节点的变动\n        attributes: true,\n      })\n    }\n  }\n\n  const setChangedKey = (key: string) => {\n    activeKeyRef.current = key\n  }\n\n  const trigger = (key: string) => {\n    setChangedKey(key)\n    const className = curTableKey.current\n    if (!className) return\n    const dom = document?.querySelector(\n      `.${className}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    )\n    dom?.setAttribute('c-data', 'Mutation')\n  }\n\n  useEffect(() => {\n    ob()\n  }, [curTableKey.current])\n\n  return [curTableKey.current, trigger as (key: string) => void] as const\n}\n\nexport const findRowKey = (\n  record: any,\n  rowKey: string | ((record: any, index: number) => string)\n) => {\n  let res: string | number = ''\n  if (typeof rowKey === 'function') {\n    res = [record].map(rowKey)[0]\n  } else if (typeof rowKey === 'string') {\n    res = record[rowKey]\n  }\n\n  return res\n}\n"]}
+{"version":3,"file":"use-expand-fixed.js","sourceRoot":"","sources":["../../../src/table/hooks/use-expand-fixed.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useRef } from 'react'\nimport { makeRandomCode } from '../utils'\n\nexport type keyType = string | number | null\n\ninterface OldDom {\n  main: HTMLDivElement | null\n  right: HTMLDivElement | null\n  left: HTMLDivElement | null\n}\n\nexport const useExpandFixed = () => {\n  const curTableKey = useRef<keyType>(makeRandomCode())\n  const activeKeyRef = useRef<string | null>(null)\n  const oldActiveKeyRef = useRef<OldDom>({\n    main: null,\n    right: null,\n    left: null,\n  })\n  const container = useRef<HTMLDivElement | null>(null)\n  const observer = useRef<MutationObserver | null>(null)\n\n  const getDom = (key: string | number | undefined) => {\n    const main =\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-scroll [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement) ||\n      (document.querySelector(\n        `.${curTableKey.current} .ant-table-default [data-row-key=\"${key}-extra-row\"]`\n      ) as HTMLDivElement)\n    const right = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-right [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    const left = document.querySelector(\n      `.${curTableKey.current} .ant-table-fixed-left [data-row-key=\"${key}-extra-row\"]`\n    ) as HTMLDivElement\n    return [main, right, left]\n  }\n\n  const expand = async () => {\n    const [main, right, left] = getDom(String(activeKeyRef.current) || '')\n    const border = 2\n    const height = main?.offsetHeight - border || 0\n    if (right) {\n      right.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (left) {\n      left.setAttribute('style', `display: inline-block; height: ${height}px; overflow: hidden;`)\n    }\n\n    if (main) {\n      // 解决 expandIconAsCell为true 且 iconCell的td元素为display: none;时， 展开内容滚动到最右边，会多出一部分iconCell所占据的空间 的问题\n      const td = main.childNodes[1] as HTMLDivElement\n\n      const colspan = td.getAttribute('colspan') || 0\n      const Oldcolspan = td.getAttribute('oldcolspan') || 0\n      const newColspan = Oldcolspan ? Oldcolspan : Number(colspan) + 1 + ''\n      if (!Oldcolspan) td.setAttribute('oldcolspan', newColspan)\n\n      td.setAttribute('colspan', newColspan)\n      //\n    }\n\n    oldActiveKeyRef.current = {\n      main,\n      right,\n      left,\n    }\n  }\n\n  const ob = () => {\n    const classname = curTableKey.current\n    if (!classname) return\n\n    container.current = document.querySelector(\n      `.${classname}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    ) as HTMLDivElement\n\n    observer.current = new MutationObserver(expand)\n    if (container.current) {\n      observer.current.observe(container.current, {\n        childList: true, // 子节点的变动\n        attributes: true,\n      })\n    }\n  }\n\n  const setChangedKey = (key: string) => {\n    activeKeyRef.current = key\n  }\n\n  const trigger = (key: string) => {\n    setChangedKey(key)\n    const className = curTableKey.current\n    if (!className) return\n    const dom = document?.querySelector(\n      `.${className}.ant-table-wrapper.collapse-panel > .ant-spin-nested-loading > .ant-spin-container > .ant-table`\n    )\n    dom?.setAttribute('c-data', 'Mutation')\n  }\n\n  useEffect(() => {\n    ob()\n  }, [curTableKey.current])\n\n  return [curTableKey.current, trigger as (key: string) => void] as const\n}\n\nexport const findRowKey = (\n  record: any,\n  rowKey: string | ((record: any, index: number) => string)\n) => {\n  let res: string | number = ''\n  if (typeof rowKey === 'function') {\n    res = [record].map(rowKey)[0]\n  } else if (typeof rowKey === 'string') {\n    res = record[rowKey]\n  }\n\n  return res\n}\n"]}

package/es/table/resizableTable/index.less

@@ -3,6 +3,24 @@
         position: relative;
         background-clip: padding-box;
     }
+    .ant-table-thead{
+        tr:hover{
+            th{
+                .react-resizable-handle{
+                    &::before{
+                        content:'';
+                        height: 20px;
+                        position: absolute;
+                        top:50%;
+                        margin-top: -10px;
+                        left:50%;
+                        width:1px;
+                        background-color: @grey-split;
+                    }
+                }
+            }
+        }
+    }
 
     .react-resizable-handle {
         position: absolute;

package/es/table/style/index.less

@@ -229,18 +229,28 @@
     transition: all 0.3s, border 0s;
   }
 
+  &-thead > tr,
   &-tbody > tr {
     transition: all 0.3s, height 0s;
     &.@{table-prefix-cls}-row-hover,
     &:hover {
-      &:not(.@{table-prefix-cls}-expanded-row) {
-        box-shadow: 0px 0px 5px -5px rgba(0, 0, 0, 0.05), 0px 0px 25px 0px rgba(0, 0, 0, 0.1);
-        position: relative;
-        > td {
-          background: @table-row-hover-bg;
-        }
+      &: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;
+    //     }
+    //   }
+    // }
   }
 
   &-thead > tr:hover {
@@ -332,11 +342,7 @@
     background: @table-body-sort-bg;
   }
 
-  &-thead > tr > th {
-    padding: calc(@table-padding-vertical - 4px) @table-padding-horizontal;
-    overflow-wrap: break-word;
-  }
-
+  &-thead > tr > th,
   &-tbody > tr > td {
     padding: @table-padding-vertical @table-padding-horizontal;
     overflow-wrap: break-word;
@@ -381,9 +387,9 @@
   }
 
   &-bordered {
-    // border: @border-width-base @border-style-base @border-color-split;
-    // border-radius: @border-radius-base;
-    // overflow: hidden; // 姚姚和宏宇要求边框需要包括分页
+    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,
@@ -394,9 +400,6 @@
     // }
 
     &.@{table-prefix-cls}-empty {
-      .@{table-prefix-cls}-body > table {
-        border-radius: @border-radius-base @border-radius-base 0 0;
-      }
       .@{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;
@@ -650,7 +653,6 @@
   &-scroll {
     overflow: auto;
     overflow-x: hidden;
-    border-radius: @border-radius-base @border-radius-base 0 0;
     table {
       min-width: 100%;
 
@@ -681,7 +683,7 @@
   &-fixed-header &-scroll &-header {
     margin-bottom: -20px;
     padding-bottom: 20px;
-    // overflow: scroll;  // mac没鼠标的时候行高变高
+    overflow: scroll;
     // Workaround for additional scroll bar on the table header
     // https://github.com/ant-design/ant-design/issues/6515#issuecomment-419634369
     opacity: 0.9999;

package/es/table/style/size.less

@@ -1,6 +1,7 @@
 @table-padding-vertical-md: @table-padding-vertical * 3 / 4;
 @table-padding-horizontal-md: @table-padding-horizontal / 2;
-@table-padding-vertical-sm: @table-padding-vertical - 4px;
+@table-padding-horizontal-md: @table-padding-horizontal;
+@table-padding-vertical-sm: @table-padding-vertical / 2;
 @table-padding-horizontal-sm: @table-padding-horizontal / 2;
 
 .@{table-prefix-cls}-middle {
@@ -31,14 +32,14 @@
   }
 
   tr.@{table-prefix-cls}-expanded-row td > .@{table-prefix-cls}-wrapper {
-    margin: -@table-padding-vertical-md -@table-padding-horizontal / 2
-      calc(-@table-padding-vertical-md - 1px);
+    margin: -@table-padding-vertical-md -@table-padding-horizontal / 2 calc(-@table-padding-vertical-md -
+      1px);
   }
 }
 
 .@{table-prefix-cls}-small {
-  // border: @border-width-base @border-style-base @border-color-split;
-  // border-radius: @table-border-radius-base;
+  border: @border-width-base @border-style-base @border-color-split;
+  border-radius: @table-border-radius-base;
 
   > .@{table-prefix-cls}-title,
   > .@{table-prefix-cls}-content > .@{table-prefix-cls}-footer {
@@ -120,7 +121,7 @@
   }
 
   &.@{table-prefix-cls}-bordered {
-    // border-right: 0;
+    border-right: 0;
 
     .@{table-prefix-cls}-title {
       border: 0;
@@ -128,9 +129,9 @@
       border-bottom: @border-width-base @border-style-base @border-color-split;
     }
 
-    // .@{table-prefix-cls}-content {
-    //   border-right: @border-width-base @border-style-base @border-color-split;
-    // }
+    .@{table-prefix-cls}-content {
+      border-right: @border-width-base @border-style-base @border-color-split;
+    }
 
     .@{table-prefix-cls}-footer {
       border: 0;
@@ -165,8 +166,8 @@
   }
 
   tr.@{table-prefix-cls}-expanded-row td > .@{table-prefix-cls}-wrapper {
-    margin: -@table-padding-vertical-sm -@table-padding-horizontal / 2
-      calc(-@table-padding-vertical-sm - 1px);
+    margin: -@table-padding-vertical-sm -@table-padding-horizontal / 2 calc(-@table-padding-vertical-sm -
+      1px);
   }
 
   // https://github.com/ant-design/ant-design/issues/19287#issuecomment-544368967

package/es/table/table.js

@@ -1,5 +1,3 @@
-import _isString from "lodash/isString";
-import _isFunction from "lodash/isFunction";
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -20,14 +18,21 @@ import { TableContext } from './context';
 import { useColumnSetting, useExpandFixed } from './hooks';
 import { normalizeColumns } from './utils';
 import { titleCaseUpper } from '../utils/lang';
+import { TotalShower } from './total-shower';
 import { getLanguage } from '../prev-locale';
-import ResizeObserver from 'rc-resize-observer';
+import 'rc-resize-observer';
 const sizeWidthMap = {
   default: 40,
   middle: 20,
   small: 20,
   xs: 16 // 8
 };
+const getDefaultPagination = locale => ({
+  showTotal: total => React.createElement(TotalShower, {
+    total: total,
+    locale: locale
+  })
+});
 // 判断是否是特殊的tooltip
 // const checkIsPrompt = (dom: any): boolean => {
 //   let isPrompt: boolean = false
@@ -51,19 +56,18 @@ export const Table = _a => {
       children,
       sticky = false,
       shadowed,
-      striped = true,
+      striped = false,
       showCellBorders = false,
-      pagination,
+      //   pagination,
       enableToolbar = false,
       refresh,
       upperCaseIgnore,
       unUpperConverted,
       // 强制不要转换
       unTooltip,
-      smallPadding,
-      rowClassName
+      smallPadding
     } = _a,
-    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "sticky", "shadowed", "striped", "showCellBorders", "pagination", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip", "smallPadding", "rowClassName"]);
+    rest = __rest(_a, ["className", "locale", "bordered", "size", "storageKey", "columns", "children", "sticky", "shadowed", "striped", "showCellBorders", "enableToolbar", "refresh", "upperCaseIgnore", "unUpperConverted", "unTooltip", "smallPadding"]);
   const tableContainer = useRef(null);
   // const [innerSize, setInnerSize] = useLocalStorage<TableProps<T>['size']>(
   //   TABLE_SIZE_STORAGE_KEY,
@@ -71,32 +75,6 @@ export const Table = _a => {
   // )
   const normalizedColumns = useMemo(() => columns || normalizeColumns(children), [children, columns]);
   const [displayColumns, columnSetting, setColumnSetting] = useColumnSetting(normalizedColumns, storageKey);
-  const getRowClassName = prefixCls => {
-    var _a;
-    if (striped || rowClassName || ((_a = rest.rowSelection) === null || _a === void 0 ? void 0 : _a.getCheckboxProps)) {
-      return (record, index) => {
-        const back = [];
-        if (rowClassName) {
-          if (_isFunction(rowClassName)) {
-            back.push(rowClassName(record, index));
-          } else if (_isString(rowClassName)) {
-            back.push(rowClassName);
-          }
-        }
-        if (striped && index % 2 === 1) {
-          back.push(`${prefixCls}-row-even`);
-        }
-        // if (rest.rowSelection?.getCheckboxProps) {
-        //   const checkboxProps: any = rest.rowSelection.getCheckboxProps(record)
-        //   if (checkboxProps && checkboxProps.disabled) {
-        //     back.push(`${prefixCls}-row-disabled`)
-        //   }
-        // }
-        return back.join(' ');
-      };
-    }
-    return rowClassName;
-  };
   const [fixedWidth, setFixedWidth] = useState(Number);
   const lang = getLanguage();
   let newColumns = displayColumns;
@@ -221,37 +199,33 @@ export const Table = _a => {
       defaultLocale: locale
     }, localeObject => {
       //   const locale = localeObject as Record<string, string>
-      const paginationConfig = pagination !== false ? Object.assign(Object.assign({}, pagination || {}), {
-        hideOnSinglePage: (pagination === null || pagination === void 0 ? void 0 : pagination.hideOnSinglePage) === false ? false : true
-      }) : pagination;
-      return React.createElement(ResizeObserver, {
-        onResize: ({
-          width
-        }) => {
-          setFixedWidth(width);
-        }
-      }, React.createElement(AntdTable, Object.assign({
-        className: classNames(
-        // prefixCls,
-        'tnt-table-wrapper', `${tableKey} collapse-panel`, {
-          [`${prefixCls}-borderless`]: !bordered,
-          [`${prefixCls}-bordered-out`]: !!bordered,
-          [`${prefixCls}-hide-cell-borders`]: !showCellBorders,
-          [`${prefixCls}-size-small`]: size === 'small',
-          [`${prefixCls}-size-middle`]: size === 'middle',
-          [`${prefixCls}-striped`]: striped,
-          [`${prefixCls}-shadowed`]: shadowed,
-          [`${prefixCls}-has-footer`]: rest.footer,
-          [`${prefixCls}-small-padding`]: smallPadding,
-          [`${prefixCls}-sticky`]: sticky
-        }, className),
-        locale: locale,
-        bordered: bordered,
-        size: size,
-        columns: newColumns,
-        rowClassName: getRowClassName(prefixCls),
-        pagination: paginationConfig
-      }, rest, sticky ? stickyProps : {})));
+      //   const paginationConfig = pagination ? getDefaultPagination(locale) : pagination
+      return (
+        // <ResizeObserver
+        //   onResize={({ width }) => {
+        //     setFixedWidth(width)
+        //   }}
+        // >
+        React.createElement(AntdTable, Object.assign({
+          className: classNames(
+          // prefixCls,
+          'tnt-table-wrapper', `${tableKey} collapse-panel`, {
+            [`${prefixCls}-borderless`]: !bordered,
+            [`${prefixCls}-hide-cell-borders`]: !showCellBorders,
+            [`${prefixCls}-size-small`]: size === 'small',
+            [`${prefixCls}-size-middle`]: size === 'middle',
+            [`${prefixCls}-striped`]: striped,
+            [`${prefixCls}-shadowed`]: shadowed,
+            [`${prefixCls}-small-padding`]: smallPadding,
+            [`${prefixCls}-sticky`]: sticky
+          }, className),
+          locale: locale,
+          bordered: bordered,
+          size: size,
+          columns: newColumns
+        }, rest, sticky ? stickyProps : {}))
+        // </ResizeObserver>
+      );
     }));
   }));
 };

package/es/table/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from '../config-provider'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport type {\n  TableProps as AntdTableProps,\n  ColumnProps,\n  TableStateFilters,\n  SortOrder,\n} from 'antd/es/table'\nimport { default as AntdTable } from 'antd/es/table'\nimport Column from 'antd/es/table/Column'\nimport ColumnGroup from 'antd/es/table/ColumnGroup'\nimport classNames from 'classnames'\nimport React, { useMemo, useRef, useState } from 'react'\nimport { isFunction, isString } from 'lodash'\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 { getLanguage } from '../prev-locale'\nimport ResizeObserver from 'rc-resize-observer'\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  rowClassName?: (record: T, index: number) => string\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 = true,\n  showCellBorders = false,\n  pagination,\n  enableToolbar = false,\n  refresh,\n  upperCaseIgnore,\n  unUpperConverted, // 强制不要转换\n  unTooltip,\n  smallPadding,\n  rowClassName,\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 getRowClassName = (prefixCls: string) => {\n    if (striped || rowClassName || rest.rowSelection?.getCheckboxProps) {\n      return (record: T, index: number) => {\n        const back = []\n        if (rowClassName) {\n          if (isFunction(rowClassName)) {\n            back.push(rowClassName(record, index))\n          } else if (isString(rowClassName)) {\n            back.push(rowClassName)\n          }\n        }\n        if (striped && index % 2 === 1) {\n          back.push(`${prefixCls}-row-even`)\n        }\n        // if (rest.rowSelection?.getCheckboxProps) {\n        //   const checkboxProps: any = rest.rowSelection.getCheckboxProps(record)\n        //   if (checkboxProps && checkboxProps.disabled) {\n        //     back.push(`${prefixCls}-row-disabled`)\n        //   }\n        // }\n        return back.join(' ')\n      }\n    }\n    return rowClassName\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 =\n                    pagination !== false\n                      ? {\n                          ...(pagination || {}),\n                          hideOnSinglePage: pagination?.hideOnSinglePage === false ? false : true,\n                        }\n                      : 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}-bordered-out`]: !!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}-has-footer`]: rest.footer,\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                        rowClassName={getRowClassName(prefixCls)}\n                        pagination={paginationConfig}\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"]}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table/table.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from '../config-provider'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport type {\n  TableProps as AntdTableProps,\n  ColumnProps,\n  TableStateFilters,\n  SortOrder,\n} from 'antd/es/table'\nimport { default as AntdTable } from 'antd/es/table'\nimport Column from 'antd/es/table/Column'\nimport ColumnGroup from 'antd/es/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/es/table/table.less

@@ -11,53 +11,29 @@
   &.@{table-prefix-cls}-borderless {
     .@{table-prefix-cls}-small {
       border: none;
-    }
-  }
 
-  &.@{table-prefix-cls}-bordered-out {
-    border: @border-width-base @border-style-base @border-color-split;
-    overflow: hidden; // 姚姚和宏宇要求边框需要包括分页
+      > .ant-table-content .ant-table-row:last-child td {
+        border-bottom: @border-width-base @border-style-base @border-color-split;
+      }
+    }
   }
 
   &.@{table-prefix-cls}-shadowed {
     box-shadow: @table-borderless-shadow;
   }
 
-  &.@{table-prefix-cls}-small-padding{
-    .@{table-prefix-cls}-tbody > tr > td {
-      padding-top: 8px;
-      padding-bottom: 8px;
-    }
-  }
-
   &.@{table-prefix-cls}-striped {
-    .@{table-prefix-cls}-tbody
-      > .@{table-prefix-cls}-row-even:not(:hover):not(.@{table-prefix-cls}-row-hover)
-      > td {
+    .@{table-prefix-cls}-tbody > tr:nth-child(even):not(:hover) > td {
       background: @bg-grey-first;
     }
   }
 
-  &.@{table-prefix-cls}-striped .@{table-prefix-cls}:not(.@{table-prefix-cls}-bordered) {
-    .@{table-prefix-cls}-thead > tr > th,
-    .@{table-prefix-cls}-tbody > tr > td {
-      border-bottom: none;
-    }
-  }
-
   &.@{table-prefix-cls}-hide-cell-borders {
     .@{table-prefix-cls}-thead > tr > th,
     .@{table-prefix-cls}-tbody > tr > td {
       border-right: none !important;
     }
   }
-  &.@{table-prefix-cls}-hide-cell-borders {
-    .@{table-prefix-cls}-thead > tr > th,
-    .@{table-prefix-cls}-tbody > tr > td {
-      border-right: none;
-      border-bottom: none;
-    }
-  }
 
   // middle table override
   &.@{table-prefix-cls}-size-middle {
@@ -92,12 +68,11 @@
     padding-top: @table-padding-horizontal;
     padding-bottom: @table-padding-horizontal;
     border-bottom: 0;
-    border-top: 0;
   }
 
   // customize the loading of table
   .@{spin-prefix-cls}-nested-loading > div > .@{spin-prefix-cls} {
-    // background-color: @white; // 测试反馈很奇怪
+    background-color: @white;
     max-height: initial;
   }
 

package/es/table/table.stories.js

@@ -510,8 +510,8 @@ export const All = () => {
     marginBottom: 20
   };
   const propsMap = {
-    // bordered: [true, false],
-    bordered: [true],
+    bordered: [true, false],
+    // bordered: [true],
     showCellBorders: [true, false],
     // showCellBorders: [true],
     striped: [true, false],
@@ -526,7 +526,7 @@ export const All = () => {
     columns: [columns1, columns2, columns3, columns4],
     // size: ['default', 'middle', 'small'],
     size: ['default'],
-    dataSource: [dataSource3]
+    dataSource: [dataSource3, []]
     // dataSource: [[]],
   };
   const propsList = Object.keys(propsMap).reduce((arr, key) => {