tntd 3.0.5 → 3.0.6

package/es/drawer/drawer.js

@@ -13,7 +13,7 @@ import classNames from 'classnames';
 import { doUpperTitle } from '../utils';
 import React, { useCallback, useEffect } from 'react';
 import { Button } from '../button';
-import Icon from '../icon';
+import '../icon';
 const DefaultFooter = ({
   locale,
   onCancel,
@@ -108,19 +108,14 @@ export const Drawer = _a => {
       }, React.createElement(AntdDrawer, Object.assign({
         className: classNames(prefixCls, 'tnt-drawer', className, {
           [`${prefixCls}-contain-closable`]: closable !== false,
+          [`${prefixCls}-no-header`]: closable === false && !title,
           [`${prefixCls}-footer`]: showFooter || footer
         }),
-        closable: false,
+        closable: closable,
         onClose: _onCancel,
         width: 480
       }, rest, {
-        title: React.createElement(React.Fragment, null, React.createElement("div", {
-          className: "tnt-drawer-title-content"
-        }, !unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title), closable !== false && React.createElement(Icon, {
-          type: "close",
-          className: `${prefixCls}-close`,
-          onClick: _onCancel
-        }))
+        title: !unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title
       }), React.createElement(React.Fragment, null, rest.children, (showFooter || footer) && React.createElement("div", {
         className: `${prefixCls}-footer-style`
       }, footer || React.createElement(DefaultFooter, {

package/es/drawer/drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/es/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer'\nimport { default as AntdDrawer } from 'antd/es/drawer'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/es/button/button'\nimport type { TntButtonType } from '../button/button'\nimport { doUpperTitle } from '../utils'\nimport React, { FC, useCallback, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onCancel,\n  onOk,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n  cancelType,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  cancelType: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onCancel} type={cancelType || 'tertiary'} {...cancelButtonProps}>\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onOk} type={okType || 'primary'} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  afterClose?: () => void\n  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  cancelType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n  upperCaseIgnore?: []\n  unUpperConverted: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  afterClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'tertiary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  upperCaseIgnore,\n  unUpperConverted,\n  title,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = useCallback(() => {\n    if (onCancel) {\n      onCancel()\n    } else if (onClose) {\n      onClose()\n    }\n    if (afterClose) {\n      afterClose()\n    }\n  }, [onCancel, onClose, afterClose])\n  const _onOk = onOk || onSubmit\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && _onCancel) {\n          _onCancel()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, _onCancel])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter || footer,\n                    })}\n                    closable={false}\n                    onClose={_onCancel}\n                    width={480}\n                    {...rest}\n                    title={\n                      <>\n                        <div className=\"tnt-drawer-title-content\">\n                          {!unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title}\n                        </div>\n                        {closable !== false && (\n                          <Icon type=\"close\" className={`${prefixCls}-close`} onClick={_onCancel} />\n                        )}\n                      </>\n                    }\n                  >\n                    <>\n                      {rest.children}\n                      {(showFooter || footer) && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {footer || (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelType={cancelType}\n                              cancelText={cancelText}\n                              onOk={_onOk}\n                              onCancel={_onCancel}\n                            />\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}
+{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAExD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,cAAc,MAAM,wCAAwC,CAAA;AACnE,OAAO,UAAU,MAAM,YAAY,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,EAAE,EAAM,WAAW,EAAE,SAAS,EAAU,MAAM,OAAO,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAiB,SAAS,CAAA;AAC1B,MAAM,aAAa,GAAG,CAAC,EACrB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,MAAM,EACN,UAAU,EACV,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,UAAU,GAeX,EAAE,EAAE;IACH,OAAO,CACL;QACE,oBAAC,MAAM,kBAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,IAAI,UAAU,IAAM,iBAAiB,GAC7E,UAAU,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAA,CAC1B;QACT,oBAAC,MAAM,kBAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,IAAI,SAAS,EAAE,OAAO,EAAE,cAAc,IAAM,aAAa,GACzF,MAAM,KAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,CAClB,CACR,CACJ,CAAA;AACH,CAAC,CAAA;AA0BD,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,EAuB7C,EAAE,EAAE;QAvByC,EAC5C,QAAQ,GAAG,IAAI,EACf,SAAS,EACT,MAAM,EACN,UAAU,EACV,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,MAAM,GAAG,EAAE,EACX,UAAU,GAAG,EAAE,EACf,MAAM,EACN,MAAM,GAAG,SAAS,EAClB,UAAU,GAAG,UAAU,EACvB,cAAc,GAAG,KAAK,EACtB,aAAa,GAAG,EAAE,EAClB,iBAAiB,GAAG,EAAE,EACtB,mBAAmB,GAAG,KAAK,EAC3B,eAAe,EACf,gBAAgB,EAChB,KAAK,OAEN,EADI,IAAI,cAtBqC,mSAuB7C,CADQ;IAEP,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAqB,IAAI,CAAC,CAAA;IACxD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,IAAI,QAAQ,EAAE;YACZ,QAAQ,EAAE,CAAA;SACX;aAAM,IAAI,OAAO,EAAE;YAClB,OAAO,EAAE,CAAA;SACV;QACD,IAAI,UAAU,EAAE;YACd,UAAU,EAAE,CAAA;SACb;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;IACnC,MAAM,KAAK,GAAG,IAAI,IAAI,QAAQ,CAAA;IAE9B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,mBAAmB,EAAE;YACvB,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE;gBAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAe,CAAA;gBACxC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAc,CAAA;gBAE1C,IAAI,UAAU,GAAG,KAAK,CAAA;gBACtB,IAAI,MAAM,IAAI,aAAa,EAAE;oBAC3B,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAqB,CAAC,IAAI,aAAa,KAAK,MAAM,CAAA;iBAChF;gBACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;gBACxB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,IAAI,SAAS,EAAE;oBAC5C,SAAS,EAAE,CAAA;iBACZ;YACH,CAAC,CAAA;YACD,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;YACzD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;YACtD,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;YAC3D,CAAC,CAAA;SACF;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC,CAAA;IAElD,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;QACxC,OAAO,CACL,oBAAC,cAAc,IAAC,aAAa,EAAC,QAAQ,EAAC,aAAa,EAAE,MAAM,IACzD,CAAC,MAAM,EAAE,EAAE;YACV,OAAO,CACL,6BACE,OAAO,EAAE,CAAC,KAAuC,EAAE,EAAE;oBACnD,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC,MAAM,CAAA;gBAClC,CAAC;gBAED,oBAAC,UAAU,kBACT,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;wBACxD,CAAC,GAAG,SAAS,mBAAmB,CAAC,EAAE,QAAQ,KAAK,KAAK;wBACrD,CAAC,GAAG,SAAS,YAAY,CAAC,EAAE,QAAQ,KAAK,KAAK,IAAI,CAAC,KAAK;wBACxD,CAAC,GAAG,SAAS,SAAS,CAAC,EAAE,UAAU,IAAI,MAAM;qBAC9C,CAAC,EACF,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,GAAG,IACN,IAAI,IACR,KAAK,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK;oBAEvE;wBACG,IAAI,CAAC,QAAQ;wBACb,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CACzB,6BAAK,SAAS,EAAE,GAAG,SAAS,eAAe,IACxC,MAAM,IAAI,CACT,oBAAC,aAAa,IACZ,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,KAAK,EACX,QAAQ,EAAE,SAAS,GACnB,CACH,CACG,CACP,CACA,CACQ,CACT,CACP,CAAA;QACH,CAAC,CACc,CAClB,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { ConfigConsumer } from 'antd/es/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer'\nimport { default as AntdDrawer } from 'antd/es/drawer'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/es/button/button'\nimport type { TntButtonType } from '../button/button'\nimport { doUpperTitle } from '../utils'\nimport React, { FC, useCallback, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onCancel,\n  onOk,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n  cancelType,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  cancelType: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onCancel} type={cancelType || 'tertiary'} {...cancelButtonProps}>\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onOk} type={okType || 'primary'} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  afterClose?: () => void\n  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  cancelType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n  upperCaseIgnore?: []\n  unUpperConverted: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  afterClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'tertiary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  upperCaseIgnore,\n  unUpperConverted,\n  title,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = useCallback(() => {\n    if (onCancel) {\n      onCancel()\n    } else if (onClose) {\n      onClose()\n    }\n    if (afterClose) {\n      afterClose()\n    }\n  }, [onCancel, onClose, afterClose])\n  const _onOk = onOk || onSubmit\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && _onCancel) {\n          _onCancel()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, _onCancel])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-no-header`]: closable === false && !title,\n                      [`${prefixCls}-footer`]: showFooter || footer,\n                    })}\n                    closable={closable}\n                    onClose={_onCancel}\n                    width={480}\n                    {...rest}\n                    title={!unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title}\n                  >\n                    <>\n                      {rest.children}\n                      {(showFooter || footer) && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {footer || (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelType={cancelType}\n                              cancelText={cancelText}\n                              onOk={_onOk}\n                              onCancel={_onCancel}\n                            />\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}

package/es/drawer/index.less

@@ -22,6 +22,20 @@
         max-height: ~'calc(100vh - 48px)';
     }
 
+    &.@{drawer-prefix-cls}-no-header {
+        .@{drawer-prefix-cls}-wrapper-body{
+            margin-top: 0;
+            max-height: ~'calc(100vh)';
+        }
+        &.@{drawer-prefix-cls}-footer{
+            .@{drawer-prefix-cls}-wrapper-body{
+                margin-top:0 !important;
+                max-height: ~'calc(100vh - 48px)' !important;
+                margin-bottom: 48px !important;
+            }
+        }
+    }
+
     &-footer {
         .@{drawer-prefix-cls}-header {
             // border-bottom: none;
@@ -37,7 +51,6 @@
             margin-top: 48px !important;
             margin-bottom: 48px !important;
         }
-
     }
 
     .@{drawer-prefix-cls}-title {
@@ -58,7 +71,7 @@
         font-weight: 700;
         font-size: 20px;
         font-style: normal;
-        line-height: 56px;
+        line-height: 48px;
         text-align: center;
         text-transform: none;
         text-decoration: none;
@@ -68,6 +81,9 @@
         cursor: pointer;
         transition: color 0.3s;
         text-rendering: auto;
+        i.tntd-anticon{
+            font-size:20px;
+        }
     }
 
 
@@ -147,6 +163,21 @@
             .@{ant-prefix}-btn {
                 margin-left: 16px;
             }
+
+          // 如果button没有type类型默认设置为 type: tertiary的样式（兼容老业务用了footer的场景）
+          button:not([class*="ant-btn-"]):not([class*="tnt-btn-"]) {
+            color: #17233d;
+            background-color: #f8f9fb;
+            border-color: #f8f9fb;
+            text-shadow: none;
+            box-shadow: none;
+
+            &:hover{
+              color: var(--blue-6);
+              background-color: #f0f5ff;
+              border-color: #f0f5ff;
+            }
+          }
         }
 
     }

package/es/modal/index.less

@@ -14,6 +14,9 @@
   &-title{
     line-height: @line-height-lg;
   }
+    div[aria-hidden=true]{
+        display: none;;
+    }
 }
 
 .@{confirm-prefix-cls}{

package/es/modal/style/modal.less

@@ -108,6 +108,20 @@
       margin-bottom: 0;
       margin-left: @margin-base;
     }
+    // 如果button没有type类型默认设置为type: tertiary的样式（兼容老业务用了footer的场景）
+    button:not([class*="ant-btn-"]):not([class*="tnt-btn-"]) {
+      color: #17233d;
+      background-color: #f8f9fb;
+      border-color: #f8f9fb;
+      text-shadow: none;
+      box-shadow: none;
+
+      &:hover{
+        color: var(--blue-6);
+        background-color: #f0f5ff;
+        border-color: #f0f5ff;
+      }
+    }
   }
 
   &.zoom-enter,

package/es/tntd-cascader/AntdCascader/component/getIcons.js

@@ -34,10 +34,7 @@ export default function getIcons({
       showSearch
     }) => {
       if (open && showSearch) {
-        return getSuffixIconNode(React.createElement(Icon, {
-          className: iconCls,
-          type: "search"
-        }));
+        return null;
       }
       return getSuffixIconNode(React.createElement(Icon, {
         className: iconCls,

package/es/tntd-cascader/AntdCascader/component/getIcons.js.map

@@ -1 +1 @@
-{"version":3,"file":"getIcons.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/AntdCascader/component/getIcons.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,IAAI,MAAM,eAAe,CAAA;AAIhC,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,UAAU,EACV,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,EACT,YAAY,GAYb;IACC,aAAa;IACb,MAAM,eAAe,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,oBAAC,IAAI,IAAC,IAAI,EAAC,cAAc,EAAC,KAAK,EAAC,QAAQ,GAAG,CAAA;IAEhF,2BAA2B;IAC3B,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAAC,CACnD;QACG,SAAS,KAAK,KAAK,IAAI,SAAS;QAChC,WAAW,IAAI,YAAY,CAC3B,CACJ,CAAA;IAED,kBAAkB;IAClB,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;KACjD;SAAM,IAAI,OAAO,EAAE;QAClB,gBAAgB,GAAG,iBAAiB,CAAC,oBAAC,IAAI,IAAC,IAAI,EAAC,SAAS,GAAG,CAAC,CAAA;KAC9D;SAAM;QACL,MAAM,OAAO,GAAG,GAAG,SAAS,SAAS,CAAA;QACrC,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAA0C,EAAE,EAAE;YAClF,IAAI,IAAI,IAAI,UAAU,EAAE;gBACtB,OAAO,iBAAiB,CAAC,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,QAAQ,GAAG,CAAC,CAAA;aACrE;YACD,OAAO,iBAAiB,CAAC,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,GAAG,CAAC,CAAA;QACpE,CAAC,CAAA;KACF;IAED,oBAAoB;IACpB,IAAI,cAAc,GAAG,IAAI,CAAA;IACzB,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACtC,cAAc,GAAG,oBAAoB,CAAA;KACtC;SAAM,IAAI,QAAQ,EAAE;QACnB,cAAc,GAAG,oBAAC,IAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACvC;SAAM;QACL,cAAc,GAAG,IAAI,CAAA;KACtB;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,UAAU,CAAA;KAC9B;SAAM;QACL,gBAAgB,GAAG,oBAAC,IAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACzC;IAED,OAAO;QACL,SAAS,EAAE,eAAe;QAC1B,UAAU,EAAE,gBAAgB;QAC5B,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,gBAAgB;KAC7B,CAAA;AACH,CAAC","sourcesContent":["import type { ReactNode } from 'react'\nimport * as React from 'react'\nimport Icon from '../../../icon'\n\ntype RenderNode = React.ReactNode | ((props: any) => React.ReactNode)\n\nexport default function getIcons({\n  suffixIcon,\n  clearIcon,\n  menuItemSelectedIcon,\n  removeIcon,\n  loading,\n  multiple,\n  hasFeedback,\n  prefixCls,\n  showArrow,\n  feedbackIcon,\n}: {\n  suffixIcon?: React.ReactNode\n  clearIcon?: RenderNode\n  menuItemSelectedIcon?: RenderNode\n  removeIcon?: RenderNode\n  loading?: boolean\n  multiple?: boolean\n  hasFeedback?: boolean\n  feedbackIcon?: ReactNode\n  prefixCls: string\n  showArrow?: boolean\n}) {\n  // Clear Icon\n  const mergedClearIcon = clearIcon ?? <Icon type=\"close-circle\" theme=\"filled\" />\n\n  // Validation Feedback Icon\n  const getSuffixIconNode = (arrowIcon?: ReactNode) => (\n    <>\n      {showArrow !== false && arrowIcon}\n      {hasFeedback && feedbackIcon}\n    </>\n  )\n\n  // Arrow item icon\n  let mergedSuffixIcon = null\n  if (suffixIcon !== undefined) {\n    mergedSuffixIcon = getSuffixIconNode(suffixIcon)\n  } else if (loading) {\n    mergedSuffixIcon = getSuffixIconNode(<Icon type=\"loading\" />)\n  } else {\n    const iconCls = `${prefixCls}-suffix`\n    mergedSuffixIcon = ({ open, showSearch }: { open: boolean; showSearch: boolean }) => {\n      if (open && showSearch) {\n        return getSuffixIconNode(<Icon className={iconCls} type=\"search\" />)\n      }\n      return getSuffixIconNode(<Icon className={iconCls} type=\"down\" />)\n    }\n  }\n\n  // Checked item icon\n  let mergedItemIcon = null\n  if (menuItemSelectedIcon !== undefined) {\n    mergedItemIcon = menuItemSelectedIcon\n  } else if (multiple) {\n    mergedItemIcon = <Icon type=\"check\" />\n  } else {\n    mergedItemIcon = null\n  }\n\n  let mergedRemoveIcon = null\n  if (removeIcon !== undefined) {\n    mergedRemoveIcon = removeIcon\n  } else {\n    mergedRemoveIcon = <Icon type=\"close\" />\n  }\n\n  return {\n    clearIcon: mergedClearIcon,\n    suffixIcon: mergedSuffixIcon,\n    itemIcon: mergedItemIcon,\n    removeIcon: mergedRemoveIcon,\n  }\n}\n"]}
+{"version":3,"file":"getIcons.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/AntdCascader/component/getIcons.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,IAAI,MAAM,eAAe,CAAA;AAIhC,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,UAAU,EACV,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,EACT,YAAY,GAYb;IACC,aAAa;IACb,MAAM,eAAe,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,oBAAC,IAAI,IAAC,IAAI,EAAC,cAAc,EAAC,KAAK,EAAC,QAAQ,GAAG,CAAA;IAEhF,2BAA2B;IAC3B,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAAC,CACnD;QACG,SAAS,KAAK,KAAK,IAAI,SAAS;QAChC,WAAW,IAAI,YAAY,CAC3B,CACJ,CAAA;IAED,kBAAkB;IAClB,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;KACjD;SAAM,IAAI,OAAO,EAAE;QAClB,gBAAgB,GAAG,iBAAiB,CAAC,oBAAC,IAAI,IAAC,IAAI,EAAC,SAAS,GAAG,CAAC,CAAA;KAC9D;SAAM;QACL,MAAM,OAAO,GAAG,GAAG,SAAS,SAAS,CAAA;QACrC,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAA0C,EAAE,EAAE;YAClF,IAAI,IAAI,IAAI,UAAU,EAAE;gBACtB,OAAO,IAAI,CAAA;aACZ;YACD,OAAO,iBAAiB,CAAC,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,GAAG,CAAC,CAAA;QACpE,CAAC,CAAA;KACF;IAED,oBAAoB;IACpB,IAAI,cAAc,GAAG,IAAI,CAAA;IACzB,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACtC,cAAc,GAAG,oBAAoB,CAAA;KACtC;SAAM,IAAI,QAAQ,EAAE;QACnB,cAAc,GAAG,oBAAC,IAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACvC;SAAM;QACL,cAAc,GAAG,IAAI,CAAA;KACtB;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,UAAU,CAAA;KAC9B;SAAM;QACL,gBAAgB,GAAG,oBAAC,IAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACzC;IAED,OAAO;QACL,SAAS,EAAE,eAAe;QAC1B,UAAU,EAAE,gBAAgB;QAC5B,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,gBAAgB;KAC7B,CAAA;AACH,CAAC","sourcesContent":["import type { ReactNode } from 'react'\nimport * as React from 'react'\nimport Icon from '../../../icon'\n\ntype RenderNode = React.ReactNode | ((props: any) => React.ReactNode)\n\nexport default function getIcons({\n  suffixIcon,\n  clearIcon,\n  menuItemSelectedIcon,\n  removeIcon,\n  loading,\n  multiple,\n  hasFeedback,\n  prefixCls,\n  showArrow,\n  feedbackIcon,\n}: {\n  suffixIcon?: React.ReactNode\n  clearIcon?: RenderNode\n  menuItemSelectedIcon?: RenderNode\n  removeIcon?: RenderNode\n  loading?: boolean\n  multiple?: boolean\n  hasFeedback?: boolean\n  feedbackIcon?: ReactNode\n  prefixCls: string\n  showArrow?: boolean\n}) {\n  // Clear Icon\n  const mergedClearIcon = clearIcon ?? <Icon type=\"close-circle\" theme=\"filled\" />\n\n  // Validation Feedback Icon\n  const getSuffixIconNode = (arrowIcon?: ReactNode) => (\n    <>\n      {showArrow !== false && arrowIcon}\n      {hasFeedback && feedbackIcon}\n    </>\n  )\n\n  // Arrow item icon\n  let mergedSuffixIcon = null\n  if (suffixIcon !== undefined) {\n    mergedSuffixIcon = getSuffixIconNode(suffixIcon)\n  } else if (loading) {\n    mergedSuffixIcon = getSuffixIconNode(<Icon type=\"loading\" />)\n  } else {\n    const iconCls = `${prefixCls}-suffix`\n    mergedSuffixIcon = ({ open, showSearch }: { open: boolean; showSearch: boolean }) => {\n      if (open && showSearch) {\n        return null\n      }\n      return getSuffixIconNode(<Icon className={iconCls} type=\"down\" />)\n    }\n  }\n\n  // Checked item icon\n  let mergedItemIcon = null\n  if (menuItemSelectedIcon !== undefined) {\n    mergedItemIcon = menuItemSelectedIcon\n  } else if (multiple) {\n    mergedItemIcon = <Icon type=\"check\" />\n  } else {\n    mergedItemIcon = null\n  }\n\n  let mergedRemoveIcon = null\n  if (removeIcon !== undefined) {\n    mergedRemoveIcon = removeIcon\n  } else {\n    mergedRemoveIcon = <Icon type=\"close\" />\n  }\n\n  return {\n    clearIcon: mergedClearIcon,\n    suffixIcon: mergedSuffixIcon,\n    itemIcon: mergedItemIcon,\n    removeIcon: mergedRemoveIcon,\n  }\n}\n"]}

package/es/tntd-cascader/AntdCascader/index.less

@@ -1239,7 +1239,7 @@
 
 .tntd-cascader-menu {
   -ms-overflow-style: -ms-autohiding-scrollbar;
-  border-right: 2px solid @grey-split;
+  border-right: 1px solid @grey-split;
   flex-grow: 1;
   height: 180px;
   list-style: none;
@@ -1877,7 +1877,7 @@
 
 .tntd-select:not(.tntd-select-customize-input) .tntd-select-selector {
   background-color: @white;
-  border: 1px solid @grey-d;
+  border: @border-width-base @border-style-base @select-border-color;
   border-radius: @border-radius-base;
   position: relative;
   transition: all .3s cubic-bezier(.645, .045, .355, 1)
@@ -1969,7 +1969,7 @@
 }
 
 .tntd-select-selection-placeholder {
-  color: #bfbfbf;
+  color: @input-placeholder-color;;
   flex: 1 1;
   overflow: hidden;
   pointer-events: none;
@@ -1990,7 +1990,7 @@
   -moz-osx-font-smoothing: grayscale;
   align-items: center;
   color: inherit;
-  color: rgba(0, 0, 0, .25);
+  color: @input-placeholder-color;
   display: inline-block;
   display: flex;
   font-size: 12px;
@@ -2056,10 +2056,10 @@
   font-style: normal;
   height: 12px;
   line-height: 1;
-  margin-top: -6px;
+  margin-top: -7px;
   opacity: 0;
   position: absolute;
-  right: 11px;
+  right: 13px;
   text-align: center;
   text-rendering: auto;
   text-transform: none;

package/lib/drawer/drawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.d.ts","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAkC,MAAM,OAAO,CAAA;AAyCjE,UAAU,iBAAkB,SAAQ,eAAe;IACjD,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,UAAU,CAAC,EAAE,aAAa,CAAA;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,eAAe,CAAA;IAC/B,iBAAiB,CAAC,EAAE,eAAe,CAAA;IACnC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,eAAe,CAAC,EAAE,EAAE,CAAA;IACpB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,EAAE,CAAC,iBAAiB,CA2HxC,CAAA"}
+{"version":3,"file":"drawer.d.ts","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAkC,MAAM,OAAO,CAAA;AAyCjE,UAAU,iBAAkB,SAAQ,eAAe;IACjD,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,UAAU,CAAC,EAAE,aAAa,CAAA;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,eAAe,CAAA;IAC/B,iBAAiB,CAAC,EAAE,eAAe,CAAA;IACnC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,eAAe,CAAC,EAAE,EAAE,CAAA;IACpB,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAmHxC,CAAA"}

package/lib/drawer/drawer.js

@@ -11,7 +11,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
 var _react = _interopRequireWildcard(require("react"));
 var _button = require("../button");
-var _icon = _interopRequireDefault(require("../icon"));
+require("../icon");
 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 }; }
@@ -124,18 +124,12 @@ var Drawer = exports.Drawer = function Drawer(_a) {
           drawerDom.current = event.target;
         }
       }, _react["default"].createElement(_drawer["default"], Object.assign({
-        className: (0, _classnames["default"])(prefixCls, 'tnt-drawer', className, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-contain-closable"), closable !== false), "".concat(prefixCls, "-footer"), showFooter || footer)),
-        closable: false,
+        className: (0, _classnames["default"])(prefixCls, 'tnt-drawer', className, _defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-contain-closable"), closable !== false), "".concat(prefixCls, "-no-header"), closable === false && !title), "".concat(prefixCls, "-footer"), showFooter || footer)),
+        closable: closable,
         onClose: _onCancel,
         width: 480
       }, rest, {
-        title: _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement("div", {
-          className: "tnt-drawer-title-content"
-        }, !unUpperConverted ? (0, _utils.doUpperTitle)(title, upperCaseIgnore) : title), closable !== false && _react["default"].createElement(_icon["default"], {
-          type: "close",
-          className: "".concat(prefixCls, "-close"),
-          onClick: _onCancel
-        }))
+        title: !unUpperConverted ? (0, _utils.doUpperTitle)(title, upperCaseIgnore) : title
       }), _react["default"].createElement(_react["default"].Fragment, null, rest.children, (showFooter || footer) && _react["default"].createElement("div", {
         className: "".concat(prefixCls, "-footer-style")
       }, footer || _react["default"].createElement(DefaultFooter, {

package/lib/drawer/drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/lib/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/lib/drawer'\nimport { default as AntdDrawer } from 'antd/lib/drawer'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/lib/button/button'\nimport type { TntButtonType } from '../button/button'\nimport { doUpperTitle } from '../utils'\nimport React, { FC, useCallback, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onCancel,\n  onOk,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n  cancelType,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  cancelType: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onCancel} type={cancelType || 'tertiary'} {...cancelButtonProps}>\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onOk} type={okType || 'primary'} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  afterClose?: () => void\n  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  cancelType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n  upperCaseIgnore?: []\n  unUpperConverted: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  afterClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'tertiary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  upperCaseIgnore,\n  unUpperConverted,\n  title,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = useCallback(() => {\n    if (onCancel) {\n      onCancel()\n    } else if (onClose) {\n      onClose()\n    }\n    if (afterClose) {\n      afterClose()\n    }\n  }, [onCancel, onClose, afterClose])\n  const _onOk = onOk || onSubmit\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && _onCancel) {\n          _onCancel()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, _onCancel])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter || footer,\n                    })}\n                    closable={false}\n                    onClose={_onCancel}\n                    width={480}\n                    {...rest}\n                    title={\n                      <>\n                        <div className=\"tnt-drawer-title-content\">\n                          {!unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title}\n                        </div>\n                        {closable !== false && (\n                          <Icon type=\"close\" className={`${prefixCls}-close`} onClick={_onCancel} />\n                        )}\n                      </>\n                    }\n                  >\n                    <>\n                      {rest.children}\n                      {(showFooter || footer) && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {footer || (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelType={cancelType}\n                              cancelText={cancelText}\n                              onOk={_onOk}\n                              onCancel={_onCancel}\n                            />\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}
+{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/lib/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/lib/drawer'\nimport { default as AntdDrawer } from 'antd/lib/drawer'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/lib/button/button'\nimport type { TntButtonType } from '../button/button'\nimport { doUpperTitle } from '../utils'\nimport React, { FC, useCallback, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onCancel,\n  onOk,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n  cancelType,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  cancelType: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onCancel} type={cancelType || 'tertiary'} {...cancelButtonProps}>\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onOk} type={okType || 'primary'} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  afterClose?: () => void\n  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  cancelType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n  upperCaseIgnore?: []\n  unUpperConverted: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  afterClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'tertiary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  upperCaseIgnore,\n  unUpperConverted,\n  title,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = useCallback(() => {\n    if (onCancel) {\n      onCancel()\n    } else if (onClose) {\n      onClose()\n    }\n    if (afterClose) {\n      afterClose()\n    }\n  }, [onCancel, onClose, afterClose])\n  const _onOk = onOk || onSubmit\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && _onCancel) {\n          _onCancel()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, _onCancel])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-no-header`]: closable === false && !title,\n                      [`${prefixCls}-footer`]: showFooter || footer,\n                    })}\n                    closable={closable}\n                    onClose={_onCancel}\n                    width={480}\n                    {...rest}\n                    title={!unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title}\n                  >\n                    <>\n                      {rest.children}\n                      {(showFooter || footer) && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {footer || (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelType={cancelType}\n                              cancelText={cancelText}\n                              onOk={_onOk}\n                              onCancel={_onCancel}\n                            />\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}

package/lib/drawer/index.less

@@ -22,6 +22,20 @@
         max-height: ~'calc(100vh - 48px)';
     }
 
+    &.@{drawer-prefix-cls}-no-header {
+        .@{drawer-prefix-cls}-wrapper-body{
+            margin-top: 0;
+            max-height: ~'calc(100vh)';
+        }
+        &.@{drawer-prefix-cls}-footer{
+            .@{drawer-prefix-cls}-wrapper-body{
+                margin-top:0 !important;
+                max-height: ~'calc(100vh - 48px)' !important;
+                margin-bottom: 48px !important;
+            }
+        }
+    }
+
     &-footer {
         .@{drawer-prefix-cls}-header {
             // border-bottom: none;
@@ -37,7 +51,6 @@
             margin-top: 48px !important;
             margin-bottom: 48px !important;
         }
-
     }
 
     .@{drawer-prefix-cls}-title {
@@ -58,7 +71,7 @@
         font-weight: 700;
         font-size: 20px;
         font-style: normal;
-        line-height: 56px;
+        line-height: 48px;
         text-align: center;
         text-transform: none;
         text-decoration: none;
@@ -68,6 +81,9 @@
         cursor: pointer;
         transition: color 0.3s;
         text-rendering: auto;
+        i.tntd-anticon{
+            font-size:20px;
+        }
     }
 
 
@@ -147,6 +163,21 @@
             .@{ant-prefix}-btn {
                 margin-left: 16px;
             }
+
+          // 如果button没有type类型默认设置为 type: tertiary的样式（兼容老业务用了footer的场景）
+          button:not([class*="ant-btn-"]):not([class*="tnt-btn-"]) {
+            color: #17233d;
+            background-color: #f8f9fb;
+            border-color: #f8f9fb;
+            text-shadow: none;
+            box-shadow: none;
+
+            &:hover{
+              color: var(--blue-6);
+              background-color: #f0f5ff;
+              border-color: #f0f5ff;
+            }
+          }
         }
 
     }

