File tree Expand file tree Collapse file tree 2 files changed +25
-25
lines changed Expand file tree Collapse file tree 2 files changed +25
-25
lines changed Original file line number Diff line number Diff line change @@ -6,24 +6,6 @@ import useSettingsStore from '@/store/modules/settings'
6
6
7
7
const settingsStore = useSettingsStore ()
8
8
9
- // 侧边栏主导航当前实际宽度
10
- const mainSidebarActualWidth = computed (() => {
11
- let actualWidth = Number .parseInt (getComputedStyle (document .documentElement ).getPropertyValue (' --g-main-sidebar-width' ))
12
- if ([' head' , ' single' ].includes (settingsStore .settings .menu .mode )) {
13
- actualWidth = 0
14
- }
15
- return ` ${actualWidth }px `
16
- })
17
-
18
- // 侧边栏次导航当前实际宽度
19
- const subSidebarActualWidth = computed (() => {
20
- let actualWidth = Number .parseInt (getComputedStyle (document .documentElement ).getPropertyValue (' --g-sub-sidebar-width' ))
21
- if (settingsStore .settings .menu .subMenuCollapse ) {
22
- actualWidth = 64
23
- }
24
- return ` ${actualWidth }px `
25
- })
26
-
27
9
watch (() => settingsStore .title , () => {
28
10
document .title = import .meta .env .VITE_APP_TITLE
29
11
}, {
@@ -39,12 +21,7 @@ onMounted(() => {
39
21
40
22
<template >
41
23
<Provider >
42
- <RouterView
43
- :style =" {
44
- '--g-main-sidebar-actual-width': mainSidebarActualWidth,
45
- '--g-sub-sidebar-actual-width': subSidebarActualWidth,
46
- }"
47
- />
24
+ <RouterView />
48
25
<SystemInfo />
49
26
</Provider >
50
27
</template >
Original file line number Diff line number Diff line change @@ -16,6 +16,24 @@ import eventBus from '@/utils/eventBus'
16
16
const settingsStore = useSettingsStore ()
17
17
const menuStore = useMenuStore ()
18
18
19
+ // 侧边栏主导航当前实际宽度
20
+ const mainSidebarActualWidth = computed (() => {
21
+ let actualWidth = Number .parseInt (getComputedStyle (document .documentElement ).getPropertyValue (' --g-main-sidebar-width' ))
22
+ if ([' head' , ' single' ].includes (settingsStore .settings .menu .mode )) {
23
+ actualWidth = 0
24
+ }
25
+ return ` ${actualWidth }px `
26
+ })
27
+
28
+ // 侧边栏次导航当前实际宽度
29
+ const subSidebarActualWidth = computed (() => {
30
+ let actualWidth = Number .parseInt (getComputedStyle (document .documentElement ).getPropertyValue (' --g-sub-sidebar-width' ))
31
+ if (settingsStore .settings .menu .subMenuCollapse ) {
32
+ actualWidth = 64
33
+ }
34
+ return ` ${actualWidth }px `
35
+ })
36
+
19
37
const enableToolbar = computed (() => {
20
38
return ! (settingsStore .settings .menu .mode === ' head' && ! settingsStore .settings .toolbar .previewWindows )
21
39
})
@@ -36,7 +54,12 @@ const enableAppSetting = import.meta.env.VITE_APP_SETTING === 'true'
36
54
</script >
37
55
38
56
<template >
39
- <div class =" layout" >
57
+ <div
58
+ class =" layout" :style =" {
59
+ '--g-main-sidebar-actual-width': mainSidebarActualWidth,
60
+ '--g-sub-sidebar-actual-width': subSidebarActualWidth,
61
+ }"
62
+ >
40
63
<div id =" app-main" >
41
64
<Header />
42
65
<div class =" wrapper" >
You can’t perform that action at this time.
0 commit comments