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 @@ - + @@ -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(); const innerProps = ref(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 @@ -
+
@@ -15,12 +21,16 @@ - + 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',