tntd 3.0.27 → 3.0.28

package/es/steps/steps.js

@@ -8,81 +8,55 @@ var __rest = this && this.__rest || function (s, e) {
 };
 import classNames from 'classnames';
 import React from 'react';
-import Icon from '../icon';
-import Ellipsis from '../ellipsis';
 import { ConfigConsumer } from '../config-provider';
 import { default as AntdSteps } from 'antd/es/steps';
 export * from 'antd/es/steps';
 export function Steps(_a) {
   var {
       className,
-      size,
-      showBackground = true,
-      labelPlacement
+      type,
+      children
     } = _a,
-    rest = __rest(_a, ["className", "size", "showBackground", "labelPlacement"]);
+    rest = __rest(_a, ["className", "type", "children"]);
+  let navContainDesc = false;
+  if (children) {
+    if (Array.isArray(children)) {
+      navContainDesc = children.some(child => {
+        if (child && child instanceof Object && child.props && child.props instanceof Object && child.props.hasOwnProperty('description')) {
+          return child.props.description;
+        }
+      });
+    }
+  }
   return React.createElement(ConfigConsumer, null, ({
     getPrefixCls
   }) => {
     const prefixCls = getPrefixCls('steps');
-    const tdSteps = !labelPlacement || labelPlacement === 'horizontal';
-    let iconsInfo = {};
-    if (tdSteps) {
-      iconsInfo = {
-        icons: {
-          finish: React.createElement(Icon, {
-            type: size === 'small' ? 'check-circle' : 'step-check',
-            className: `${prefixCls}-finish-icon`
-          }),
-          error: React.createElement(Icon, {
-            type: "close-circle",
-            className: `${prefixCls}-error-icon`
-          })
-        }
-      };
-    }
     return React.createElement(AntdSteps, Object.assign({
-      className: classNames(className, {
-        ['tnt-steps']: tdSteps,
-        [`${prefixCls}-background`]: (!(rest === null || rest === void 0 ? void 0 : rest.direction) || (rest === null || rest === void 0 ? void 0 : rest.direction) === 'horizontal') && showBackground // 水平方向的才支持背景图
-      })
-    }, iconsInfo, {
-      size: size,
-      labelPlacement: labelPlacement
+      className: classNames(prefixCls, 'tnt-steps', {
+        [`${prefixCls}-navigation`]: type === 'navigation',
+        [`${prefixCls}-navigation-contain-desc`]: type === 'navigation' && navContainDesc
+      }, className),
+      type: type,
+      children: children
     }, rest));
   });
 }
 Steps.Step = function (_a) {
   var {
-      className,
-      title,
-      subTitle,
-      titleEllipsis = true
+      description,
+      className
     } = _a,
-    rest = __rest(_a, ["className", "title", "subTitle", "titleEllipsis"]);
+    rest = __rest(_a, ["description", "className"]);
   return React.createElement(ConfigConsumer, null, ({
     getPrefixCls
   }) => {
     const prefixCls = getPrefixCls('step');
-    const stepTitle = {
-      title,
-      subTitle
-    };
-    if (titleEllipsis) {
-      stepTitle.title = React.createElement(Ellipsis, {
-        suffix: React.createElement(Ellipsis, {
-          widthLimit: "30%",
-          title: subTitle,
-          className: `${prefixCls}-ellipsis-subtitle`
-        }),
-        title: title
-      });
-      stepTitle.subTitle = null;
-    }
     return React.createElement(AntdSteps.Step, Object.assign({
-      className: classNames('tnt-step', className, {
-        [`${prefixCls}-default-icon`]: !(rest === null || rest === void 0 ? void 0 : rest.icon)
-      })
-    }, rest, stepTitle));
+      className: classNames(prefixCls, 'tnt-step', {
+        [`${prefixCls}-navigation-desc`]: !!description
+      }, className),
+      description: description
+    }, rest));
   });
 };

