Skip to content

Commit a9381ab

Browse files
feat: system-setting
1 parent ba0dcf6 commit a9381ab

File tree

21 files changed

+386
-363
lines changed

21 files changed

+386
-363
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

ui/src/layout/components/sidebar/SidebarItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const menuIcon = computed(() => {
8888
}
8989
}
9090
:deep(.el-sub-menu__title) {
91-
padding: 13px 12px 13px 16px !important;
91+
padding: 13px 12px 13px 10px !important;
9292
&:hover {
9393
background: none;
9494
color: var(--el-color-primary);

ui/src/router/modules/system.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const systemRouter = {
4646
component: () => import('@/views/role/index.vue'),
4747
},
4848
{
49-
path:'/system/setting',
49+
path: '/system/setting',
5050
name: 'setting',
5151
meta: {
5252
icon: 'app-setting',
@@ -58,13 +58,13 @@ const systemRouter = {
5858
},
5959
children: [
6060
{
61-
path: '/system/theme',
61+
path: '/system/setting/theme',
6262
name: 'theme',
6363
meta: {
6464
title: 'views.system.theme.title',
65-
activeMenu: '/setting',
66-
parentPath: '/setting',
67-
parentName: 'setting',
65+
activeMenu: '/system',
66+
parentPath: '/system',
67+
parentName: 'system',
6868
//permission: new ComplexPermission(['ADMIN'], ['x-pack'], 'AND')
6969
},
7070
component: () => import('@/views/theme/index.vue'),
@@ -74,27 +74,27 @@ const systemRouter = {
7474
name: 'authentication',
7575
meta: {
7676
title: 'views.system.authentication.title',
77-
activeMenu: '/setting',
78-
parentPath: '/setting',
79-
parentName: 'setting',
77+
activeMenu: '/system',
78+
parentPath: '/system',
79+
parentName: 'system',
8080
//permission: new ComplexPermission(['ADMIN'], ['x-pack'], 'AND')
8181
},
82-
component: () => import('@/views/authentication/index.vue')
82+
component: () => import('@/views/authentication/index.vue'),
8383
},
8484
{
8585
path: '/system/email',
8686
name: 'email',
8787
meta: {
8888
title: 'views.system.email.title',
89-
activeMenu: '/setting',
90-
parentPath: '/setting',
91-
parentName: 'setting',
89+
activeMenu: '/system',
90+
parentPath: '/system',
91+
parentName: 'system',
9292
//permission: new Role('ADMIN')
9393
},
94-
component: () => import('@/views/email/index.vue')
95-
}
96-
]
97-
}
94+
component: () => import('@/views/email/index.vue'),
95+
},
96+
],
97+
},
9898
],
9999
}
100100

ui/src/stores/modules/theme.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineStore } from 'pinia'
22
import { cloneDeep } from 'lodash'
33
import { useElementPlusTheme } from 'use-element-plus-theme'
4-
import ThemeApi from '@/api/systemSettings/theme'
4+
import ThemeApi from '@/api/system-settings/theme'
55
import type {Ref} from "vue";
66
export interface themeStateTypes {
77
themeInfo: any

ui/src/stores/modules/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { type Ref } from 'vue'
33
import type { User } from '@/api/type/user'
44
import UserApi from '@/api/user/user'
55
import LoginApi from '@/api/user/login'
6-
import { cloneDeep } from 'lodash'
7-
import ThemeApi from '@/api/systemSettings/theme'
6+
import {cloneDeep} from 'lodash'
7+
import ThemeApi from '@/api/system-settings/theme'
88
// import { defaultPlatformSetting } from '@/utils/theme'
99
import { useLocalStorage } from '@vueuse/core'
1010
import { localeConfigKey, getBrowserLang } from '@/locales/index'

ui/src/styles/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,10 @@ h5 {
395395
background: var(--el-color-success);
396396
}
397397

398+
.layout-bg {
399+
background: var(--app-layout-bg-color);
400+
}
401+
398402
/*
399403
标题前带竖线样式
400404
*/

ui/src/styles/component.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,26 @@
150150
padding: calc(var(--app-base-px) + 4px) calc(var(--app-base-px) * 2);
151151
}
152152
}
153+
154+
// radio-button-group
155+
.app-radio-button-group {
156+
border: 1px solid var(--app-border-color-dark);
157+
border-radius: var(--el-border-radius-base);
158+
.el-radio-button {
159+
padding: 3px;
160+
}
161+
.el-radio-button__inner {
162+
border: none !important;
163+
border-radius: var(--el-border-radius-base) !important;
164+
padding: 5px 8px;
165+
font-weight: 400;
166+
}
167+
.el-radio-button__original-radio:checked + .el-radio-button__inner {
168+
color: var(--el-color-primary) !important;
169+
background: var(--el-color-primary-light-9) !important;
170+
border: none !important;
171+
box-shadow: none !important;
172+
font-weight: 500;
173+
}
174+
}
175+

0 commit comments

Comments
 (0)