From a989a286e4dd3a939a2df7d8b59410c6c9feb6d0 Mon Sep 17 00:00:00 2001
From: Konv Suu <2583695112@qq.com>
Date: Thu, 23 Mar 2023 21:08:59 +0800
Subject: [PATCH 1/2] fix(comp:button): disabled btn when group disabled

---
 packages/components/button/src/Button.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/components/button/src/Button.tsx b/packages/components/button/src/Button.tsx
index 82acb8cf1..d11cd9b9c 100644
--- a/packages/components/button/src/Button.tsx
+++ b/packages/components/button/src/Button.tsx
@@ -62,7 +62,9 @@ export default defineComponent({
     })
 
     const handleClick = (evt: MouseEvent) => {
-      if (props.disabled || props.loading) {
+      const { disabled = groupProps.disabled } = props
+
+      if (disabled || props.loading) {
         evt.preventDefault()
         evt.stopImmediatePropagation()
         return

From 2a953c55e4f08303fdc46d3c12c3af561c84429d Mon Sep 17 00:00:00 2001
From: Konv Suu <2583695112@qq.com>
Date: Fri, 24 Mar 2023 11:08:24 +0800
Subject: [PATCH 2/2] fix(comp:button): mergedDisabled replace disabled

---
 packages/components/button/src/Button.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/components/button/src/Button.tsx b/packages/components/button/src/Button.tsx
index d11cd9b9c..635a4b06f 100644
--- a/packages/components/button/src/Button.tsx
+++ b/packages/components/button/src/Button.tsx
@@ -35,12 +35,12 @@ export default defineComponent({
     const mergedWaveless = computed(
       () => mode.value === 'text' || mode.value === 'link' || (props.waveless ?? config.waveless),
     )
+    const mergedDisabled = computed(() => props.disabled ?? groupProps.disabled)
 
     const classes = computed(() => {
       const {
         block = groupProps.block,
         danger = groupProps.danger,
-        disabled = groupProps.disabled,
         ghost = groupProps.ghost,
         loading,
         icon,
@@ -51,7 +51,7 @@ export default defineComponent({
         [prefixCls]: true,
         [`${prefixCls}-block`]: block,
         [`${prefixCls}-danger`]: danger,
-        [`${prefixCls}-disabled`]: disabled,
+        [`${prefixCls}-disabled`]: mergedDisabled.value,
         [`${prefixCls}-ghost`]: ghost,
         [`${prefixCls}-loading`]: loading,
         [`${prefixCls}-icon-only`]: !slots.default && (icon || loading || slots.icon),
@@ -62,9 +62,7 @@ export default defineComponent({
     })
 
     const handleClick = (evt: MouseEvent) => {
-      const { disabled = groupProps.disabled } = props
-
-      if (disabled || props.loading) {
+      if (mergedDisabled.value || props.loading) {
         evt.preventDefault()
         evt.stopImmediatePropagation()
         return
@@ -77,7 +75,7 @@ export default defineComponent({
     }
 
     return () => {
-      const { disabled, loading, icon, type } = props
+      const { loading, icon, type } = props
 
       const children: VNodeChild[] = []
       if (loading) {
@@ -100,7 +98,7 @@ export default defineComponent({
         )
       }
       return (
-        <button class={classes.value} disabled={disabled || loading} type={type} onClick={handleClick}>
+        <button class={classes.value} disabled={mergedDisabled.value || loading} type={type} onClick={handleClick}>
           {children}
           {!mergedWaveless.value && <ɵWave ref={waveRef} />}
         </button>