From d7612043b986df06e469aadca68070cecd926738 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 18 Jul 2024 18:13:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/layout/components/app-header/index.vue       |  8 ++++++++
 .../components/top-bar/avatar/AboutDialog.vue       | 13 +++++--------
 ui/src/layout/components/top-bar/index.vue          | 11 -----------
 ui/src/layout/layout-template/AppLayout.vue         |  4 +++-
 ui/src/layout/layout-template/SystemLayout.vue      |  4 +++-
 ui/src/layout/layout-template/index.scss            |  3 +++
 ui/src/utils/theme.ts                               |  5 -----
 7 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/ui/src/layout/components/app-header/index.vue b/ui/src/layout/components/app-header/index.vue
index 12f45ae14..2bb2ca148 100644
--- a/ui/src/layout/components/app-header/index.vue
+++ b/ui/src/layout/components/app-header/index.vue
@@ -1,5 +1,13 @@
 <template>
   <div class="app-header" :class="!isDefaultTheme ? 'custom-header' : ''">
+    <el-alert
+      v-if="user.isExpire()"
+      title="未上传 License 或 License 已过期。"
+      type="warning"
+      class="border-b"
+      show-icon
+      :closable="false"
+    />
     <TopBar />
   </div>
 </template>
diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index 58b93a076..197fc55ca 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -17,7 +17,7 @@
         <span class="label">ISV</span><span>{{ licenseInfo?.isv || '-' }}</span>
       </div>
       <div class="flex">
-        <span class="label">过期时间</span>
+        <span class="label">到期时间</span>
         <span
           >{{ licenseInfo?.expired || '-' }}
           <span class="danger" v-if="licenseInfo?.expired && fromNowDate(licenseInfo?.expired)"
@@ -28,8 +28,8 @@
       <div class="flex">
         <span class="label">版本</span
         ><span>{{
-          licenseInfo?.edition
-            ? EditionType[licenseInfo.edition as keyof typeof EditionType]
+          user.isXPack
+            ? EditionType[licenseInfo.edition as keyof typeof EditionType] || '专业版'
             : '社区版'
         }}</span>
       </div>
@@ -44,10 +44,7 @@
         <span class="label">备注</span><span>{{ licenseInfo?.remark || '-' }}</span>
       </div>
 
-      <div
-        class="mt-16 flex align-center"
-        v-hasPermission="new ComplexPermission(['ADMIN'], ['x-pack'], 'AND')"
-      >
+      <div class="mt-16 flex align-center" v-if="user.isXPack">
         <el-upload
           ref="uploadRef"
           action="#"
@@ -80,7 +77,7 @@ const loading = ref(false)
 const licenseInfo = ref<any>(null)
 
 const open = () => {
-  if (user.isEnterprise()) {
+  if (user.isXPack) {
     getLicenseInfo()
   }
 
diff --git a/ui/src/layout/components/top-bar/index.vue b/ui/src/layout/components/top-bar/index.vue
index 3f00b671c..2729cdacf 100644
--- a/ui/src/layout/components/top-bar/index.vue
+++ b/ui/src/layout/components/top-bar/index.vue
@@ -1,13 +1,5 @@
 ·
 <template>
-  <el-alert
-    v-if="user.isExpire()"
-    title="未上传 License 或 License 已过期。"
-    type="warning"
-    class="border-b"
-    show-icon
-    :closable="false"
-  />
   <div class="top-bar-container border-b flex-between">
     <div class="flex-center h-full">
       <div class="app-title-container cursor" @click="router.push('/')">
@@ -71,11 +63,8 @@ import Avatar from './avatar/index.vue'
 import { useRouter } from 'vue-router'
 import { langList } from '@/locales/index'
 import { useLocale } from '@/locales/useLocale'
-import useStore from '@/stores'
 const router = useRouter()
 
-const { user } = useStore()
-
 const { changeLocale } = useLocale()
 const changeLang = (lang: string) => {
   changeLocale(lang)
diff --git a/ui/src/layout/layout-template/AppLayout.vue b/ui/src/layout/layout-template/AppLayout.vue
index faa91ee57..71bca0dfa 100644
--- a/ui/src/layout/layout-template/AppLayout.vue
+++ b/ui/src/layout/layout-template/AppLayout.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { AppHeader, AppMain } from '../components'
+import useStore from '@/stores'
+const { user } = useStore()
 </script>
 
 <template>
   <div class="app-layout">
     <AppHeader />
-    <div class="app-main">
+    <div class="app-main" :class="user.isExpire() ? 'isExpire' : ''">
       <AppMain />
     </div>
   </div>
diff --git a/ui/src/layout/layout-template/SystemLayout.vue b/ui/src/layout/layout-template/SystemLayout.vue
index 27ede72ff..46221f3ad 100644
--- a/ui/src/layout/layout-template/SystemLayout.vue
+++ b/ui/src/layout/layout-template/SystemLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-layout">
     <AppHeader />
-    <div class="app-main">
+    <div class="app-main" :class="user.isExpire() ? 'isExpire' : ''">
       <div class="main-layout h-full flex">
         <div class="sidebar-container">
           <Sidebar />
@@ -16,6 +16,8 @@
 
 <script setup lang="ts">
 import { AppHeader, Sidebar, AppMain } from '../components'
+import useStore from '@/stores'
+const { user } = useStore()
 </script>
 <style lang="scss" scoped>
 @import './index.scss';
diff --git a/ui/src/layout/layout-template/index.scss b/ui/src/layout/layout-template/index.scss
index 56bff011c..8dcba6380 100644
--- a/ui/src/layout/layout-template/index.scss
+++ b/ui/src/layout/layout-template/index.scss
@@ -9,6 +9,9 @@
   padding: var(--app-header-height) 0 0 !important;
   box-sizing: border-box;
   overflow: auto;
+  &.isExpire {
+    padding-top: calc(var(--app-header-height) + 40px) !important;
+  }
 }
 
 .sidebar-container {
diff --git a/ui/src/utils/theme.ts b/ui/src/utils/theme.ts
index 51674cbe3..15b1311c5 100644
--- a/ui/src/utils/theme.ts
+++ b/ui/src/utils/theme.ts
@@ -14,11 +14,6 @@ export const themeList = [
     value: '#00B69D',
     loginBackground: 'green'
   },
-  {
-    label: '商务蓝',
-    value: '#4954E6',
-    loginBackground: 'default'
-  },
   {
     label: '神秘紫',
     value: '#7F3BF5',