From 0e5aaa2393801469e30ca230bcb5e99e3628babd Mon Sep 17 00:00:00 2001
From: Jiankian <luozhengan@vip.qq.com>
Date: Mon, 22 Apr 2024 20:19:23 +0800
Subject: [PATCH] =?UTF-8?q?Button=20Taro=E7=89=88=E6=9C=AC=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20button=E5=8E=9F=E5=A7=8B=E7=B1=BB=E5=9E=8B=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=94=AF=E6=8C=81=20Uploader=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?Taro=E6=89=93=E5=8C=85=E7=9A=84H5=E7=89=88=E6=9C=AC=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/button/button.taro.tsx     |  3 +++
 src/packages/uploader/uploader.taro.tsx | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/packages/button/button.taro.tsx b/src/packages/button/button.taro.tsx
index 7fd6d1dd05..13243ddc1e 100644
--- a/src/packages/button/button.taro.tsx
+++ b/src/packages/button/button.taro.tsx
@@ -35,6 +35,7 @@ export interface ButtonProps
   disabled: boolean
   icon: React.ReactNode
   rightIcon: React.ReactNode
+  nativeType: 'submit' | 'reset' | 'button'
   onClick: (e: MouseEvent<HTMLButtonElement>) => void
 }
 
@@ -70,6 +71,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
       children,
       className,
       style,
+      nativeType,
       onClick,
       ...rest
     } = {
@@ -108,6 +110,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
       <button
         {...rest}
         ref={ref}
+        type={nativeType}
         className={classNames(
           prefixCls,
           `${prefixCls}-${type}`,
diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx
index fa01721bc8..c93487dbbd 100644
--- a/src/packages/uploader/uploader.taro.tsx
+++ b/src/packages/uploader/uploader.taro.tsx
@@ -491,12 +491,16 @@ const InternalUploader: ForwardRefRenderFunction<
         <div className="nut-uploader-slot">
           <>
             {children || (
-              <Button size="small" type="primary">
+              <Button nativeType="button" size="small" type="primary">
                 上传文件
               </Button>
             )}
             {Number(maxCount) > fileList.length && (
-              <Button className="nut-uploader-input" onClick={_chooseImage} />
+              <Button
+                nativeType="button"
+                className="nut-uploader-input"
+                onClick={_chooseImage}
+              />
             )}
           </>
         </div>
@@ -526,7 +530,11 @@ const InternalUploader: ForwardRefRenderFunction<
               {uploadIcon}
               <span className="nut-uploader-icon-tip">{uploadLabel}</span>
             </div>
-            <Button className="nut-uploader-input" onClick={_chooseImage} />
+            <Button
+              nativeType="button"
+              className="nut-uploader-input"
+              onClick={_chooseImage}
+            />
           </div>
         )}
     </div>