- {t(
- collapsed.value
- ? element?.meta?.collapsedLocale || element?.meta?.locale || ''
- : element?.meta?.locale || ''
+ {collapsed.value ? (
+
+ {t(element?.meta?.collapsedLocale || element?.meta?.locale || '')}
+
+ ) : (
+ t(element?.meta?.locale || '')
)}
{xPack.value
? orgTrigger(element, menuSwitchOrgVisible, () => (
@@ -454,10 +456,12 @@
) : (
goto(element)}>
- {t(
- collapsed.value
- ? element?.meta?.collapsedLocale || element?.meta?.locale || ''
- : element?.meta?.locale || ''
+ {collapsed.value ? (
+
+ {t(element?.meta?.collapsedLocale || element?.meta?.locale || '')}
+
+ ) : (
+ t(element?.meta?.locale || '')
)}
);
@@ -475,10 +479,12 @@
v-slots={{
icon,
title: () =>
- h(
- 'div',
- t(collapsed.value ? element?.meta?.collapsedLocale || '' : element?.meta?.locale || '')
- ),
+ h('div', {
+ innerHTML: t(
+ collapsed.value ? element?.meta?.collapsedLocale || '' : element?.meta?.locale || ''
+ ),
+ class: collapsed.value ? 'text-[12px] leading-[16px]' : '',
+ }),
}}
class={BOTTOM_MENU_LIST.includes(element?.name as string) ? 'arco-menu-inline--bottom' : ''}
>
@@ -506,6 +512,7 @@
selected-keys={selectedKey.value}
auto-open-selected={true}
level-indent={34}
+ class={collapsed.value ? 'arco-menu-collapsed' : ''}
style="height: 100%;width:100%;"
onCollapse={setCollapse}
trigger-props={{
@@ -608,10 +615,12 @@
min-width: 60px;
}
.arco-menu-vertical.arco-menu-collapsed {
+ margin-left: 8px;
width: 56px;
.arco-menu-inner {
@apply !p-0;
+ padding-top: 12px !important;
padding-bottom: 32px !important;
.arco-menu-item,
.arco-menu-inline--bottom {
@@ -649,6 +658,12 @@
}
}
}
+ .arco-menu-collapsed {
+ .arco-menu-collapse-button {
+ top: 12px;
+ right: -16px;
+ }
+ }
.arco-menu-item-tooltip {
@apply hidden;
}
diff --git a/frontend/src/config/settings.json b/frontend/src/config/settings.json
index c4cca775ed..3b2a90fefc 100644
--- a/frontend/src/config/settings.json
+++ b/frontend/src/config/settings.json
@@ -18,4 +18,4 @@
"showTotal": true,
"showJumper": true,
"hideOnSinglePage": false
-}
+}
\ No newline at end of file
diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue
index 89262767fc..d82d8116a3 100644
--- a/frontend/src/layout/default-layout.vue
+++ b/frontend/src/layout/default-layout.vue
@@ -187,7 +187,7 @@
background-color: var(--color-bg-6);
}
}
- :deep(.arco-menu-light) {
+ :deep(.arco-menu-light:not(.arco-menu-collapsed)) {
background-color: transparent !important;
.arco-menu-item {
:hover {
diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts
index 5edc70a880..058a341750 100644
--- a/frontend/src/locale/en-US/index.ts
+++ b/frontend/src/locale/en-US/index.ts
@@ -66,7 +66,6 @@ export default {
'menu.settings': 'Settings',
'menu.settingsShort': 'System',
'menu.settings.system': 'System',
- 'menu.settings.systemManagement': 'System Management',
'menu.settings.system.usergroup': 'User Group',
'menu.settings.system.authorizedManagement': 'Authorized',
'menu.settings.system.pluginManager': 'Plugin',
@@ -78,7 +77,6 @@ export default {
'menu.settings.system.parameter': 'System Parameter',
'menu.settings.system.log': 'Log',
'menu.settings.organization': 'Organization',
- 'menu.settings.organizationManagement': 'Organization Management',
'menu.settings.organization.member': 'Member',
'menu.settings.organization.userGroup': 'User Group',
'menu.settings.organization.project': 'Project',
diff --git a/frontend/src/locale/zh-CN/index.ts b/frontend/src/locale/zh-CN/index.ts
index a7f725e50a..7bfac28378 100644
--- a/frontend/src/locale/zh-CN/index.ts
+++ b/frontend/src/locale/zh-CN/index.ts
@@ -70,7 +70,6 @@ export default {
'menu.settings': '系统设置',
'menu.settingsShort': '系统',
'menu.settings.system': '系统',
- 'menu.settings.systemManagement': '系统管理',
'menu.settings.system.user': '用户',
'menu.settings.system.usergroup': '用户组',
'menu.settings.system.authorizedManagement': '授权',
@@ -82,7 +81,6 @@ export default {
'menu.settings.system.parameter': '系统参数',
'menu.settings.system.log': '日志',
'menu.settings.organization': '组织',
- 'menu.settings.organizationManagement': '组织管理',
'menu.settings.organization.member': '成员',
'menu.settings.organization.userGroup': '用户组',
'menu.settings.organization.project': '项目',
diff --git a/frontend/src/router/routes/modules/apiTest.ts b/frontend/src/router/routes/modules/apiTest.ts
index 368778c901..67e57619f3 100644
--- a/frontend/src/router/routes/modules/apiTest.ts
+++ b/frontend/src/router/routes/modules/apiTest.ts
@@ -11,7 +11,7 @@ const ApiTest: AppRouteRecordRaw = {
meta: {
locale: 'menu.apiTest',
collapsedLocale: 'menu.apiTestShort',
- icon: 'icon-icon_api-test-filled1',
+ icon: 'icon-icon_api-test-filled2',
order: 4,
hideChildrenInMenu: true,
roles: [
diff --git a/frontend/src/router/routes/modules/setting.ts b/frontend/src/router/routes/modules/setting.ts
index 2982fc907a..cfda889fbf 100644
--- a/frontend/src/router/routes/modules/setting.ts
+++ b/frontend/src/router/routes/modules/setting.ts
@@ -40,7 +40,6 @@ const Setting: AppRouteRecordRaw = {
component: null,
meta: {
locale: 'menu.settings.system',
- collapsedLocale: 'menu.settings.systemManagement',
roles: [
'SYSTEM_USER:READ',
'SYSTEM_USER_ROLE:READ',
@@ -184,7 +183,6 @@ const Setting: AppRouteRecordRaw = {
component: null,
meta: {
locale: 'menu.settings.organization',
- collapsedLocale: 'menu.settings.organizationManagement',
roles: [
'ORGANIZATION_MEMBER:READ',
'ORGANIZATION_USER_ROLE:READ',