From 287cc34535e6ea754a4ae00186c431b7e17ac8dd Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Fri, 26 Apr 2024 14:17:03 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E8=B0=83=E6=95=B4=E5=92=8C=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-expire-alert/index.vue}        |  0
 frontend/src/components/pure/ms-card/index.vue |  2 +-
 frontend/src/layout/default-layout.vue         |  7 ++++---
 frontend/src/layout/page-layout.vue            | 18 ++++++++++++++----
 .../src/views/bug-management/locale/en-US.ts   |  1 +
 5 files changed, 20 insertions(+), 8 deletions(-)
 rename frontend/src/{views/setting/system/authorizedManagement/components/expireAlert.vue => components/business/ms-expire-alert/index.vue} (100%)

diff --git a/frontend/src/views/setting/system/authorizedManagement/components/expireAlert.vue b/frontend/src/components/business/ms-expire-alert/index.vue
similarity index 100%
rename from frontend/src/views/setting/system/authorizedManagement/components/expireAlert.vue
rename to frontend/src/components/business/ms-expire-alert/index.vue
diff --git a/frontend/src/components/pure/ms-card/index.vue b/frontend/src/components/pure/ms-card/index.vue
index c559f45719..cac09626c5 100644
--- a/frontend/src/components/pure/ms-card/index.vue
+++ b/frontend/src/components/pure/ms-card/index.vue
@@ -147,7 +147,7 @@
   // TODO：卡片高度调整，写上数值的注释
   const cardOverHeight = computed(() => {
     const contentPadding = 32; // 16+16 上下内容边距
-    const navbarHeight = 56; // 顶部导航高度
+    const navbarHeight = 54; // 顶部导航高度
     const layoutContentPaddingBottom = 16; // 卡片到底部距离
     if (isFullScreen.value) {
       return 106;
diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue
index f13b1f31f3..bd2cdbc6db 100644
--- a/frontend/src/layout/default-layout.vue
+++ b/frontend/src/layout/default-layout.vue
@@ -41,7 +41,7 @@
           </a-drawer>
           <a-layout class="layout-content" :style="paddingStyle">
             <a-spin :loading="appStore.loading" :tip="appStore.loadingTip">
-              <a-scrollbar class="flex h-[calc(100vh-56px)] flex-col gap-[8px] overflow-auto">
+              <a-scrollbar class="flex h-[calc(100vh-54px)] flex-col gap-[8px] overflow-auto">
                 <MsBreadCrumb />
                 <a-layout-content>
                   <slot name="page">
@@ -68,13 +68,14 @@
   import Footer from '@/components/pure/footer/index.vue';
   import NavBar from '@/components/pure/navbar/index.vue';
   import MsBreadCrumb from '@/components/business/ms-breadcrumb/index.vue';
+  import ExpireAlert from '@/components/business/ms-expire-alert/index.vue';
   import MsMenu from '@/components/business/ms-menu/index.vue';
   import PageLayout from './page-layout.vue';
-  import ExpireAlert from '@/views/setting/system/authorizedManagement/components/expireAlert.vue';
 
   import { GetTitleImgUrl } from '@/api/requrls/setting/config';
   import usePermission from '@/hooks/usePermission';
   import { useAppStore, useUserStore } from '@/store';
+  import useLicenseStore from '@/store/modules/setting/license';
 
   interface Props {
     isPreview?: boolean;
@@ -86,7 +87,7 @@
   const props = defineProps<Props>();
 
   const innerProps = ref<Props>(props);
-
+  const licenseStore = useLicenseStore();
   watch(
     () => props.logo,
     () => {
diff --git a/frontend/src/layout/page-layout.vue b/frontend/src/layout/page-layout.vue
index 97a3a463d8..81843f7157 100644
--- a/frontend/src/layout/page-layout.vue
+++ b/frontend/src/layout/page-layout.vue
@@ -2,7 +2,13 @@
   <router-view v-slot="{ Component, route }">
     <transition name="fade" mode="out-in" appear>
       <!-- transition内必须有且只有一个根元素，不然会导致二级路由的组件无法渲染 -->
-      <div v-show="true" class="page-content">
+      <div
+        v-show="true"
+        class="page-content"
+        :class="[
+          licenseStore.expiredDuring && route.path.includes('/setting/system') ? 'h-[calc(100%-48px)]' : 'h-full',
+        ]"
+      >
         <!-- TODO 实验性组件，以后优化 -->
         <Suspense v-if="!route.meta.isCache">
           <component :is="Component" :key="route.fullPath" />
@@ -15,12 +21,16 @@
   </router-view>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+  import useLicenseStore from '@/store/modules/setting/license';
+
+  const licenseStore = useLicenseStore();
+</script>
 
 <style lang="less" scoped>
   .page-content {
-    @apply h-full overflow-y-auto;
-
     min-height: 500px;
+    @apply overflow-y-auto;
+    .ms-scroll-bar();
   }
 </style>
diff --git a/frontend/src/views/bug-management/locale/en-US.ts b/frontend/src/views/bug-management/locale/en-US.ts
index 51e36c854f..4edf2f29b6 100644
--- a/frontend/src/views/bug-management/locale/en-US.ts
+++ b/frontend/src/views/bug-management/locale/en-US.ts
@@ -1,6 +1,7 @@
 export default {
   bugManagement: {
     createBug: 'Create Bug',
+    copyBug: 'Copy Bug',
     syncBug: 'Sync Bug',
     ID: 'ID',
     project: 'Project',