package/es/steps/steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../src/steps/steps.tsx"],"names":[],"mappings":"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","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2024-03-18 19:40:01\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2024-03-21 19:32:15\n * @FilePath: /tntd/packages/tntd/src/steps/steps.tsx\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport type { StepsProps as AntdStepsProps } from 'antd/es/steps'\nimport type { StepProps as AntdStepProps } from 'antd/es/steps'\nimport classNames from 'classnames'\nimport React from 'react'\nimport Icon from '../icon'\nimport Ellipsis from '../ellipsis'\n\nimport { ConfigConsumer } from '../config-provider'\nimport { default as AntdSteps } from 'antd/es/steps'\n\nexport * from 'antd/es/steps'\n\nexport interface StepsProps extends AntdStepsProps {\n  showBackground?: boolean\n  children?: Array<React.ReactElement>\n  icons?: { finish: Element; error: Element }\n}\nexport interface StepProps extends AntdStepProps {\n  titleEllipsis?: boolean\n}\n\nexport function Steps({\n  className,\n  size,\n  showBackground = true,\n  labelPlacement,\n  ...rest\n}: StepsProps) {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('steps')\n        const tdSteps = !labelPlacement || labelPlacement === 'horizontal'\n\n        let iconsInfo: object = {}\n        if (tdSteps) {\n          iconsInfo = {\n            icons: {\n              finish: (\n                <Icon\n                  type={size === 'small' ? 'check-circle' : 'step-check'}\n                  className={`${prefixCls}-finish-icon`}\n                />\n              ),\n              error: <Icon type=\"close-circle\" className={`${prefixCls}-error-icon`} />,\n            },\n          }\n        }\n\n        return (\n          <AntdSteps\n            className={classNames(className, {\n              ['tnt-steps']: tdSteps,\n              [`${prefixCls}-background`]:\n                (!rest?.direction || rest?.direction === 'horizontal') && showBackground, // 水平方向的才支持背景图\n            })}\n            {...iconsInfo}\n            size={size}\n            labelPlacement={labelPlacement}\n            {...rest}\n          />\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n\nSteps.Step = function ({ className, title, subTitle, titleEllipsis = true, ...rest }: StepProps) {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('step')\n        const stepTitle = {\n          title,\n          subTitle,\n        }\n\n        if (titleEllipsis) {\n          stepTitle.title = (\n            <Ellipsis\n              suffix={\n                <Ellipsis\n                  widthLimit=\"30%\"\n                  title={subTitle}\n                  className={`${prefixCls}-ellipsis-subtitle`}\n                />\n              }\n              title={title}\n            />\n          )\n          stepTitle.subTitle = null\n        }\n\n        return (\n          <AntdSteps.Step\n            className={classNames('tnt-step', className, {\n              [`${prefixCls}-default-icon`]: !rest?.icon,\n            })}\n            {...rest}\n            {...stepTitle}\n          />\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}
+{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../src/steps/steps.tsx"],"names":[],"mappings":";;;;;;;;;;;AAEA,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,KAAoB,MAAM,OAAO,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,eAAe,CAAA;AAEpD,cAAc,eAAe,CAAA;AAM7B,MAAM,UAAU,KAAK,CAAC,EAAkD;QAAlD,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,OAAuB,EAAlB,IAAI,cAApC,iCAAsC,CAAF;IACxD,IAAI,cAAc,GAAY,KAAK,CAAA;IACnC,IAAI,QAAQ,EAAE;QACZ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3B,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvC,IACE,KAAK;oBACL,KAAK,YAAY,MAAM;oBACvB,KAAK,CAAC,KAAK;oBACX,KAAK,CAAC,KAAK,YAAY,MAAM;oBAC7B,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,EACzC;oBACA,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,CAAA;iBAC/B;YACH,CAAC,CAAC,CAAA;SACH;KACF;IACD,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QACvC,OAAO,CACL,oBAAC,SAAS,kBACR,SAAS,EAAE,UAAU,CACnB,SAAS,EACT,WAAW,EACX;gBACE,CAAC,GAAG,SAAS,aAAa,CAAC,EAAE,IAAI,KAAK,YAAY;gBAClD,CAAC,GAAG,SAAS,0BAA0B,CAAC,EAAE,IAAI,KAAK,YAAY,IAAI,cAAc;aAClF,EACD,SAAS,CACV,EACD,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,QAAQ,IACd,IAAI,EACR,CACH,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC;AAED,KAAK,CAAC,IAAI,GAAG,UAAU,EAAkD;QAAlD,EAAE,WAAW,EAAE,SAAS,OAA0B,EAArB,IAAI,cAAjC,4BAAmC,CAAF;IACtD,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;QACtC,OAAO,CACL,oBAAC,SAAS,CAAC,IAAI,kBACb,SAAS,EAAE,UAAU,CACnB,SAAS,EACT,UAAU,EACV;gBACE,CAAC,GAAG,SAAS,kBAAkB,CAAC,EAAE,CAAC,CAAC,WAAW;aAChD,EACD,SAAS,CACV,EACD,WAAW,EAAE,WAAW,IACpB,IAAI,EACR,CACH,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAA","sourcesContent":["import type { StepsProps as AntdStepsProps } from 'antd/es/steps'\nimport type { StepProps as AntdStepProps } from 'antd/es/steps'\nimport classNames from 'classnames'\nimport React, { ReactNode } from 'react'\n\nimport { ConfigConsumer } from '../config-provider'\nimport { default as AntdSteps } from 'antd/es/steps'\n\nexport * from 'antd/es/steps'\n\nexport interface StepsProps extends AntdStepsProps {\n  children?: Array<React.ReactElement>\n}\n\nexport function Steps({ className, type, children, ...rest }: StepsProps) {\n  let navContainDesc: boolean = false\n  if (children) {\n    if (Array.isArray(children)) {\n      navContainDesc = children.some((child) => {\n        if (\n          child &&\n          child instanceof Object &&\n          child.props &&\n          child.props instanceof Object &&\n          child.props.hasOwnProperty('description')\n        ) {\n          return child.props.description\n        }\n      })\n    }\n  }\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('steps')\n        return (\n          <AntdSteps\n            className={classNames(\n              prefixCls,\n              'tnt-steps',\n              {\n                [`${prefixCls}-navigation`]: type === 'navigation',\n                [`${prefixCls}-navigation-contain-desc`]: type === 'navigation' && navContainDesc,\n              },\n              className\n            )}\n            type={type}\n            children={children}\n            {...rest}\n          />\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n\nSteps.Step = function ({ description, className, ...rest }: AntdStepProps) {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('step')\n        return (\n          <AntdSteps.Step\n            className={classNames(\n              prefixCls,\n              'tnt-step',\n              {\n                [`${prefixCls}-navigation-desc`]: !!description,\n              },\n              className\n            )}\n            description={description}\n            {...rest}\n          />\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}

package/es/steps/style/index.js

@@ -1,10 +1,2 @@
-/*
- * @Author: 周泽飞 zefei.zhou@tongdun.net
- * @Date: 2024-03-14 13:35:59
- * @LastEditors: 周泽飞 zefei.zhou@tongdun.net
- * @LastEditTime: 2024-03-21 13:57:36
- * @FilePath: /tntd/packages/tntd/src/steps/style/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import '../../style/index.less';
 import './index.less';

package/es/steps/style/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/steps/style/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,wBAAwB,CAAA;AAC/B,OAAO,cAAc,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2024-03-14 13:35:59\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2024-03-21 13:57:36\n * @FilePath: /tntd/packages/tntd/src/steps/style/index.tsx\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport '../../style/index.less'\nimport './index.less'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/steps/style/index.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAA;AAC/B,OAAO,cAAc,CAAA","sourcesContent":["import '../../style/index.less'\nimport './index.less'\n"]}

package/es/style/themes/default.less

@@ -14,7 +14,7 @@
 @processing-color: @blue-6;
 @error-color: @red-6;
 @highlight-color: @red-6;
-@warning-color: @gold-7;
+@warning-color: @gold-6;
 @normal-color: #d9d9d9;
 @white: #fff;
 @black: #000;
@@ -60,7 +60,6 @@
 @font-size-base: 14px;
 @font-size-lg: calc(@font-size-base + 2px);
 @font-size-sm: 12px;
-@font-size-xl: calc(@font-size-base + 6px);
 @heading-1-size: ceil(@font-size-base * 2.71);
 @heading-2-size: ceil(@font-size-base * 2.14);
 @heading-3-size: ceil(@font-size-base * 1.71);
@@ -449,7 +448,7 @@
 @table-header-color: @heading-color;
 @table-header-sort-bg: @background-color-base;
 @table-body-sort-bg: rgba(0, 0, 0, 0.01);
-@table-row-hover-bg: #fff;
+@table-row-hover-bg: @primary-1;
 @table-selected-row-color: inherit;
 @table-selected-row-bg: #fafafa;
 @table-body-selected-sort-bg: @table-selected-row-bg;
@@ -460,8 +459,8 @@
 @table-border-radius-base: @border-radius-base;
 @table-footer-bg: @background-color-light;
 @table-footer-color: @heading-color;
-// @table-header-bg-sm: transparent;
-@table-header-bg-sm: @background-color-light;
+@table-header-bg-sm: transparent;
+
 // Tag
 // --
 @tag-default-bg: @background-color-light;
@@ -657,7 +656,7 @@
 @alert-info-border-color: ~`colorPalette('@{info-color}', 3) `;
 @alert-info-bg-color: ~`colorPalette('@{info-color}', 1) `;
 @alert-info-icon-color: @info-color;
-@alert-warning-border-color: ~`colorPalette('@{warning-color}', 4) `;
+@alert-warning-border-color: ~`colorPalette('@{warning-color}', 3) `;
 @alert-warning-bg-color: ~`colorPalette('@{warning-color}', 1) `;
 @alert-warning-icon-color: @warning-color;
 @alert-error-border-color: ~`colorPalette('@{error-color}', 3) `;

package/es/switch/style/index.js

@@ -1,3 +1,2 @@
 import '../../style/index.less';
-import './index.less';
-import '../index.less';
+import './index.less';

package/es/switch/style/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/switch/style/index.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAA;AAC/B,OAAO,cAAc,CAAA;AACrB,OAAO,eAAe,CAAA","sourcesContent":["import '../../style/index.less'\nimport './index.less'\nimport '../index.less'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/switch/style/index.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAA;AAC/B,OAAO,cAAc,CAAA","sourcesContent":["import '../../style/index.less'\nimport './index.less'\n"]}

package/es/switch/switch.js

@@ -1,47 +1,9 @@
-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];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-import React, { forwardRef } from 'react';
+import React from 'react';
 import AntdSwitch from 'antd/es/switch';
 import { connectReadonlyComponent } from '../connect';
-import { ConfigConsumer } from 'antd/es/config-provider';
 import './style';
 export * from 'antd/es/switch';
-export const TntdSwitch = forwardRef(_a => {
-  var {
-      text,
-      subText,
-      disabled
-    } = _a,
-    rest = __rest(_a, ["text", "subText", "disabled"]);
-  return React.createElement(ConfigConsumer, null, ({
-    getPrefixCls
-  }) => {
-    const prefixCls = getPrefixCls('switch');
-    if (!text && !subText) {
-      return React.createElement(AntdSwitch, Object.assign({}, rest, {
-        disabled: disabled
-      }));
-    }
-    return React.createElement("div", {
-      className: `${prefixCls}-wrap`
-    }, React.createElement(AntdSwitch, Object.assign({}, rest, {
-      disabled: disabled
-    })), React.createElement("div", {
-      className: `${prefixCls}-text-wrap`
-    }, text ? React.createElement("span", {
-      className: disabled ? `${prefixCls}-text ${prefixCls}-text-disabled` : `${prefixCls}-text`
-    }, text) : '', subText ? React.createElement("div", {
-      className: disabled ? `${prefixCls}-subtext ${prefixCls}-subtext-disabled` : `${prefixCls}-subtext`
-    }, subText) : ''));
-  });
-});
-export const Switch = connectReadonlyComponent(TntdSwitch, props => React.createElement(TntdSwitch, Object.assign({}, props, {
+export const Switch = connectReadonlyComponent(AntdSwitch, props => React.createElement(AntdSwitch, Object.assign({}, props, {
   disabled: true
 })));
 Switch.displayName = 'Switch';

package/es/switch/switch.js.map

@@ -1 +1 @@
-{"version":3,"file":"switch.js","sourceRoot":"","sources":["../../src/switch/switch.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,UAAU,MAAM,gBAAgB,CAAA;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,SAAS,CAAA;AAEhB,cAAc,gBAAgB,CAAA;AAQ9B,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAClC,CAAC,EAAoC,EAAE,EAAE;QAAxC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,OAAW,EAAN,IAAI,cAAlC,+BAAoC,CAAF;IACjC,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;QAExC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACrB,OAAO,oBAAC,UAAU,oBAAK,IAAI,IAAE,QAAQ,EAAE,QAAQ,IAAI,CAAA;SACpD;QAED,OAAO,CACL,6BAAK,SAAS,EAAE,GAAG,SAAS,OAAO;YACjC,oBAAC,UAAU,oBAAK,IAAI,IAAE,QAAQ,EAAE,QAAQ,IAAI;YAE5C,6BAAK,SAAS,EAAE,GAAG,SAAS,YAAY;gBACrC,IAAI,CAAC,CAAC,CAAC,CACN,8BACE,SAAS,EACP,QAAQ;wBACN,CAAC,CAAC,GAAG,SAAS,SAAS,SAAS,gBAAgB;wBAChD,CAAC,CAAC,GAAG,SAAS,OAAO,IAGxB,IAAI,CACA,CACR,CAAC,CAAC,CAAC,CACF,EAAE,CACH;gBACA,OAAO,CAAC,CAAC,CAAC,CACT,6BACE,SAAS,EACP,QAAQ;wBACN,CAAC,CAAC,GAAG,SAAS,YAAY,SAAS,mBAAmB;wBACtD,CAAC,CAAC,GAAG,SAAS,UAAU,IAG3B,OAAO,CACJ,CACP,CAAC,CAAC,CAAC,CACF,EAAE,CACH,CACG,CACF,CACP,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CACF,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CACpE,oBAAC,UAAU,oBAAK,KAAK,IAAE,QAAQ,UAAG,CACnC,CAAoB,CAAA;AAErB,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;AAE7B,eAAe,MAAM,CAAA","sourcesContent":["import React, { forwardRef } from 'react'\nimport type { FC } from 'react'\nimport AntdSwitch from 'antd/es/switch'\nimport type { SwitchProps as AntdSwitchProps } from 'antd/es/switch'\nimport { connectReadonlyComponent } from '../connect'\nimport { ConfigConsumer } from 'antd/es/config-provider'\nimport './style'\n\nexport * from 'antd/es/switch'\n\nexport type SwitchProps = AntdSwitchProps & {\n  readonly?: boolean\n  text?: string\n  subText?: string\n}\n\nexport const TntdSwitch = forwardRef<AntdSwitch, SwitchProps>(\n  ({ text, subText, disabled, ...rest }) => {\n    return (\n      <ConfigConsumer>\n        {({ getPrefixCls }) => {\n          const prefixCls = getPrefixCls('switch')\n\n          if (!text && !subText) {\n            return <AntdSwitch {...rest} disabled={disabled} />\n          }\n\n          return (\n            <div className={`${prefixCls}-wrap`}>\n              <AntdSwitch {...rest} disabled={disabled} />\n\n              <div className={`${prefixCls}-text-wrap`}>\n                {text ? (\n                  <span\n                    className={\n                      disabled\n                        ? `${prefixCls}-text ${prefixCls}-text-disabled`\n                        : `${prefixCls}-text`\n                    }\n                  >\n                    {text}\n                  </span>\n                ) : (\n                  ''\n                )}\n                {subText ? (\n                  <div\n                    className={\n                      disabled\n                        ? `${prefixCls}-subtext ${prefixCls}-subtext-disabled`\n                        : `${prefixCls}-subtext`\n                    }\n                  >\n                    {subText}\n                  </div>\n                ) : (\n                  ''\n                )}\n              </div>\n            </div>\n          )\n        }}\n      </ConfigConsumer>\n    )\n  }\n)\n\nexport const Switch = connectReadonlyComponent(TntdSwitch, (props) => (\n  <TntdSwitch {...props} disabled />\n)) as FC<SwitchProps>\n\nSwitch.displayName = 'Switch'\n\nexport default Switch\n"]}
+{"version":3,"file":"switch.js","sourceRoot":"","sources":["../../src/switch/switch.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,UAAU,MAAM,gBAAgB,CAAA;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAErD,OAAO,SAAS,CAAA;AAEhB,cAAc,gBAAgB,CAAA;AAM9B,MAAM,CAAC,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CACpE,oBAAC,UAAU,oBAAK,KAAK,IAAE,QAAQ,UAAG,CACnC,CAAoB,CAAA;AAErB,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;AAE7B,eAAe,MAAM,CAAA","sourcesContent":["import React, { forwardRef } from 'react'\nimport type { FC } from 'react'\nimport AntdSwitch from 'antd/es/switch'\nimport type { SwitchProps as AntdSwitchProps } from 'antd/es/switch'\nimport { connectReadonlyComponent } from '../connect'\n\nimport './style'\n\nexport * from 'antd/es/switch'\n\nexport type SwitchProps = AntdSwitchProps & {\n  readonly?: boolean\n}\n\nexport const Switch = connectReadonlyComponent(AntdSwitch, (props) => (\n  <AntdSwitch {...props} disabled />\n)) as FC<SwitchProps>\n\nSwitch.displayName = 'Switch'\n\nexport default Switch\n"]}

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>
+      );
     }));
   }));
 };