From 1b93bfb698eb586975b111b13aeda96cc3318bf2 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Wed, 9 Aug 2023 14:17:08 +0800
Subject: [PATCH] fix: fix combined avatar render error in two people converse

---
 client/packages/design/components/Avatar/index.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/packages/design/components/Avatar/index.tsx b/client/packages/design/components/Avatar/index.tsx
index dfa981b5..68cf629e 100644
--- a/client/packages/design/components/Avatar/index.tsx
+++ b/client/packages/design/components/Avatar/index.tsx
@@ -47,8 +47,12 @@ const _Avatar: React.FC<AvatarProps> = React.memo((_props) => {
 
   if (_isNumber(props.size)) {
     // 为了支持rem统一管理宽度，将size转换为样式宽度(size类型上不支持rem单位)
-    style.width = px2rem(props.size);
-    style.height = px2rem(props.size);
+    if (!style.width) {
+      style.width = px2rem(props.size);
+    }
+    if (!style.height) {
+      style.height = px2rem(props.size);
+    }
 
     if (typeof style.fontSize === 'undefined') {
       // 如果props.size是数字且没有指定文字大小