package/lib/modal/index.less

@@ -14,6 +14,9 @@
   &-title{
     line-height: @line-height-lg;
   }
+    div[aria-hidden=true]{
+        display: none;;
+    }
 }
 
 .@{confirm-prefix-cls}{

package/lib/modal/style/modal.less

@@ -108,6 +108,20 @@
       margin-bottom: 0;
       margin-left: @margin-base;
     }
+    // 如果button没有type类型默认设置为type: tertiary的样式（兼容老业务用了footer的场景）
+    button:not([class*="ant-btn-"]):not([class*="tnt-btn-"]) {
+      color: #17233d;
+      background-color: #f8f9fb;
+      border-color: #f8f9fb;
+      text-shadow: none;
+      box-shadow: none;
+
+      &:hover{
+        color: var(--blue-6);
+        background-color: #f0f5ff;
+        border-color: #f0f5ff;
+      }
+    }
   }
 
   &.zoom-enter,

package/lib/tntd-cascader/AntdCascader/component/getIcons.d.ts

@@ -17,7 +17,7 @@ export default function getIcons({ suffixIcon, clearIcon, menuItemSelectedIcon,
     suffixIcon: React.JSX.Element | (({ open, showSearch }: {
         open: boolean;
         showSearch: boolean;
-    }) => React.JSX.Element);
+    }) => React.JSX.Element | null);
     itemIcon: {} | null;
     removeIcon: {} | null;
 };

