From 0f4e8804eba28adfbedbd78d6cb9db4947f4350f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 25 Apr 2024 13:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E3=80=81?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E4=B8=AD=E5=BF=83=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=AE=B1-=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E5=8F=AF=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/AiTips.vue          |  2 ++
 core/core-frontend/src/layout/index.vue       | 32 +++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/layout/components/AiTips.vue b/core/core-frontend/src/layout/components/AiTips.vue
index b419cb3723..2131f2f83f 100644
--- a/core/core-frontend/src/layout/components/AiTips.vue
+++ b/core/core-frontend/src/layout/components/AiTips.vue
@@ -42,6 +42,7 @@ onMounted(() => {
 .ai-popper-tips {
   z-index: 10001 !important;
   padding: 24px !important;
+  box-shadow: none;
   background: var(--ed-color-primary) !important;
   .ed-popper__arrow::before {
     border: 1px solid var(--ed-color-primary) !important;
@@ -67,6 +68,7 @@ onMounted(() => {
     line-height: 22px;
     text-align: right;
     button {
+      border-color: #ffffff !important;
       font-weight: 500;
       color: rgba(51, 112, 255, 1) !important;
     }
diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index 5e7192e437..f0a0a62280 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -27,22 +27,22 @@ const setCollapse = () => {
     />
     <Header v-else></Header>
     <el-container class="layout-container">
-      <Sidebar
-        v-if="(systemMenu || settingMenu || toolboxMenu) && !isCollapse"
-        class="layout-sidebar"
-      >
-        <div @click="setCollapse" v-if="systemMenu && !isCollapse" class="org-config-center">
-          组织管理中心
-        </div>
-        <Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
-      </Sidebar>
-      <el-aside class="layout-sidebar layout-sidebar-collapse" v-else>
-        <Menu
-          :collapse="isCollapse"
-          :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"
-        ></Menu>
-      </el-aside>
-      <CollapseBar @setCollapse="setCollapse" :isCollapse="isCollapse"></CollapseBar>
+      <template v-if="systemMenu || settingMenu || toolboxMenu">
+        <Sidebar v-if="!isCollapse" class="layout-sidebar">
+          <div @click="setCollapse" v-if="systemMenu && !isCollapse" class="org-config-center">
+            组织管理中心
+          </div>
+          <Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
+        </Sidebar>
+        <el-aside class="layout-sidebar layout-sidebar-collapse" v-else>
+          <Menu
+            :collapse="isCollapse"
+            :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"
+          ></Menu>
+        </el-aside>
+        <CollapseBar @setCollapse="setCollapse" :isCollapse="isCollapse"></CollapseBar>
+      </template>
+
       <Main
         class="layout-main"
         :class="{ 'with-sider': systemMenu || settingMenu || toolboxMenu }"