From afafafce6e741ff93cff9f6a91bb8cab95320e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 3 Jul 2018 17:37:22 +0800
Subject: [PATCH] Avatar add custom-icon prop

---
 examples/routers/avatar.vue      |  2 ++
 src/components/avatar/avatar.vue | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/examples/routers/avatar.vue b/examples/routers/avatar.vue
index bb05cc4d..9f7ed8e6 100644
--- a/examples/routers/avatar.vue
+++ b/examples/routers/avatar.vue
@@ -30,6 +30,8 @@
                 <Avatar shape="square" icon="ios-person" />
             </Badge>
         </div>
+        <br><br><br>
+        <Avatar custom-icon="ivu-icon-ios-person" />
     </div>
 </template>
 <script>
diff --git a/src/components/avatar/avatar.vue b/src/components/avatar/avatar.vue
index 9cdc45ac..a3594844 100644
--- a/src/components/avatar/avatar.vue
+++ b/src/components/avatar/avatar.vue
@@ -1,7 +1,7 @@
 <template>
     <span :class="classes">
         <img :src="src" v-if="src">
-        <Icon :type="icon" v-else-if="icon"></Icon>
+        <Icon :type="icon" :custom="customIcon" v-else-if="icon || customIcon"></Icon>
         <span ref="children" :class="[prefixCls + '-string']" :style="childrenStyle" v-else><slot></slot></span>
     </span>
 </template>
@@ -34,7 +34,11 @@
             },
             icon: {
                 type: String
-            }
+            },
+            customIcon: {
+                type: String,
+                default: ''
+            },
         },
         data () {
             return {
@@ -52,7 +56,7 @@
                     `${prefixCls}-${this.size}`,
                     {
                         [`${prefixCls}-image`]: !!this.src,
-                        [`${prefixCls}-icon`]: !!this.icon
+                        [`${prefixCls}-icon`]: !!this.icon || !!this.customIcon
                     }
                 ];
             },