From 2e4d5fa339613143ba04e31a77c4c68845be98df Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Wed, 24 Jul 2024 12:39:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B5=8C=E5=85=A5?=
 =?UTF-8?q?=E5=BC=8F=E5=8E=86=E5=8F=B2=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/DisplaySettingDialog.vue          | 17 ++++++++++++-----
 .../component/EditAvatarDialog.vue              |  6 ++++--
 ui/src/views/chat/embed/index.vue               |  4 +++-
 ui/src/views/theme/index.vue                    |  6 ++++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ui/src/views/application-overview/component/DisplaySettingDialog.vue b/ui/src/views/application-overview/component/DisplaySettingDialog.vue
index 1ab5882a8..a006ca52b 100644
--- a/ui/src/views/application-overview/component/DisplaySettingDialog.vue
+++ b/ui/src/views/application-overview/component/DisplaySettingDialog.vue
@@ -49,8 +49,14 @@
       </el-form-item>
       <el-form-item label="浮窗入口图标" v-if="user.isEnterprise()">
         <div class="flex mt-8">
-          <div class="border border-r-4 mr-16" style="width: 50px; height: 50px; padding: 8px">
-            <img v-if="imgUrl.float_icon" :src="imgUrl.float_icon" alt="" height="50px" />
+          <div class="border border-r-4 mr-16" style="padding: 8px">
+            <el-image
+              v-if="imgUrl.float_icon"
+              :src="imgUrl.float_icon"
+              alt=""
+              fit="cover"
+              style="width: 50px; height: 50px; display: block"
+            />
             <img v-else src="@/assets/logo/logo.svg" height="50px" />
           </div>
 
@@ -95,7 +101,7 @@ import { useRoute } from 'vue-router'
 import type { FormInstance, FormRules, UploadFiles } from 'element-plus'
 import applicationApi from '@/api/application'
 import applicationXpackApi from '@/api/application-xpack'
-import { MsgSuccess, MsgConfirm } from '@/utils/message'
+import { MsgSuccess, MsgError } from '@/utils/message'
 import { t } from '@/locales'
 import useStore from '@/stores'
 const { user } = useStore()
@@ -167,9 +173,10 @@ const onChange = (file: any, fileList: UploadFiles, attr: string) => {
     // @ts-ignore
     MsgError(t('views.applicationOverview.appInfo.EditAvatarDialog.fileSizeExceeded'))
     return false
+  } else {
+    xpackForm.value[attr] = file.raw
+    imgUrl.value[attr] = URL.createObjectURL(file.raw)
   }
-  xpackForm.value[attr] = file.raw
-  imgUrl.value[attr] = URL.createObjectURL(file.raw)
 }
 
 const open = (data: any) => {
diff --git a/ui/src/views/application-overview/component/EditAvatarDialog.vue b/ui/src/views/application-overview/component/EditAvatarDialog.vue
index 05520eccf..b210df84c 100644
--- a/ui/src/views/application-overview/component/EditAvatarDialog.vue
+++ b/ui/src/views/application-overview/component/EditAvatarDialog.vue
@@ -100,9 +100,11 @@ const onChange = (file: any) => {
     // @ts-ignore
     MsgError(t('views.applicationOverview.appInfo.EditAvatarDialog.fileSizeExceeded'))
     return false
+  } else { 
+    iconFile.value = file
+    fileURL.value = URL.createObjectURL(file.raw)
   }
-  iconFile.value = file
-  fileURL.value = URL.createObjectURL(file.raw)
+
 }
 
 function submit() {
diff --git a/ui/src/views/chat/embed/index.vue b/ui/src/views/chat/embed/index.vue
index 3194cfa14..20f53c16c 100644
--- a/ui/src/views/chat/embed/index.vue
+++ b/ui/src/views/chat/embed/index.vue
@@ -155,7 +155,9 @@ function getAccessToken(token: string) {
   application
     .asyncAppAuthentication(token, loading)
     .then(() => {
-      getAppProfile()
+      setTimeout(() => {
+        getAppProfile()
+      }, 500)
     })
     .catch(() => {
       applicationAvailable.value = false
diff --git a/ui/src/views/theme/index.vue b/ui/src/views/theme/index.vue
index 661ee5d5b..bce4d103a 100644
--- a/ui/src/views/theme/index.vue
+++ b/ui/src/views/theme/index.vue
@@ -181,6 +181,8 @@ const onChange = (file: any, fileList: UploadFiles, attr: string) => {
       // @ts-ignore
       MsgError(`文件大小超过 5M`)
       return false
+    } else {
+      themeForm.value[attr] = file.raw
     }
   } else {
     const isLimit = file?.size / 1024 < 200
@@ -188,10 +190,10 @@ const onChange = (file: any, fileList: UploadFiles, attr: string) => {
       // @ts-ignore
       MsgError(`文件大小超过 200KB`)
       return false
+    } else {
+      themeForm.value[attr] = file.raw
     }
   }
-
-  themeForm.value[attr] = file.raw
 }
 
 function changeThemeHandle(val: string) {