From f55dc61c732d9065fe55504c23985d441174e75f Mon Sep 17 00:00:00 2001
From: carolin913 <carolin913@126.com>
Date: Mon, 29 Aug 2022 12:25:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(select):=20option=E8=AE=BE=E7=BD=AEcontent?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/message/_example/close-function.jsx | 1 -
 src/select/_example/base.jsx            | 2 +-
 src/select/_example/multiple.jsx        | 6 +++---
 src/select/base/Option.tsx              | 2 +-
 src/select/base/PopupContent.tsx        | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/message/_example/close-function.jsx b/src/message/_example/close-function.jsx
index 4b7122634..1f0aa3f45 100644
--- a/src/message/_example/close-function.jsx
+++ b/src/message/_example/close-function.jsx
@@ -5,7 +5,6 @@ export default function () {
   const [instance, setInstance] = useState(null);
   const isMessageOpen = instance === null;
   const buttonTips = isMessageOpen ? '打开' : '关闭';
-
   return (
     <Button
       onClick={() => {
diff --git a/src/select/_example/base.jsx b/src/select/_example/base.jsx
index 9c6818052..8550a041b 100644
--- a/src/select/_example/base.jsx
+++ b/src/select/_example/base.jsx
@@ -18,7 +18,7 @@ export default function SingleSelect() {
         { label: '大数据', value: '2' },
         { label: '区块链', value: '3' },
         { label: '物联网', value: '4', disabled: true },
-        { label: '人工智能', value: '5' },
+        { label: '人工智能', value: '5', content: <span>人工智能（新）</span> },
       ]}
     ></Select>
   );
diff --git a/src/select/_example/multiple.jsx b/src/select/_example/multiple.jsx
index 1df7ae2ee..c559d1d42 100644
--- a/src/select/_example/multiple.jsx
+++ b/src/select/_example/multiple.jsx
@@ -8,7 +8,7 @@ const options1 = [
   { label: '大数据', value: '2' },
   { label: '区块链', value: '3' },
   { label: '物联网', value: '4', disabled: true },
-  { label: '人工智能', value: '5' },
+  { label: '人工智能', value: '5', content: <span>人工智能（新）</span> },
   {
     label: '计算场景',
     value: '6',
@@ -21,7 +21,7 @@ const options2 = [
   { label: '域名注册', value: '3' },
   { label: '网站备案', value: '4' },
   { label: '对象存储', value: '5' },
-  { label: '低代码平台', value: '6' },
+  { label: '低代码平台', value: '6', content: <span>低代码平台（新）</span> },
 ];
 
 const MultipleSelect = () => {
@@ -33,7 +33,7 @@ const MultipleSelect = () => {
       <br></br>
       <Select defaultValue={['1', '2', '3', '4', '5', '6']} placeholder="请选择云产品" multiple>
         {options2.map((item) => (
-          <Option value={item.value} label={item.label} key={item.value}></Option>
+          <Option value={item.value} label={item.label} key={item.value} content={item.content}></Option>
         ))}
       </Select>
     </Space>
diff --git a/src/select/base/Option.tsx b/src/select/base/Option.tsx
index 818ec9257..3c6aa16bc 100644
--- a/src/select/base/Option.tsx
+++ b/src/select/base/Option.tsx
@@ -102,7 +102,7 @@ const Option = (props: SelectOptionProps) => {
             onClick={(e) => e.stopPropagation()}
           />
           <span className={classNames(`${classPrefix}-checkbox__input`)}></span>
-          <span className={classNames(`${classPrefix}-checkbox__label`)}>{children || label}</span>
+          <span className={classNames(`${classPrefix}-checkbox__label`)}>{children || content || label}</span>
         </label>
       );
     }
diff --git a/src/select/base/PopupContent.tsx b/src/select/base/PopupContent.tsx
index 2190409d3..c1b904724 100644
--- a/src/select/base/PopupContent.tsx
+++ b/src/select/base/PopupContent.tsx
@@ -114,7 +114,7 @@ const PopupContent = forwardRef((props: SelectPopupProps, ref: Ref<HTMLDivElemen
       // 通过 options API配置的
       return (
         <ul className={`${classPrefix}-select__list`}>
-          {(options as OptionsType).map(({ value: optionValue, label, disabled, ...restData }, index) => (
+          {(options as OptionsType).map(({ value: optionValue, label, disabled, content, ...restData }, index) => (
             <Option
               key={index}
               max={max}
@@ -127,6 +127,7 @@ const PopupContent = forwardRef((props: SelectPopupProps, ref: Ref<HTMLDivElemen
               disabled={disabled}
               restData={restData}
               keys={keys}
+              content={content}
             />
           ))}
         </ul>