From ae6562c95ab04cc7a9371cb10c98704e0511cec0 Mon Sep 17 00:00:00 2001
From: LiLi <urfreespace@gmail.com>
Date: Sat, 24 Jul 2021 12:36:08 +0800
Subject: [PATCH 1/4] chore: ignore bak dir

Signed-off-by: LiLi <urfreespace@gmail.com>
---
 .eslintignore    | 1 +
 .gitignore       | 2 ++
 .stylelintignore | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/.eslintignore b/.eslintignore
index 348631b27b0..c6eb89b6d9e 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -13,3 +13,4 @@ dist
 .local
 /bin
 Dockerfile
+bak
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a4b670db709..0cc6a817f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+bak/
diff --git a/.stylelintignore b/.stylelintignore
index 0517076123b..3320837024a 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,3 +1,5 @@
 /dist/*
 /public/*
 public/*
+bak/*
+/bak/*
\ No newline at end of file

From 075dd2f37c7042d6d398648496e2af264ed9f1ce Mon Sep 17 00:00:00 2001
From: LiLi <urfreespace@gmail.com>
Date: Sat, 31 Jul 2021 14:29:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBasicButton?=
 =?UTF-8?q?=E5=9C=A8=E5=A4=96=E9=83=A8=E6=94=B9=E5=8F=98=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=83=AD=E6=9B=B4=E6=96=B0=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: LiLi <urfreespace@gmail.com>
---
 src/components/Button/src/BasicButton.vue | 9 +++++----
 src/hooks/core/useAttrs.ts                | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/Button/src/BasicButton.vue b/src/components/Button/src/BasicButton.vue
index ea1932212e4..3b6fb52fc83 100644
--- a/src/components/Button/src/BasicButton.vue
+++ b/src/components/Button/src/BasicButton.vue
@@ -8,18 +8,20 @@
   </Button>
 </template>
 <script lang="ts">
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, unref } from 'vue';
   import { Button } from 'ant-design-vue';
   import Icon from '/@/components/Icon/src/Icon.vue';
   import { buttonProps } from './props';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
 
   export default defineComponent({
     name: 'AButton',
     components: { Button, Icon },
     inheritAttrs: false,
     props: buttonProps,
-    setup(props, { attrs }) {
+    setup(props) {
       // get component class
+      const attrs = useAttrs({ excludeDefaultKeys: false });
       const getButtonClass = computed(() => {
         const { color, disabled } = props;
         return [
@@ -27,12 +29,11 @@
             [`ant-btn-${color}`]: !!color,
             [`is-disabled`]: disabled,
           },
-          attrs.class,
         ];
       });
 
       // get inherit binding value
-      const getBindValue = computed(() => ({ ...attrs, ...props }));
+      const getBindValue = computed(() => ({ ...unref(attrs), ...props }));
 
       return { getBindValue, getButtonClass };
     },
diff --git a/src/hooks/core/useAttrs.ts b/src/hooks/core/useAttrs.ts
index 9290ae72a4d..a7c5bd74c60 100644
--- a/src/hooks/core/useAttrs.ts
+++ b/src/hooks/core/useAttrs.ts
@@ -3,6 +3,7 @@ import type { Ref } from 'vue';
 interface Params {
   excludeListeners?: boolean;
   excludeKeys?: string[];
+  excludeDefaultKeys?: boolean;
 }
 
 const DEFAULT_EXCLUDE_KEYS = ['class', 'style'];
@@ -16,9 +17,9 @@ export function useAttrs(params: Params = {}): Ref<Recordable> | {} {
   const instance = getCurrentInstance();
   if (!instance) return {};
 
-  const { excludeListeners = false, excludeKeys = [] } = params;
+  const { excludeListeners = false, excludeKeys = [], excludeDefaultKeys = true } = params;
   const attrs = shallowRef({});
-  const allExcludeKeys = excludeKeys.concat(DEFAULT_EXCLUDE_KEYS);
+  const allExcludeKeys = excludeKeys.concat(excludeDefaultKeys ? DEFAULT_EXCLUDE_KEYS : []);
 
   // Since attrs are not reactive, make it reactive instead of doing in `onUpdated` hook for better performance
   instance.attrs = reactive(instance.attrs);

From b6a9505289c030d5dfdcc8acea38250c62b2e418 Mon Sep 17 00:00:00 2001
From: LiLi <urfreespace@gmail.com>
Date: Sat, 31 Jul 2021 14:36:37 +0800
Subject: [PATCH 3/4] chore: remove extra ignore

Signed-off-by: LiLi <urfreespace@gmail.com>
---
 .eslintignore    | 1 -
 .gitignore       | 4 +---
 .stylelintignore | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index c6eb89b6d9e..348631b27b0 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -13,4 +13,3 @@ dist
 .local
 /bin
 Dockerfile
-bak
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 0cc6a817f8d..8197ca006ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
-
-bak/
+*.sw?
\ No newline at end of file
diff --git a/.stylelintignore b/.stylelintignore
index 3320837024a..8e46e1069e5 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,5 +1,3 @@
 /dist/*
 /public/*
-public/*
-bak/*
-/bak/*
\ No newline at end of file
+public/*
\ No newline at end of file

From 330de27b95dfe1b3f36508667218d43dfbf25aea Mon Sep 17 00:00:00 2001
From: LiLi <urfreespace@gmail.com>
Date: Sat, 31 Jul 2021 14:38:19 +0800
Subject: [PATCH 4/4] chore: ignore fix

Signed-off-by: LiLi <urfreespace@gmail.com>
---
 .gitignore       | 2 +-
 .stylelintignore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8197ca006ad..a4b670db709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
\ No newline at end of file
+*.sw?
diff --git a/.stylelintignore b/.stylelintignore
index 8e46e1069e5..0517076123b 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,3 +1,3 @@
 /dist/*
 /public/*
-public/*
\ No newline at end of file
+public/*