From 2be579975a9a21840437076fe48ed06f3dd52cc0 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Tue, 13 Apr 2021 20:58:26 +0800
Subject: [PATCH] chore(Button): improve code

---
 src/button/Button.tsx        | 11 +++++------
 src/composables/use-route.ts |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/button/Button.tsx b/src/button/Button.tsx
index 8c4e1800a..77724b788 100644
--- a/src/button/Button.tsx
+++ b/src/button/Button.tsx
@@ -77,9 +77,9 @@ export default defineComponent({
 
       return (
         <Loading
-          class={bem('loading')}
           size={props.loadingSize}
           type={props.loadingType}
+          class={bem('loading')}
         />
       );
     };
@@ -116,9 +116,9 @@ export default defineComponent({
     const getStyle = () => {
       const { color, plain } = props;
       if (color) {
-        const style: CSSProperties = {};
-
-        style.color = plain ? color : 'white';
+        const style: CSSProperties = {
+          color: plain ? color : 'white',
+        };
 
         if (!plain) {
           // Use background instead of backgroundColor to make linear-gradient work
@@ -139,8 +139,7 @@ export default defineComponent({
     const onClick = (event: MouseEvent) => {
       if (props.loading) {
         event.preventDefault();
-      }
-      if (!props.loading && !props.disabled) {
+      } else if (!props.disabled) {
         emit('click', event);
         route();
       }
diff --git a/src/composables/use-route.ts b/src/composables/use-route.ts
index f387764dc..718e9f46d 100644
--- a/src/composables/use-route.ts
+++ b/src/composables/use-route.ts
@@ -30,7 +30,5 @@ export function route(vm: ComponentPublicInstance<RouteProps>) {
 
 export function useRoute() {
   const vm = getCurrentInstance()!.proxy as ComponentPublicInstance<RouteProps>;
-  return () => {
-    route(vm);
-  };
+  return () => route(vm);
 }