package/lib/tntd-cascader/AntdCascader/component/getIcons.js

@@ -44,10 +44,7 @@ function getIcons(_ref) {
       var open = _ref2.open,
         showSearch = _ref2.showSearch;
       if (open && showSearch) {
-        return getSuffixIconNode(React.createElement(_icon["default"], {
-          className: iconCls,
-          type: "search"
-        }));
+        return null;
       }
       return getSuffixIconNode(React.createElement(_icon["default"], {
         className: iconCls,

package/lib/tntd-cascader/AntdCascader/component/getIcons.js.map

@@ -1 +1 @@
-{"version":3,"file":"getIcons.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/AntdCascader/component/getIcons.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8B;AAC9B,yDAAgC;AAIhC,SAAwB,QAAQ,CAAC,EAC/B,UAAU,EACV,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,EACT,YAAY,GAYb;IACC,aAAa;IACb,MAAM,eAAe,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,oBAAC,cAAI,IAAC,IAAI,EAAC,cAAc,EAAC,KAAK,EAAC,QAAQ,GAAG,CAAA;IAEhF,2BAA2B;IAC3B,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAAC,CACnD;QACG,SAAS,KAAK,KAAK,IAAI,SAAS;QAChC,WAAW,IAAI,YAAY,CAC3B,CACJ,CAAA;IAED,kBAAkB;IAClB,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;KACjD;SAAM,IAAI,OAAO,EAAE;QAClB,gBAAgB,GAAG,iBAAiB,CAAC,oBAAC,cAAI,IAAC,IAAI,EAAC,SAAS,GAAG,CAAC,CAAA;KAC9D;SAAM;QACL,MAAM,OAAO,GAAG,GAAG,SAAS,SAAS,CAAA;QACrC,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAA0C,EAAE,EAAE;YAClF,IAAI,IAAI,IAAI,UAAU,EAAE;gBACtB,OAAO,iBAAiB,CAAC,oBAAC,cAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,QAAQ,GAAG,CAAC,CAAA;aACrE;YACD,OAAO,iBAAiB,CAAC,oBAAC,cAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,GAAG,CAAC,CAAA;QACpE,CAAC,CAAA;KACF;IAED,oBAAoB;IACpB,IAAI,cAAc,GAAG,IAAI,CAAA;IACzB,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACtC,cAAc,GAAG,oBAAoB,CAAA;KACtC;SAAM,IAAI,QAAQ,EAAE;QACnB,cAAc,GAAG,oBAAC,cAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACvC;SAAM;QACL,cAAc,GAAG,IAAI,CAAA;KACtB;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,UAAU,CAAA;KAC9B;SAAM;QACL,gBAAgB,GAAG,oBAAC,cAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACzC;IAED,OAAO;QACL,SAAS,EAAE,eAAe;QAC1B,UAAU,EAAE,gBAAgB;QAC5B,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,gBAAgB;KAC7B,CAAA;AACH,CAAC;AAzED,2BAyEC","sourcesContent":["import type { ReactNode } from 'react'\nimport * as React from 'react'\nimport Icon from '../../../icon'\n\ntype RenderNode = React.ReactNode | ((props: any) => React.ReactNode)\n\nexport default function getIcons({\n  suffixIcon,\n  clearIcon,\n  menuItemSelectedIcon,\n  removeIcon,\n  loading,\n  multiple,\n  hasFeedback,\n  prefixCls,\n  showArrow,\n  feedbackIcon,\n}: {\n  suffixIcon?: React.ReactNode\n  clearIcon?: RenderNode\n  menuItemSelectedIcon?: RenderNode\n  removeIcon?: RenderNode\n  loading?: boolean\n  multiple?: boolean\n  hasFeedback?: boolean\n  feedbackIcon?: ReactNode\n  prefixCls: string\n  showArrow?: boolean\n}) {\n  // Clear Icon\n  const mergedClearIcon = clearIcon ?? <Icon type=\"close-circle\" theme=\"filled\" />\n\n  // Validation Feedback Icon\n  const getSuffixIconNode = (arrowIcon?: ReactNode) => (\n    <>\n      {showArrow !== false && arrowIcon}\n      {hasFeedback && feedbackIcon}\n    </>\n  )\n\n  // Arrow item icon\n  let mergedSuffixIcon = null\n  if (suffixIcon !== undefined) {\n    mergedSuffixIcon = getSuffixIconNode(suffixIcon)\n  } else if (loading) {\n    mergedSuffixIcon = getSuffixIconNode(<Icon type=\"loading\" />)\n  } else {\n    const iconCls = `${prefixCls}-suffix`\n    mergedSuffixIcon = ({ open, showSearch }: { open: boolean; showSearch: boolean }) => {\n      if (open && showSearch) {\n        return getSuffixIconNode(<Icon className={iconCls} type=\"search\" />)\n      }\n      return getSuffixIconNode(<Icon className={iconCls} type=\"down\" />)\n    }\n  }\n\n  // Checked item icon\n  let mergedItemIcon = null\n  if (menuItemSelectedIcon !== undefined) {\n    mergedItemIcon = menuItemSelectedIcon\n  } else if (multiple) {\n    mergedItemIcon = <Icon type=\"check\" />\n  } else {\n    mergedItemIcon = null\n  }\n\n  let mergedRemoveIcon = null\n  if (removeIcon !== undefined) {\n    mergedRemoveIcon = removeIcon\n  } else {\n    mergedRemoveIcon = <Icon type=\"close\" />\n  }\n\n  return {\n    clearIcon: mergedClearIcon,\n    suffixIcon: mergedSuffixIcon,\n    itemIcon: mergedItemIcon,\n    removeIcon: mergedRemoveIcon,\n  }\n}\n"]}
+{"version":3,"file":"getIcons.js","sourceRoot":"","sources":["../../../../src/tntd-cascader/AntdCascader/component/getIcons.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8B;AAC9B,yDAAgC;AAIhC,SAAwB,QAAQ,CAAC,EAC/B,UAAU,EACV,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,EACT,YAAY,GAYb;IACC,aAAa;IACb,MAAM,eAAe,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,oBAAC,cAAI,IAAC,IAAI,EAAC,cAAc,EAAC,KAAK,EAAC,QAAQ,GAAG,CAAA;IAEhF,2BAA2B;IAC3B,MAAM,iBAAiB,GAAG,CAAC,SAAqB,EAAE,EAAE,CAAC,CACnD;QACG,SAAS,KAAK,KAAK,IAAI,SAAS;QAChC,WAAW,IAAI,YAAY,CAC3B,CACJ,CAAA;IAED,kBAAkB;IAClB,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;KACjD;SAAM,IAAI,OAAO,EAAE;QAClB,gBAAgB,GAAG,iBAAiB,CAAC,oBAAC,cAAI,IAAC,IAAI,EAAC,SAAS,GAAG,CAAC,CAAA;KAC9D;SAAM;QACL,MAAM,OAAO,GAAG,GAAG,SAAS,SAAS,CAAA;QACrC,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAA0C,EAAE,EAAE;YAClF,IAAI,IAAI,IAAI,UAAU,EAAE;gBACtB,OAAO,IAAI,CAAA;aACZ;YACD,OAAO,iBAAiB,CAAC,oBAAC,cAAI,IAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,GAAG,CAAC,CAAA;QACpE,CAAC,CAAA;KACF;IAED,oBAAoB;IACpB,IAAI,cAAc,GAAG,IAAI,CAAA;IACzB,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACtC,cAAc,GAAG,oBAAoB,CAAA;KACtC;SAAM,IAAI,QAAQ,EAAE;QACnB,cAAc,GAAG,oBAAC,cAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACvC;SAAM;QACL,cAAc,GAAG,IAAI,CAAA;KACtB;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAA;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,gBAAgB,GAAG,UAAU,CAAA;KAC9B;SAAM;QACL,gBAAgB,GAAG,oBAAC,cAAI,IAAC,IAAI,EAAC,OAAO,GAAG,CAAA;KACzC;IAED,OAAO;QACL,SAAS,EAAE,eAAe;QAC1B,UAAU,EAAE,gBAAgB;QAC5B,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,gBAAgB;KAC7B,CAAA;AACH,CAAC;AAzED,2BAyEC","sourcesContent":["import type { ReactNode } from 'react'\nimport * as React from 'react'\nimport Icon from '../../../icon'\n\ntype RenderNode = React.ReactNode | ((props: any) => React.ReactNode)\n\nexport default function getIcons({\n  suffixIcon,\n  clearIcon,\n  menuItemSelectedIcon,\n  removeIcon,\n  loading,\n  multiple,\n  hasFeedback,\n  prefixCls,\n  showArrow,\n  feedbackIcon,\n}: {\n  suffixIcon?: React.ReactNode\n  clearIcon?: RenderNode\n  menuItemSelectedIcon?: RenderNode\n  removeIcon?: RenderNode\n  loading?: boolean\n  multiple?: boolean\n  hasFeedback?: boolean\n  feedbackIcon?: ReactNode\n  prefixCls: string\n  showArrow?: boolean\n}) {\n  // Clear Icon\n  const mergedClearIcon = clearIcon ?? <Icon type=\"close-circle\" theme=\"filled\" />\n\n  // Validation Feedback Icon\n  const getSuffixIconNode = (arrowIcon?: ReactNode) => (\n    <>\n      {showArrow !== false && arrowIcon}\n      {hasFeedback && feedbackIcon}\n    </>\n  )\n\n  // Arrow item icon\n  let mergedSuffixIcon = null\n  if (suffixIcon !== undefined) {\n    mergedSuffixIcon = getSuffixIconNode(suffixIcon)\n  } else if (loading) {\n    mergedSuffixIcon = getSuffixIconNode(<Icon type=\"loading\" />)\n  } else {\n    const iconCls = `${prefixCls}-suffix`\n    mergedSuffixIcon = ({ open, showSearch }: { open: boolean; showSearch: boolean }) => {\n      if (open && showSearch) {\n        return null\n      }\n      return getSuffixIconNode(<Icon className={iconCls} type=\"down\" />)\n    }\n  }\n\n  // Checked item icon\n  let mergedItemIcon = null\n  if (menuItemSelectedIcon !== undefined) {\n    mergedItemIcon = menuItemSelectedIcon\n  } else if (multiple) {\n    mergedItemIcon = <Icon type=\"check\" />\n  } else {\n    mergedItemIcon = null\n  }\n\n  let mergedRemoveIcon = null\n  if (removeIcon !== undefined) {\n    mergedRemoveIcon = removeIcon\n  } else {\n    mergedRemoveIcon = <Icon type=\"close\" />\n  }\n\n  return {\n    clearIcon: mergedClearIcon,\n    suffixIcon: mergedSuffixIcon,\n    itemIcon: mergedItemIcon,\n    removeIcon: mergedRemoveIcon,\n  }\n}\n"]}

package/lib/tntd-cascader/AntdCascader/index.less

@@ -1239,7 +1239,7 @@
 
 .tntd-cascader-menu {
   -ms-overflow-style: -ms-autohiding-scrollbar;
-  border-right: 2px solid @grey-split;
+  border-right: 1px solid @grey-split;
   flex-grow: 1;
   height: 180px;
   list-style: none;
@@ -1877,7 +1877,7 @@
 
 .tntd-select:not(.tntd-select-customize-input) .tntd-select-selector {
   background-color: @white;
-  border: 1px solid @grey-d;
+  border: @border-width-base @border-style-base @select-border-color;
   border-radius: @border-radius-base;
   position: relative;
   transition: all .3s cubic-bezier(.645, .045, .355, 1)
@@ -1969,7 +1969,7 @@
 }
 
 .tntd-select-selection-placeholder {
-  color: #bfbfbf;
+  color: @input-placeholder-color;;
   flex: 1 1;
   overflow: hidden;
   pointer-events: none;
@@ -1990,7 +1990,7 @@
   -moz-osx-font-smoothing: grayscale;
   align-items: center;
   color: inherit;
-  color: rgba(0, 0, 0, .25);
+  color: @input-placeholder-color;
   display: inline-block;
   display: flex;
   font-size: 12px;
@@ -2056,10 +2056,10 @@
   font-style: normal;
   height: 12px;
   line-height: 1;
-  margin-top: -6px;
+  margin-top: -7px;
   opacity: 0;
   position: absolute;
-  right: 11px;
+  right: 13px;
   text-align: center;
   text-rendering: auto;
   text-transform: none;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",