From bef7dac956bb92226032798a3199d676cf7236c7 Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Tue, 21 Nov 2023 10:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96button=E5=92=8Clink=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/form/button.js | 20 +++++++-------------
 src/form/link.js   | 13 ++++---------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/form/button.js b/src/form/button.js
index 7384729..1d07f64 100644
--- a/src/form/button.js
+++ b/src/form/button.js
@@ -15,10 +15,10 @@ class Button extends Component {
       type: Boolean,
       observer(val) {
         if (val) {
-          this.cacheIcon = this.icon
+          this.#cacheIcon = this.icon
           this.icon = 'loading'
         } else {
-          this.icon = this.cacheIcon === void 0 ? this.icon : this.cacheIcon
+          this.icon = this.#cacheIcon === void 0 ? this.icon : this.#cacheIcon
         }
       }
     },
@@ -51,6 +51,7 @@ class Button extends Component {
           min-width: 1px;
           height: inherit;
           padding: var(--wc-button-padding, 0 4px);
+          gap: 4px;
           line-height: 1;
           border: 1px solid var(--wc-button-border-color, var(--color-grey-2));
           border-radius: inherit;
@@ -95,7 +96,6 @@ class Button extends Component {
         }
 
         .icon {
-          margin-right: 4px;
           --wc-icon-size: var(--wc-button-icon-size, 14px);
         }
       }
@@ -120,11 +120,6 @@ class Button extends Component {
       :host(:focus-within) {
         box-shadow: 0 0 0 2px var(--color-plain-a);
       }
-      :host(:empty) {
-        button .icon {
-          margin-right: 0;
-        }
-      }
     `,
     // 尺寸
     css`
@@ -185,9 +180,6 @@ class Button extends Component {
         button {
           padding: 0;
         }
-        .icon {
-          margin-right: 0;
-        }
 
         slot {
           display: none;
@@ -259,6 +251,8 @@ class Button extends Component {
     `
   ]
 
+  #cacheIcon
+
   created() {
     this.stamp = 0
 
@@ -283,7 +277,7 @@ class Button extends Component {
 
   mounted() {
     if (this.autofocus) {
-      nextTick(_ => this.$refs.btn.focus())
+      this.$refs.btn.focus()
     }
   }
 
@@ -291,7 +285,7 @@ class Button extends Component {
     return html`
       <button ref="btn" disabled=${this.disabled || this.loading}>
         <wc-icon class="icon" name=${this.icon}></wc-icon>
-        <slot ref="cont"></slot>
+        <slot></slot>
       </button>
     `
   }
diff --git a/src/form/link.js b/src/form/link.js
index af4996e..f87c298 100644
--- a/src/form/link.js
+++ b/src/form/link.js
@@ -8,7 +8,6 @@ import { css, html, Component, bind, nextTick } from 'wkit'
 
 class Link extends Component {
   static props = {
-    type: 'primary',
     to: '',
     autofocus: false,
     disabled: false,
@@ -31,13 +30,11 @@ class Link extends Component {
           justify-content: center;
           align-items: center;
           width: 100%;
-          padding: var(--padding, 0 2px);
+          padding: var(--wc-link-padding, 0 2px);
           line-height: 1;
-          font-size: inherit;
-          font-family: inherit;
-          outline: none;
           color: inherit;
           cursor: inherit;
+          outline: none;
           text-decoration: none;
           transition: color 0.15s linear;
           -webkit-user-select: none;
@@ -54,7 +51,7 @@ class Link extends Component {
           left: 0;
           width: 100%;
           height: 1px;
-          border-bottom: 1px dashed transparent;
+          border-bottom: 1px dashed var(--color-grey-1);
           content: '';
           opacity: 0;
           transition: opacity 0.15s linear;
@@ -68,9 +65,7 @@ class Link extends Component {
         info: 'blue',
         success: 'green',
         warning: 'orange',
-        danger: 'red',
-        secondary: 'dark',
-        help: 'grey'
+        danger: 'red'
       );
 
       @loop $t, $c in $colors {