From ab9b806c14e966b70ef52371e8ca6ab48d2febb3 Mon Sep 17 00:00:00 2001
From: dongwu <3767812@qq.com>
Date: Fri, 6 Sep 2024 12:32:17 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E6=97=A0avatar=E6=97=B6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8displayName=E4=BB=A3=E6=9B=BF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/App.vue                      | 2 +-
 package-lock.json                     | 4 ++--
 packages/components/avatar.vue        | 8 ++++++--
 packages/components/contact.vue       | 2 +-
 packages/components/index.vue         | 3 ++-
 packages/components/message/basic.vue | 1 +
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index 2183dd5..413f8d5 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -1027,7 +1027,7 @@ WebSocket.onmessage = function(event) {
   };
   IMUI.appendMessage(data);
 };
-  
+
 }`
       "
     ></pre>
diff --git a/package-lock.json b/package-lock.json
index 269f020..5d447f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "lemon-imui-rx",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "lemon-imui-rx",
-      "version": "1.9.1",
+      "version": "2.0.0",
       "license": "MIT",
       "dependencies": {
         "chatarea": "^4.5.5"
diff --git a/packages/components/avatar.vue b/packages/components/avatar.vue
index 268e57e..d720fe8 100644
--- a/packages/components/avatar.vue
+++ b/packages/components/avatar.vue
@@ -18,6 +18,9 @@ export default {
       type: Number,
       default: 32,
     },
+    name: {
+      type: String
+    }
   },
   data() {
     return {
@@ -31,8 +34,8 @@ export default {
         class={["lemon-avatar", { "lemon-avatar--circle": this.circle }]}
         on-click={e => this.$emit("click", e)}
       >
-        {(this.imageFinishLoad || !this.src) && <i class={this.icon} />}
-        <img src={this.src} onLoad={this._handleLoad} />
+        {(this.imageFinishLoad || !this.src) && (this.name || '')}
+        <img v-show={this.src} src={this.src} onLoad={this._handleLoad} />
       </span>
     );
   },
@@ -43,6 +46,7 @@ export default {
         width: size,
         height: size,
         lineHeight: size,
+        color:'#ffffff',
         fontSize: `${this.size / 2}px`,
       };
     },
diff --git a/packages/components/contact.vue b/packages/components/contact.vue
index b432919..221c9c7 100644
--- a/packages/components/contact.vue
+++ b/packages/components/contact.vue
@@ -52,7 +52,7 @@ export default {
           count={!this.simple ? contact.unread : 0}
           class="lemon-contact__avatar"
         >
-          <lemon-avatar size={40} src={contact.avatar} />
+          <lemon-avatar size={40} src={contact.avatar} name={contact.displayName}/>
         </lemon-badge>,
         <div class="lemon-contact__inner">
           <p class="lemon-contact__label">
diff --git a/packages/components/index.vue b/packages/components/index.vue
index 7de3157..fc75c4f 100644
--- a/packages/components/index.vue
+++ b/packages/components/index.vue
@@ -325,6 +325,7 @@ export default {
               }}
               class="lemon-menu__avatar"
               src={this.user.avatar}
+              name={this.user.displayName}
             />
           }
           {menuItem.top}
@@ -560,7 +561,7 @@ export default {
           {useScopedSlot(
             this.$scopedSlots["contact-info"],
             <div class="lemon-contact-info">
-              <lemon-avatar src={curact.avatar} size={90} />
+              <lemon-avatar src={curact.avatar} size={90} name={curact.displayName}/>
               <h4>{curact.displayName}</h4>
               <lemon-button
                 on-click={() => {
diff --git a/packages/components/message/basic.vue b/packages/components/message/basic.vue
index 111a1dc..296fc6a 100644
--- a/packages/components/message/basic.vue
+++ b/packages/components/message/basic.vue
@@ -51,6 +51,7 @@ export default {
             on-click={e => {
               this._emitClick(e, "avatar");
             }}
+            name={fromUser.displayName}
           />
         </div>
         <div class="lemon-message__inner">
-- 
Gitee