From a03aa6e597439abb4dcfc319a0072f455b091ccd Mon Sep 17 00:00:00 2001
From: i18u <iahu1988@gmail.com>
Date: Wed, 9 Dec 2020 16:40:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20label=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/form/ItemLabel.tsx         |  7 +++--
 .../src/components/form/interface.ts          | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/components/form/ItemLabel.tsx b/packages/components/src/components/form/ItemLabel.tsx
index 24e617fe3d..3970a6933d 100644
--- a/packages/components/src/components/form/ItemLabel.tsx
+++ b/packages/components/src/components/form/ItemLabel.tsx
@@ -4,7 +4,8 @@ import classNames from 'classnames';
 import { FormLabelAlign, RequiredMark } from './context';
 
 export interface Props {
-  label?: string;
+  label?: React.ReactNode;
+  title?: string;
   fieldId?: string;
   prefixCls: string;
   labelWidth?: number;
@@ -21,6 +22,7 @@ const ItemLabel: React.FC<Props> = (props: Props) => {
   const {
     prefixCls,
     label,
+    title,
     labelWidth,
     fieldId,
     afterLabel,
@@ -35,6 +37,7 @@ const ItemLabel: React.FC<Props> = (props: Props) => {
   const isOptional = !required && requiredMark === 'optional';
   const innerMarker = isOptional ? '（选填）' : '*';
   const mergedRequiredMarker = marker !== undefined ? marker : innerMarker;
+  const mergedTitle = title ?? typeof label === 'string' ? (label as string) : ''
   const cls = classNames(
     `${prefixCls}-label`,
     isRequired && `${prefixCls}-label-required`,
@@ -61,7 +64,7 @@ const ItemLabel: React.FC<Props> = (props: Props) => {
   return (
     <div className={cls} style={{ width: labelWidth }}>
       {label && (
-        <label title={label} htmlFor={htmlFor}>
+        <label title={mergedTitle} htmlFor={htmlFor}>
           {labelChild}
         </label>
       )}
diff --git a/packages/components/src/components/form/interface.ts b/packages/components/src/components/form/interface.ts
index 283bdbdeec..0eeff84cfb 100644
--- a/packages/components/src/components/form/interface.ts
+++ b/packages/components/src/components/form/interface.ts
@@ -58,7 +58,7 @@ export interface Props<Values = unknown> extends Omit<RcFormProps<Values>, 'form
 type RenderChildren = (form: FormInstance) => React.ReactNode;
 type ChildrenType = RenderChildren | React.ReactNode;
 
-export interface FormItemProps extends Omit<FieldProps, 'children'> {
+export interface FormItemProps extends Omit<FieldProps, 'children'>, Omit<ItemLabelProps, 'colon'> {
   /**
    自定义 `css` 类前缀
    */
@@ -74,7 +74,12 @@ export interface FormItemProps extends Omit<FieldProps, 'children'> {
   /**
    `label` 标签的文本
    */
-  label?: string;
+  label?: React.ReactNode;
+
+  /**
+   * `label` 元素的 title 属性，不设置则尝试使用 string 类型的 label 属性
+   */
+  title?: string;
   afterLabel?: React.ReactNode;
   afterInput?: React.ReactNode;
   /**
@@ -123,7 +128,7 @@ export interface FormItemProps extends Omit<FieldProps, 'children'> {
    */
   labelAlign?: FormLabelAlign;
   fieldKey?: React.Key | React.Key[];
-  }
+}
 
 export interface FormContextProps {
   name?: string;
@@ -133,4 +138,19 @@ export interface FormContextProps {
   inputWidth?: number;
   requiredMark?: RequiredMark;
   colon?: boolean;
+}
+
+export interface ItemLabelProps {
+  label?: React.ReactNode;
+  title?: string;
+  fieldId?: string;
+  prefixCls?: string;
+  labelWidth?: number;
+  afterLabel?: React.ReactNode;
+  required?: boolean;
+  requiredMark?: RequiredMark;
+  marker?: React.ReactNode;
+  colon?: string;
+  htmlFor?: string;
+  labelAlign?: FormLabelAlign;
 }
\ No newline at end of file

From 21696b12e8214658209fa652c37bb7041fc45ee0 Mon Sep 17 00:00:00 2001
From: i18u <iahu1988@gmail.com>
Date: Wed, 9 Dec 2020 16:44:19 +0800
Subject: [PATCH 2/3] chore: eol

---
 packages/components/src/components/form/interface.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/components/form/interface.ts b/packages/components/src/components/form/interface.ts
index 0eeff84cfb..545ebebd6d 100644
--- a/packages/components/src/components/form/interface.ts
+++ b/packages/components/src/components/form/interface.ts
@@ -17,7 +17,7 @@ export interface Props<Values = unknown> extends Omit<RcFormProps<Values>, 'form
    */
   className?: string;
   /**
-   	表单名称
+     表单名称
    */
   name?: string;
   /**
@@ -52,7 +52,7 @@ export interface Props<Values = unknown> extends Omit<RcFormProps<Values>, 'form
   /**
    自定义样式
    */
-  style ?: React.CSSProperties;
+  style?: React.CSSProperties;
 }
 
 type RenderChildren = (form: FormInstance) => React.ReactNode;
@@ -153,4 +153,4 @@ export interface ItemLabelProps {
   colon?: string;
   htmlFor?: string;
   labelAlign?: FormLabelAlign;
-}
\ No newline at end of file
+}

From cd9287144dc8039c3c3daa7ebf450b7b3c9b0c90 Mon Sep 17 00:00:00 2001
From: i18u <iahu1988@gmail.com>
Date: Wed, 9 Dec 2020 16:58:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20title=20=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/src/components/form/Item.tsx            | 4 +++-
 packages/components/src/components/form/ItemLabel.tsx       | 6 ++++--
 .../website/src/components/functional/form/index.zh-CN.md   | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/components/form/Item.tsx b/packages/components/src/components/form/Item.tsx
index e499e0e10a..ddc275e46c 100644
--- a/packages/components/src/components/form/Item.tsx
+++ b/packages/components/src/components/form/Item.tsx
@@ -3,7 +3,7 @@ import { Meta } from 'rc-field-form/lib/interface';
 import FieldContext from 'rc-field-form/lib/FieldContext';
 import React, { useContext } from 'react';
 import classNames from 'classnames';
-import { FormItemProps } from './interface'
+import { FormItemProps } from './interface';
 import usePrefixCls from '../../utils/hooks/use-prefix-cls';
 import { FormContext } from './context';
 import { hasValidName, toArray } from './util';
@@ -25,6 +25,7 @@ const Item: React.FC<FormItemProps> = (props: FormItemProps) => {
     style,
     name,
     label,
+    title,
     help,
     feedback,
     feedbackType,
@@ -65,6 +66,7 @@ const Item: React.FC<FormItemProps> = (props: FormItemProps) => {
       <div className={cls} data-message-type={mergedFeedbackType} style={style}>
         <ItemLabel
           label={label}
+          title={title}
           labelAlign={labelAlign}
           prefixCls={prefixCls}
           fieldId={fieldId}
diff --git a/packages/components/src/components/form/ItemLabel.tsx b/packages/components/src/components/form/ItemLabel.tsx
index 3970a6933d..7d51e4f9c1 100644
--- a/packages/components/src/components/form/ItemLabel.tsx
+++ b/packages/components/src/components/form/ItemLabel.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
+import isNumber from 'lodash/isNumber';
+import isString from 'lodash/isString';
 
 import { FormLabelAlign, RequiredMark } from './context';
 
@@ -22,7 +24,7 @@ const ItemLabel: React.FC<Props> = (props: Props) => {
   const {
     prefixCls,
     label,
-    title,
+    title = label,
     labelWidth,
     fieldId,
     afterLabel,
@@ -37,7 +39,7 @@ const ItemLabel: React.FC<Props> = (props: Props) => {
   const isOptional = !required && requiredMark === 'optional';
   const innerMarker = isOptional ? '（选填）' : '*';
   const mergedRequiredMarker = marker !== undefined ? marker : innerMarker;
-  const mergedTitle = title ?? typeof label === 'string' ? (label as string) : ''
+  const mergedTitle = isNumber(title) || isString(title) ? (title as string) : '';
   const cls = classNames(
     `${prefixCls}-label`,
     isRequired && `${prefixCls}-label-required`,
diff --git a/packages/website/src/components/functional/form/index.zh-CN.md b/packages/website/src/components/functional/form/index.zh-CN.md
index a104cf7f9d..d3563b563f 100644
--- a/packages/website/src/components/functional/form/index.zh-CN.md
+++ b/packages/website/src/components/functional/form/index.zh-CN.md
@@ -223,6 +223,7 @@ group:
 | 参数              | 说明                                                                                                                | 类型                                              | 默认值   |
 | ----------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- | -------- |
 | label             | label 标签的文本                                                                                                    | string \| ReactNode                               | -        |
+| title             | label 标签的 title 属性                                                                                             | string                                            | -        |
 | name              | 字段名，支持数组                                                                                                    | [NamePath](#namepath)                             | -        |
 | valuePropName     | 子节点的值的属性，如 Switch 的是 'checked'。该属性为 getValueProps 的封装，自定义 `getValueProps` 后会失效          | string                                            | -        |
 | getValueFromEvent | 设置如何将 event 的值转换成字段值                                                                                   | `(..args: any[]) => any`                          | -        |