From 1bca47dcf71c668468e081cebd3b117fa7232988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Mon, 25 Oct 2021 14:32:11 +0800
Subject: [PATCH] fix(components): button displays icon only (#4019)

* fix(components): button displays icon only

* docs: add chinese button
---
 docs/examples/button/basic.vue            | 1 +
 packages/components/button/src/button.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/examples/button/basic.vue b/docs/examples/button/basic.vue
index e26484d1d6..1bc6a57557 100644
--- a/docs/examples/button/basic.vue
+++ b/docs/examples/button/basic.vue
@@ -6,6 +6,7 @@
     <el-button type="info">Info</el-button>
     <el-button type="warning">Warning</el-button>
     <el-button type="danger">Danger</el-button>
+    <el-button>中文</el-button>
   </el-row>
 
   <el-row>
diff --git a/packages/components/button/src/button.vue b/packages/components/button/src/button.vue
index d5373b0603..97ebed2d37 100644
--- a/packages/components/button/src/button.vue
+++ b/packages/components/button/src/button.vue
@@ -18,9 +18,9 @@
     @click="handleClick"
   >
     <i v-if="loading" class="el-icon-loading"></i>
-    <i v-if="icon && !loading" :class="icon"></i>
+    <i v-else-if="icon" :class="icon"></i>
     <span
-      v-else-if="$slots.default"
+      v-if="$slots.default"
       :class="{ 'el-button__text--expand': shouldAddSpace }"
     >
       <slot></slot>