From 8114ac9baf32846966f249c132444afeae7c330a Mon Sep 17 00:00:00 2001
From: Kyrielin <a154571896@gmail.com>
Date: Wed, 22 Dec 2021 18:07:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20form=20status=20reset=E3=80=81MessagePlu?=
 =?UTF-8?q?gin=20import=20(#45)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/anchor/AnchorTarget.tsx            |  4 ++--
 src/dropdown/_example/base.jsx         |  4 ++--
 src/dropdown/_example/button.jsx       |  4 ++--
 src/dropdown/_example/click.jsx        | 10 +++++-----
 src/dropdown/_example/disabled.jsx     |  4 ++--
 src/dropdown/_example/long.jsx         |  4 ++--
 src/dropdown/_example/multiple.jsx     |  4 ++--
 src/dropdown/_example/split.jsx        |  4 ++--
 src/form/FormItem.tsx                  |  6 +++---
 src/form/_example/base.jsx             |  6 +++---
 src/form/_example/custom-validator.jsx |  6 +++---
 src/form/_example/login.jsx            |  6 +++---
 src/form/_example/validator-status.jsx |  6 +++---
 src/form/_example/validator.jsx        |  6 +++---
 src/menu/_example/single.jsx           |  4 ++--
 src/popconfirm/_example/base.jsx       |  8 ++++----
 16 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/anchor/AnchorTarget.tsx b/src/anchor/AnchorTarget.tsx
index bd17b7b29..7c6180d6e 100644
--- a/src/anchor/AnchorTarget.tsx
+++ b/src/anchor/AnchorTarget.tsx
@@ -2,7 +2,7 @@ import React, { FunctionComponent } from 'react';
 import classNames from 'classnames';
 import { FileCopyIcon } from 'tdesign-icons-react';
 import Popup from '../popup';
-import Message from '../message';
+import { MessagePlugin } from '../message';
 import useConfig from '../_util/useConfig';
 
 import { TdAnchorTargetProps } from './type';
@@ -23,7 +23,7 @@ const AnchorTarget: FunctionComponent<AnchorTargetProps> = (props) => {
     const a = document.createElement('a');
     a.href = `#${id}`;
     copyText(a.href);
-    Message.success('链接复制成功', 1000);
+    MessagePlugin.success('链接复制成功', 1000);
   };
 
   const Content = () => (
diff --git a/src/dropdown/_example/base.jsx b/src/dropdown/_example/base.jsx
index 1c90d4b8b..305ef3baa 100644
--- a/src/dropdown/_example/base.jsx
+++ b/src/dropdown/_example/base.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dropdown, Button, Message } from 'tdesign-react';
+import { Dropdown, Button, MessagePlugin } from 'tdesign-react';
 import { Icon } from 'tdesign-icons-react';
 
 export default function BasicDropdown() {
@@ -23,7 +23,7 @@ export default function BasicDropdown() {
     },
   ];
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler}>
diff --git a/src/dropdown/_example/button.jsx b/src/dropdown/_example/button.jsx
index 780a91c12..a290fd0c7 100644
--- a/src/dropdown/_example/button.jsx
+++ b/src/dropdown/_example/button.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dropdown, Button, Message } from 'tdesign-react';
+import { Dropdown, Button, MessagePlugin } from 'tdesign-react';
 import { Icon } from 'tdesign-icons-react';
 
 export default function BasicDropdown() {
@@ -23,7 +23,7 @@ export default function BasicDropdown() {
     },
   ];
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler}>
diff --git a/src/dropdown/_example/click.jsx b/src/dropdown/_example/click.jsx
index 2a01410ad..7af15a26e 100644
--- a/src/dropdown/_example/click.jsx
+++ b/src/dropdown/_example/click.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  Dropdown, Button, Message,
+  Dropdown, Button, MessagePlugin,
 } from 'tdesign-react';
 
 export default function BasicDropdown() {
@@ -9,22 +9,22 @@ export default function BasicDropdown() {
     {
       content: '操作一',
       value: 1,
-      onClick: () => Message.success('操作一'),
+      onClick: () => MessagePlugin.success('操作一'),
     },
     {
       content: '操作二',
       value: 2,
-      onClick: () => Message.success('操作二'),
+      onClick: () => MessagePlugin.success('操作二'),
     },
     {
       content: '操作三',
       value: 3,
-      onClick: () => Message.success('操作三'),
+      onClick: () => MessagePlugin.success('操作三'),
     },
     {
       content: getContent(),
       value: 4,
-      onClick: () => Message.success('操作四'),
+      onClick: () => MessagePlugin.success('操作四'),
     },
   ];
   return (
diff --git a/src/dropdown/_example/disabled.jsx b/src/dropdown/_example/disabled.jsx
index 226330a4b..3a1c98fda 100644
--- a/src/dropdown/_example/disabled.jsx
+++ b/src/dropdown/_example/disabled.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dropdown, Button, Message } from 'tdesign-react';
+import { Dropdown, Button, MessagePlugin } from 'tdesign-react';
 import { Icon } from 'tdesign-icons-react';
 
 export default function BasicDropdown() {
@@ -25,7 +25,7 @@ export default function BasicDropdown() {
     },
   ];
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler}>
diff --git a/src/dropdown/_example/long.jsx b/src/dropdown/_example/long.jsx
index 1ff6833e5..13db71af4 100644
--- a/src/dropdown/_example/long.jsx
+++ b/src/dropdown/_example/long.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  Dropdown, Button, Message,
+  Dropdown, Button, MessagePlugin,
 } from 'tdesign-react';
 
 export default function BasicDropdown() {
@@ -9,7 +9,7 @@ export default function BasicDropdown() {
     value: k + 1,
   }));
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler} maxHeight={400} minColumnWidth={90}>
diff --git a/src/dropdown/_example/multiple.jsx b/src/dropdown/_example/multiple.jsx
index 07efd33a5..d62ffa7de 100644
--- a/src/dropdown/_example/multiple.jsx
+++ b/src/dropdown/_example/multiple.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dropdown, Button, Message } from 'tdesign-react';
+import { Dropdown, Button, MessagePlugin } from 'tdesign-react';
 import { Icon } from 'tdesign-icons-react';
 
 export default function BasicDropdown() {
@@ -60,7 +60,7 @@ export default function BasicDropdown() {
     },
   ];
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler}>
diff --git a/src/dropdown/_example/split.jsx b/src/dropdown/_example/split.jsx
index 0cce0f233..f298dad9e 100644
--- a/src/dropdown/_example/split.jsx
+++ b/src/dropdown/_example/split.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dropdown, Button, Message } from 'tdesign-react';
+import { Dropdown, Button, MessagePlugin } from 'tdesign-react';
 import { Icon } from 'tdesign-icons-react';
 
 export default function BasicDropdown() {
@@ -24,7 +24,7 @@ export default function BasicDropdown() {
     },
   ];
   const clickHandler = (data) => {
-    Message.success(`选中【${data.value}】`);
+    MessagePlugin.success(`选中【${data.value}】`);
   };
   return (
     <Dropdown options={options} onClick={clickHandler}>
diff --git a/src/form/FormItem.tsx b/src/form/FormItem.tsx
index 3da5a73ac..c520b96ef 100644
--- a/src/form/FormItem.tsx
+++ b/src/form/FormItem.tsx
@@ -235,9 +235,6 @@ const FormItem = forwardRef<HTMLDivElement, FormItemProps>((props, ref) => {
 
   function setField(field: { value?: string; status?: ValidateStatus }) {
     const { value, status } = field;
-    if (typeof value !== 'undefined') {
-      setFormValue(value);
-    }
     // 手动设置 status 则不需要校验 交给用户判断
     if (typeof status !== 'undefined') {
       shouldValidate.current = false;
@@ -246,6 +243,9 @@ const FormItem = forwardRef<HTMLDivElement, FormItemProps>((props, ref) => {
       setNeedResetField(false);
       setVerifyStatus(status);
     }
+    if (typeof value !== 'undefined') {
+      setFormValue(value);
+    }
   }
 
   // 暴露 ref 实例方法
diff --git a/src/form/_example/base.jsx b/src/form/_example/base.jsx
index c2b12f55d..ec44fda82 100644
--- a/src/form/_example/base.jsx
+++ b/src/form/_example/base.jsx
@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import { Form, Input, Radio, Checkbox, Button, Switch, Message, DatePicker } from 'tdesign-react';
+import { Form, Input, Radio, Checkbox, Button, Switch, MessagePlugin, DatePicker } from 'tdesign-react';
 
 const { FormItem } = Form;
 
@@ -9,14 +9,14 @@ export default function BaseForm() {
   const onSubmit = (e) => {
     console.log(e);
     if (e.validateResult === true) {
-      Message.info('提交成功');
+      MessagePlugin.info('提交成功');
     }
     console.log(formRef.current.getAllFieldsValue());
   };
 
   const onReset = (e) => {
     console.log(e);
-    Message.info('重置成功');
+    MessagePlugin.info('重置成功');
   };
 
   return (
diff --git a/src/form/_example/custom-validator.jsx b/src/form/_example/custom-validator.jsx
index 00861f24e..5f57ec50c 100644
--- a/src/form/_example/custom-validator.jsx
+++ b/src/form/_example/custom-validator.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Input, Button, Message } from 'tdesign-react';
+import { Form, Input, Button, MessagePlugin } from 'tdesign-react';
 
 const { FormItem } = Form;
 
@@ -9,13 +9,13 @@ export default function BaseForm() {
   const onSubmit = (e) => {
     console.log(e);
     if (e.validateResult === true) {
-      Message.info('提交成功');
+      MessagePlugin.info('提交成功');
     }
   };
 
   const onReset = (e) => {
     console.log(e);
-    Message.info('重置成功');
+    MessagePlugin.info('重置成功');
   };
 
   // 自定义异步校验器
diff --git a/src/form/_example/login.jsx b/src/form/_example/login.jsx
index 5277eec2b..d6ee8e5d4 100644
--- a/src/form/_example/login.jsx
+++ b/src/form/_example/login.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Input, Button, Message } from 'tdesign-react';
+import { Form, Input, Button, MessagePlugin } from 'tdesign-react';
 import { DesktopIcon, LockOnIcon } from 'tdesign-icons-react';
 
 const { FormItem } = Form;
@@ -8,13 +8,13 @@ export default function BaseForm() {
   const onSubmit = (e) => {
     console.log(e);
     if (e.validateResult === true) {
-      Message.info('提交成功');
+      MessagePlugin.info('提交成功');
     }
   };
 
   const onReset = (e) => {
     console.log(e);
-    Message.info('重置成功');
+    MessagePlugin.info('重置成功');
   };
 
   return (
diff --git a/src/form/_example/validator-status.jsx b/src/form/_example/validator-status.jsx
index 4a800fd65..bba58267c 100644
--- a/src/form/_example/validator-status.jsx
+++ b/src/form/_example/validator-status.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { Form, Input, Button, Message } from 'tdesign-react';
+import { Form, Input, Button, MessagePlugin } from 'tdesign-react';
 import { LoadingIcon, AddRectangleIcon, HelpCircleIcon } from 'tdesign-icons-react';
 
 const { FormItem } = Form;
@@ -8,13 +8,13 @@ export default function BaseForm() {
   const onSubmit = (e) => {
     console.log(e);
     if (e.validateResult === true) {
-      Message.info('提交成功');
+      MessagePlugin.info('提交成功');
     }
   };
 
   const onReset = (e) => {
     console.log(e);
-    Message.info('重置成功');
+    MessagePlugin.info('重置成功');
   };
 
   const rules = {
diff --git a/src/form/_example/validator.jsx b/src/form/_example/validator.jsx
index 7ec75cbbf..d772e68a4 100644
--- a/src/form/_example/validator.jsx
+++ b/src/form/_example/validator.jsx
@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import { Form, Input, Radio, Checkbox, Button, Message } from 'tdesign-react';
+import { Form, Input, Radio, Checkbox, Button, MessagePlugin } from 'tdesign-react';
 import debounce from 'lodash/debounce';
 
 const { FormItem } = Form;
@@ -9,13 +9,13 @@ export default function BaseForm() {
   const onSubmit = (e) => {
     console.log(e);
     if (e.validateResult === true) {
-      Message.info('提交成功');
+      MessagePlugin.info('提交成功');
     }
   };
 
   const onReset = (e) => {
     console.log(e);
-    Message.info('重置成功');
+    MessagePlugin.info('重置成功');
   };
 
   function asyncValidate(val) {
diff --git a/src/menu/_example/single.jsx b/src/menu/_example/single.jsx
index 0ebfff98e..bc48dac5f 100644
--- a/src/menu/_example/single.jsx
+++ b/src/menu/_example/single.jsx
@@ -1,6 +1,6 @@
 // @ts-nocheck
 import React, { Fragment, useState } from 'react';
-import { Menu, Message } from 'tdesign-react';
+import { Menu, MessagePlugin } from 'tdesign-react';
 import { UserAddIcon, AppIcon, CallIcon } from 'tdesign-icons-react';
 
 const { HeadMenu, MenuItem } = Menu;
@@ -25,7 +25,7 @@ function Single() {
         }
         style={{ marginBottom: 20 }}
       >
-        <MenuItem value={'0'} onClick={() => Message.info('click 菜单1')}>
+        <MenuItem value={'0'} onClick={() => MessagePlugin.info('click 菜单1')}>
           <span>菜单1</span>
         </MenuItem>
         <MenuItem value={'1'}>
diff --git a/src/popconfirm/_example/base.jsx b/src/popconfirm/_example/base.jsx
index 103f59d6f..b7ed79c3a 100644
--- a/src/popconfirm/_example/base.jsx
+++ b/src/popconfirm/_example/base.jsx
@@ -1,14 +1,14 @@
 import React, { useState } from 'react';
-import { Button, PopConfirm, Message } from 'tdesign-react';
+import { Button, PopConfirm, MessagePlugin } from 'tdesign-react';
 
 export default function BasicExample() {
   const [visible, setVisible] = useState(false);
 
   const deleteClickHandler = () => {
-    const msg = Message.info('提交中', 0);
+    const msg = MessagePlugin.info('提交中', 0);
     setTimeout(() => {
-      Message.close(msg);
-      Message.success('提交成功！');
+      MessagePlugin.close(msg);
+      MessagePlugin.success('提交成功！');
       setVisible(false);
     }, 1000);
   };