tntd 2.8.0-beta.9 → 2.8.1

package/es/descriptions/descriptions.less

@@ -5,94 +5,90 @@
 @descriptions-small-padding: 8px 16px;
 @descriptions-bg: #e1e6ee;
 
-.@{descriptions-prefix-cls} {
-    // title样式
-    &.tntd-descriptions {
-        // 线条模式
-        &[class*="theme-line"]{
+.tnt-descriptions{
+    &.@{descriptions-prefix-cls} {
+        // 加粗的头部
+        &.tnt-descriptions-title-weight{
+            >.@{descriptions-prefix-cls}-title{
+                font-weight: 600 !important;
+            }
+        }
+
+        // label中有标签前缀
+        .tnt-descriptions-label-tag{
+            color:@primary-color;
+            margin-right: 4px;
+        }
+
+        // title样式
+        &[class*="tnt-descriptions-title-theme"]{
             // 默认色主题
-            >.ant-descriptions-title{
+            >.@{descriptions-prefix-cls}-title{
                 font-size:@font-size-base;
                 position: relative;
                 margin-bottom:12px;
                 padding-left:12px;
+                font-weight: 400;
                 &::before{
                     content: '';
                     width: 4px;
                     height: 12px;
                     background-color: @primary-color;
-                    border-radius: 8px;
+                    border-radius: @border-radius-base;//8px;
                     position: absolute;
-                    top:6px;
+                    top:5px;
                     left:0;
                 }
             }
-
-            // 黑色主题
-            &.theme-line-black{
-                .ant-descriptions-title{
+            // 默认没有前面的线条展示
+            &.title-theme-none{
+                >.@{descriptions-prefix-cls}-title{
+                    padding-left:0;
                     &::before{
                         content: '';
-                        background-color: @text-color;
+                        display: none;
                     }
                 }
             }
-
         }
 
-        // 区块模式
-        &.theme-block{
-            .ant-descriptions-title{
-                font-size:@font-size-base;
-                max-width: 100%;
-                display: inline-block;
-                padding: 6px 20px 6px 16px;
-                border-radius: 8px 20px 20px 0px;
-                background: linear-gradient(0deg, rgba(18, 107, 251, 0.16) 0%, rgba(18, 107, 251, 0.08) 76.56%);
-                margin-right: 4px;
-                margin-bottom:16px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                font-weight: 600;
-            }
-        }
-    }
-
-    &-bordered {
-        &.tntd-descriptions {
-            &.tntd-descriptions-ellipsis{
+        // 带边框
+        &-bordered {
+            &.tnt-descriptions-ellipsis{
                 .@{descriptions-prefix-cls}-item-label,
                 .@{descriptions-prefix-cls}-item-content {
-                    white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
+                    -webkit-box-orient: vertical;
                 }
-
                 .@{descriptions-prefix-cls}-item-label{
-                    width: 180px;
+                    width: 180px; // 其他语言模式默认180
+                    background-color: @fill-color-quaternary; //#F8F9FB;
+                }
+            }
+            &.@{descriptions-prefix-cls}-cn{
+                .@{descriptions-prefix-cls}-item-label{
+                    width: 160px; // 中文160
                 }
             }
             .@{descriptions-prefix-cls}-view > table {
                 table-layout: fixed;
             }
+            .@{descriptions-prefix-cls}-item-label{
+                background-color: fade(@descriptions-bg, 40%); ;
+            }
+            .@{descriptions-prefix-cls}-item-label,
+            .@{descriptions-prefix-cls}-item-content {
+                padding: @descriptions-small-padding;
+            }
         }
-        .@{descriptions-prefix-cls}-item-label{
-            background-color: fade(@descriptions-bg, 40%); ;
-        }
-        .@{descriptions-prefix-cls}-item-label,
-        .@{descriptions-prefix-cls}-item-content {
-            padding: 10px 16px;
-        }
-    }
 
-    &.tntd-descriptions-no-border{
-        &.tntd-descriptions{
-            .ant-descriptions-item{
-                height: 34px;
-                line-height: 34px;
+        // 不带边框
+        &:not(.@{descriptions-prefix-cls}-bordered ){
+            .@{descriptions-prefix-cls}-item{
+                height: 30px;
+                line-height: 30px;
                 position: relative;
-                padding-right: 12px;
                 padding:0;
                 &:not(:first-of-type){
                     padding-left: 12px;
@@ -101,29 +97,34 @@
                         left:0;
                         position: absolute;
                         width:1px;
-                        background-color: #CBD4E2;
+                        background-color: @descriptions-bg;
                         height:16px;
                         top: 50%;
                         margin-top:-8px;
                     }
                 }
-                .ant-descriptions-item-no-label{
+                .@{descriptions-prefix-cls}-item-no-label{
                     display: none;
                 }
-                .ant-descriptions-item-content{
+                .@{descriptions-prefix-cls}-item-content{
                     display: flex;
                     width: 100%;
-                    &>.tntd-ellipsis{
+                    height:100%;
+                    align-items: center;
+                    &>.tntd-ellipsis,>.tnt-ellipsis{
                         width: 100%;
-                        .tntd-description-label-title{
+                        height: 100%;
+                        align-items: center;
+                        .tnt-descriptions-label-title{
                             max-width: 70%;
-                            margin-right: 4px;
-                            color:#8B919E;
-                            white-space: nowrap;
+                            margin-right: 8px;
+                            color: tint(@bg-color-spotilight, 50%);//#8B919E;
                             overflow: hidden;
                             text-overflow: ellipsis;
-                            &+.tntd-description-item{
+                            -webkit-box-orient: vertical;
+                            &+.tnt-descriptions-item{
                                 flex:1;
+                                padding-right: 8px;
                             }
                         }
                     }

package/es/descriptions/style/index.less

@@ -23,6 +23,7 @@
     table {
       width: 100%;
       table-layout: fixed;
+      border-collapse: collapse !important; // 在Table下 下边框不展示问题
     }
   }
 

package/es/drawer/drawer.js

@@ -10,13 +10,12 @@ import { ConfigConsumer } from 'antd/es/config-provider';
 import { default as AntdDrawer } from 'antd/es/drawer';
 import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 import classNames from 'classnames';
-import React, { useEffect } from 'react';
+import { doUpperTitle } from '../utils';
+import React, { useCallback, useEffect } from 'react';
 import { Button } from '../button';
 import Icon from '../icon';
 const DefaultFooter = ({
   locale,
-  onClose,
-  onSubmit,
   onCancel,
   onOk,
   okText,
@@ -28,13 +27,10 @@ const DefaultFooter = ({
   cancelType
 }) => {
   return React.createElement(React.Fragment, null, React.createElement(Button, Object.assign({
-    onClick: onCancel || onClose,
-    style: {
-      marginRight: 8
-    },
+    onClick: onCancel,
     type: cancelType || 'default'
   }, cancelButtonProps), cancelText || (locale === null || locale === void 0 ? void 0 : locale.cancelText)), React.createElement(Button, Object.assign({
-    onClick: onOk || onSubmit,
+    onClick: onOk,
     type: okType || 'primary',
     loading: confirmLoading
   }, okButtonProps), okText || (locale === null || locale === void 0 ? void 0 : locale.okText)));
@@ -48,6 +44,7 @@ export const Drawer = _a => {
       onClose,
       onSubmit,
       onCancel,
+      afterClose,
       onOk,
       okText = '',
       cancelText = '',
@@ -57,11 +54,24 @@ export const Drawer = _a => {
       confirmLoading = false,
       okButtonProps = {},
       cancelButtonProps = {},
-      clickOnBlankToClose = false
+      clickOnBlankToClose = false,
+      upperCaseIgnore,
+      unUpperConverted,
+      title
     } = _a,
-    rest = __rest(_a, ["closable", "className", "footer", "showFooter", "onClose", "onSubmit", "onCancel", "onOk", "okText", "cancelText", "locale", "okType", "cancelType", "confirmLoading", "okButtonProps", "cancelButtonProps", "clickOnBlankToClose"]);
+    rest = __rest(_a, ["closable", "className", "footer", "showFooter", "onClose", "onSubmit", "onCancel", "afterClose", "onOk", "okText", "cancelText", "locale", "okType", "cancelType", "confirmLoading", "okButtonProps", "cancelButtonProps", "clickOnBlankToClose", "upperCaseIgnore", "unUpperConverted", "title"]);
   const drawerDom = React.useRef(null);
-  const _onCancel = onCancel || onClose;
+  const _onCancel = useCallback(() => {
+    if (onCancel) {
+      onCancel();
+    } else if (onClose) {
+      onClose();
+    }
+    if (afterClose) {
+      afterClose();
+    }
+  }, [onCancel, onClose, afterClose]);
+  const _onOk = onOk || onSubmit;
   useEffect(() => {
     if (clickOnBlankToClose) {
       const handleOutsideClick = event => {
@@ -101,15 +111,17 @@ export const Drawer = _a => {
           [`${prefixCls}-footer`]: showFooter || footer
         }),
         closable: false,
-        onClose: onClose,
+        onClose: _onCancel,
         width: 480
-      }, rest), React.createElement(React.Fragment, null, closable !== false && React.createElement(Icon, {
+      }, rest, {
+        title: !unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title
+      }), React.createElement(React.Fragment, null, closable !== false && React.createElement(Icon, {
         type: "close",
         className: `${prefixCls}-close`,
-        onClick: onClose
-      }), rest.children, React.createElement("div", {
+        onClick: _onCancel
+      }), rest.children, (showFooter || footer) && React.createElement("div", {
         className: `${prefixCls}-footer-style`
-      }, !footer ? showFooter && React.createElement(DefaultFooter, {
+      }, footer || React.createElement(DefaultFooter, {
         confirmLoading: confirmLoading,
         okButtonProps: okButtonProps,
         cancelButtonProps: cancelButtonProps,
@@ -118,11 +130,9 @@ export const Drawer = _a => {
         okText: okText,
         cancelType: cancelType,
         cancelText: cancelText,
-        onClose: onClose,
-        onSubmit: onSubmit,
-        onOk: onOk,
-        onCancel: onCancel
-      }) : footer))));
+        onOk: _onOk,
+        onCancel: _onCancel
+      })))));
     });
   });
 };

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 { ButtonType } from '../button/button'\n\nimport React, { FC, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onClose,\n  onSubmit,\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  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: ButtonType\n  cancelType: ButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button\n        onClick={onCancel || onClose}\n        style={{ marginRight: 8 }}\n        type={cancelType || 'default'}\n        {...cancelButtonProps}\n      >\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button\n        onClick={onOk || onSubmit}\n        type={okType || 'primary'}\n        loading={confirmLoading}\n        {...okButtonProps}\n      >\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  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: ButtonType\n  cancelType?: ButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'default',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = onCancel || onClose\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', 'tntd-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter || footer,\n                    })}\n                    closable={false}\n                    onClose={onClose}\n                    width={480}\n                    {...rest}\n                  >\n                    <>\n                      {closable !== false && (\n                        <Icon type=\"close\" className={`${prefixCls}-close`} onClick={onClose} />\n                      )}\n                      {rest.children}\n                      <div className={`${prefixCls}-footer-style`}>\n                        {!footer\n                          ? showFooter && (\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                                onClose={onClose}\n                                onSubmit={onSubmit}\n                                onOk={onOk}\n                                onCancel={onCancel}\n                              />\n                            )\n                          : footer}\n                      </div>\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/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 { ButtonType } 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?: ButtonType\n  cancelType: ButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onCancel} type={cancelType || 'default'} {...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?: ButtonType\n  cancelType?: ButtonType\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  onSubmit,\n  onCancel,\n  afterClose,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'default',\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', 'tntd-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={!unUpperConverted ? doUpperTitle(title, upperCaseIgnore) : title}\n                  >\n                    <>\n                      {closable !== false && (\n                        <Icon type=\"close\" className={`${prefixCls}-close`} onClick={_onCancel} />\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

@@ -20,12 +20,12 @@
 
     .@{drawer-prefix-cls}-wrapper-body {
         margin-top: 48px;
-        max-height: ~'calc(100vh - 50px)';
+        max-height: ~'calc(100vh - 48px)';
     }
 
     &-footer {
         .@{drawer-prefix-cls}-header {
-            border-bottom: none;
+            // border-bottom: none;
             position: absolute;
             right: 0;
             top: 0;
@@ -34,7 +34,7 @@
         }
 
         .@{drawer-prefix-cls}-wrapper-body {
-            max-height: ~'calc(100vh - 98px)' !important;
+            max-height: ~'calc(100vh - 96px)' !important;
             margin-top: 48px !important;
             margin-bottom: 48px !important;
         }
@@ -47,11 +47,6 @@
     }
 
     .@{drawer-prefix-cls}-close {
-        color: fade(@text-color, 50%);
-        width: 62px;
-        top: -4px;
-
-
         position: absolute;
         top: -2px;
         right: 0;
@@ -124,20 +119,19 @@
 
     .@{drawer-prefix-cls}-header {
         padding: 13px 24px;
-        border-bottom: none;
         position: absolute;
         right: 0;
         top: 0;
         width: 100%;
         background: #fff;
+        border-bottom: 1px solid #E9EDF3;
+
     }
 
     .@{drawer-prefix-cls}-body {
-        padding: @padding-lg !important;
-
+        padding: 24px !important;
     }
 
-
     .@{drawer-prefix-cls}-wrapper-body {
 
         .@{drawer-prefix-cls}-footer-style {
@@ -148,6 +142,11 @@
             padding: 8px 24px;
             background: #fff;
             text-align: right;
+            border-top: 1px solid #E9EDF3;
+
+            .@{ant-prefix}-btn {
+                margin-left: 15px;
+            }
         }
 
     }

package/es/form/form.js

@@ -10,6 +10,8 @@ import React, { forwardRef } from 'react';
 import { ConfigConsumer } from 'antd/es/config-provider';
 import { default as AntdForm } from 'antd/es/form';
 import { doUpperTitle } from '../utils';
+import './form.less';
+import classNames from 'classnames';
 export * from 'antd/es/form';
 export const Form = forwardRef((_a, ref) => {
   var rest = __rest(_a, []);
@@ -17,6 +19,7 @@ export const Form = forwardRef((_a, ref) => {
     getPrefixCls
   }) => {
     return React.createElement(AntdForm, Object.assign({}, rest, {
+      className: classNames(rest.className, 'tnt-form'),
       ref: ref
     }));
   });
@@ -37,7 +40,7 @@ Form.Item = forwardRef((_a, ref) => {
 });
 const Create = options => WrappedComponent => {
   const validateSubmitMap = {};
-  const CustomFormWrapper = props => {
+  const CustomFormWrapper = (props, ref) => {
     const getFieldDecorator = props.form.getFieldDecorator;
     props.form.getFieldDecorator = (name, options) => {
       let opt = options || {};
@@ -49,7 +52,9 @@ const Create = options => WrappedComponent => {
       }
       return getFieldDecorator(name, opt);
     };
-    return React.createElement(WrappedComponent, Object.assign({}, props));
+    return React.createElement(WrappedComponent, Object.assign({}, props, {
+      ref: ref
+    }));
   };
   return AntdForm.create(Object.assign(Object.assign({}, options), {
     onValuesChange: (props, changedValues, allValues) => {
@@ -69,7 +74,7 @@ const Create = options => WrappedComponent => {
         options.onValuesChange(props, changedValues, allValues);
       }
     }
-  }))(CustomFormWrapper);
+  }))(forwardRef(CustomFormWrapper));
 };
 Form.createFormField = AntdForm.createFormField;
 Form.create = Create;

package/es/form/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/form/form.tsx"],"names":[],"mappings":"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","sourcesContent":["import type {\n  FormItemProps as AntdFormItemProps,\n  FormProps as AntdFormProps,\n  FormComponentProps,\n  FormCreateOption,\n} from 'antd/es/form'\nimport React, { forwardRef } from 'react'\n\nimport { ConfigConsumer } from 'antd/es/config-provider'\n\nimport { default as AntdForm } from 'antd/es/form'\nimport type AntdFormItem from 'antd/es/form/FormItem'\n\nimport { doUpperTitle } from '../utils'\n\nexport * from 'antd/es/form'\n\ninterface FormItemComponent\n  extends React.ForwardRefExoticComponent<AntdFormItemProps & React.RefAttributes<AntdFormItem>> {}\ninterface FormComponent\n  extends React.ForwardRefExoticComponent<AntdFormProps & React.RefAttributes<AntdForm>> {\n  Item: FormItemComponent\n  create: typeof AntdForm.create\n  createFormField: typeof AntdForm.createFormField\n}\n\nexport const Form = forwardRef<AntdForm, AntdFormProps>(({ ...rest }, ref) => {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        return <AntdForm {...rest} ref={ref} />\n      }}\n    </ConfigConsumer>\n  )\n}) as FormComponent\n\nForm.Item = forwardRef<AntdFormItem, AntdFormItemProps>(({ label, ...rest }, ref) => {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        return <AntdForm.Item {...rest} label={doUpperTitle(label)} ref={ref} />\n      }}\n    </ConfigConsumer>\n  )\n})\n\n// 定义 create 函数的类型\ntype CreateFunction = <TOwnProps extends FormComponentProps<any>>(\n  options?: FormCreateOption<TOwnProps>\n) => any\n\nconst Create: CreateFunction = (options: any) => (WrappedComponent: any) => {\n  const validateSubmitMap: any = {}\n  const CustomFormWrapper = (props: any) => {\n    const getFieldDecorator = props.form.getFieldDecorator\n    props.form.getFieldDecorator = (name: any, options: any) => {\n      let opt = options || {}\n      if (opt.validateSubmit) {\n        opt = {\n          ...options,\n          validateTrigger: 'noEvent',\n        }\n        validateSubmitMap[name] = true\n      }\n      return getFieldDecorator(name, opt)\n    }\n    return <WrappedComponent {...props} />\n  }\n\n  return AntdForm.create({\n    ...options,\n    onValuesChange: (props: any, changedValues: any, allValues: any) => {\n      const keys = Object.keys(changedValues)\n      if (keys.length === 1) {\n        keys.forEach((name: any) => {\n          if (validateSubmitMap[name]) {\n            props.form.setFields({\n              [name]: { errors: undefined },\n            })\n          }\n        })\n      }\n      if (options && options.onValuesChange) {\n        options.onValuesChange(props, changedValues, allValues)\n      }\n    },\n  })(CustomFormWrapper)\n}\n\nForm.createFormField = AntdForm.createFormField\nForm.create = Create\n"]}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/form/form.tsx"],"names":[],"mappings":"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","sourcesContent":["import type {\n  FormItemProps as AntdFormItemProps,\n  FormProps as AntdFormProps,\n  FormComponentProps,\n  FormCreateOption,\n} from 'antd/es/form'\nimport React, { forwardRef } from 'react'\n\nimport { ConfigConsumer } from 'antd/es/config-provider'\n\nimport { default as AntdForm } from 'antd/es/form'\nimport type AntdFormItem from 'antd/es/form/FormItem'\n\nimport { doUpperTitle } from '../utils'\nimport './form.less'\nimport classNames from 'classnames'\nexport * from 'antd/es/form'\n\ninterface FormItemComponent\n  extends React.ForwardRefExoticComponent<AntdFormItemProps & React.RefAttributes<AntdFormItem>> {}\ninterface FormComponent\n  extends React.ForwardRefExoticComponent<AntdFormProps & React.RefAttributes<AntdForm>> {\n  Item: FormItemComponent\n  create: typeof AntdForm.create\n  createFormField: typeof AntdForm.createFormField\n}\n\nexport const Form = forwardRef<AntdForm, AntdFormProps>(({ ...rest }, ref) => {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        return <AntdForm {...rest} className={classNames(rest.className, 'tnt-form')} ref={ref} />\n      }}\n    </ConfigConsumer>\n  )\n}) as FormComponent\n\nForm.Item = forwardRef<AntdFormItem, AntdFormItemProps>(({ label, ...rest }, ref) => {\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        return <AntdForm.Item {...rest} label={doUpperTitle(label)} ref={ref} />\n      }}\n    </ConfigConsumer>\n  )\n})\n\n// 定义 create 函数的类型\ntype CreateFunction = <TOwnProps extends FormComponentProps<any>>(\n  options?: FormCreateOption<TOwnProps>\n) => any\n\nconst Create: CreateFunction = (options: any) => (WrappedComponent: any) => {\n  const validateSubmitMap: any = {}\n  const CustomFormWrapper = (props: any, ref: any) => {\n    const getFieldDecorator = props.form.getFieldDecorator\n    props.form.getFieldDecorator = (name: any, options: any) => {\n      let opt = options || {}\n      if (opt.validateSubmit) {\n        opt = {\n          ...options,\n          validateTrigger: 'noEvent',\n        }\n        validateSubmitMap[name] = true\n      }\n      return getFieldDecorator(name, opt)\n    }\n    return <WrappedComponent {...props} ref={ref} />\n  }\n\n  return AntdForm.create({\n    ...options,\n    onValuesChange: (props: any, changedValues: any, allValues: any) => {\n      const keys = Object.keys(changedValues)\n      if (keys.length === 1) {\n        keys.forEach((name: any) => {\n          if (validateSubmitMap[name]) {\n            props.form.setFields({\n              [name]: { errors: undefined },\n            })\n          }\n        })\n      }\n      if (options && options.onValuesChange) {\n        options.onValuesChange(props, changedValues, allValues)\n      }\n    },\n  })(forwardRef(CustomFormWrapper))\n}\n\nForm.createFormField = AntdForm.createFormField\nForm.create = Create\n"]}

package/es/form/form.less

@@ -0,0 +1,42 @@
+@form-prefix-cls: ~'@{ant-prefix}-form';
+
+.tnt-form {
+    .@{form-prefix-cls}-item {
+        // min-height: @input-height-base;
+
+        .@{form-prefix-cls}-item-required::before {
+            top: 2px;
+            position: relative;
+        }
+
+        &-with-help {
+          margin-bottom: @form-item-margin-bottom;
+        }
+
+        &-control {
+            line-height: 1;
+            min-height: @input-height-base;
+        }
+
+        &-label {
+            line-height: @input-height-base;
+        }
+
+        &-children {
+            line-height: calc(@input-height-base - 2px);
+        }
+    }
+
+    .@{form-prefix-cls}-explain,
+    .@{form-prefix-cls}-extra {
+        margin-top: 4px;
+    }
+
+    &.@{form-prefix-cls}-vertical{
+        .@{form-prefix-cls}-item {
+            &-label {
+                line-height: @line-height-base;
+            }
+        }
+    }
+}

package/es/form/style/index.less

@@ -83,9 +83,9 @@
     position: relative;
   }
 
-  &-with-help {
-    margin-bottom: max(0, @form-item-margin-bottom - @form-explain-height - @form-help-margin-top);
-  }
+  // &-with-help {
+  //   margin-bottom: max(0, @form-item-margin-bottom - @form-explain-height - @form-help-margin-top);
+  // }
 
   &-label {
     display: inline-block;
@@ -310,9 +310,9 @@ form {
 }
 
 .@{form-prefix-cls}-vertical {
-  .@{form-prefix-cls}-item {
-    padding-bottom: 8px;
-  }
+  // .@{form-prefix-cls}-item {
+  //   padding-bottom: 8px;
+  // }
   .@{form-prefix-cls}-item-control {
     line-height: @line-height-base;
   }