Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
e821f4c7
Unverified
Commit
e821f4c7
authored
Jan 02, 2021
by
无木成林
Committed by
GitHub
Jan 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf(menu): mixSideTrigger setting (#155)
parent
af55511b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
5 deletions
+49
-5
menuEnum.ts
src/enums/menuEnum.ts
+5
-0
SettingDrawer.tsx
src/layouts/default/setting/SettingDrawer.tsx
+10
-0
enum.ts
src/layouts/default/setting/enum.ts
+19
-1
handler.ts
src/layouts/default/setting/handler.ts
+3
-0
setting.ts
src/locales/lang/en/layout/setting.ts
+4
-0
setting.ts
src/locales/lang/zh_CN/layout/setting.ts
+4
-0
projectSetting.ts
src/settings/projectSetting.ts
+2
-2
config.d.ts
src/types/config.d.ts
+2
-2
No files found.
src/enums/menuEnum.ts
View file @
e821f4c7
...
@@ -43,3 +43,8 @@ export enum TopMenuAlignEnum {
...
@@ -43,3 +43,8 @@ export enum TopMenuAlignEnum {
START
=
'
start
'
,
START
=
'
start
'
,
END
=
'
end
'
,
END
=
'
end
'
,
}
}
export
enum
MixSidebarTriggerEnum
{
HOVER
=
'
hover
'
,
CLICK
=
'
click
'
,
}
src/layouts/default/setting/SettingDrawer.tsx
View file @
e821f4c7
...
@@ -28,6 +28,7 @@ import {
...
@@ -28,6 +28,7 @@ import {
getMenuTriggerOptions
,
getMenuTriggerOptions
,
routerTransitionOptions
,
routerTransitionOptions
,
menuTypeList
,
menuTypeList
,
mixSidebarTriggerOptions
,
}
from
'
./enum
'
;
}
from
'
./enum
'
;
import
{
HEADER_PRESET_BG_COLOR_LIST
,
SIDE_BAR_BG_COLOR_LIST
}
from
'
/@/settings/colorSetting
'
;
import
{
HEADER_PRESET_BG_COLOR_LIST
,
SIDE_BAR_BG_COLOR_LIST
}
from
'
/@/settings/colorSetting
'
;
...
@@ -73,6 +74,7 @@ export default defineComponent({
...
@@ -73,6 +74,7 @@ export default defineComponent({
getSplit
,
getSplit
,
getIsMixSidebar
,
getIsMixSidebar
,
getCloseMixSidebarOnChange
,
getCloseMixSidebarOnChange
,
getMixSideTrigger
,
}
=
useMenuSetting
();
}
=
useMenuSetting
();
const
{
const
{
...
@@ -115,6 +117,14 @@ export default defineComponent({
...
@@ -115,6 +117,14 @@ export default defineComponent({
def=
{
unref
(
getCloseMixSidebarOnChange
)
}
def=
{
unref
(
getCloseMixSidebarOnChange
)
}
disabled=
{
!
unref
(
getIsMixSidebar
)
}
disabled=
{
!
unref
(
getIsMixSidebar
)
}
/>
/>
<
SelectItem
title=
{
t
(
'
layout.setting.mixSidebarTrigger
'
)
}
event=
{
HandlerEnum
.
MENU_TRIGGER_MIX_SIDEBAR
}
def=
{
unref
(
getMixSideTrigger
)
}
options=
{
mixSidebarTriggerOptions
}
disabled=
{
!
unref
(
getIsMixSidebar
)
}
/>
</>
</>
);
);
}
}
...
...
src/layouts/default/setting/enum.ts
View file @
e821f4c7
import
{
ContentEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
ContentEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
MenuModeEnum
,
MenuTypeEnum
,
TopMenuAlignEnum
,
TriggerEnum
}
from
'
/@/enums/menuEnum
'
;
import
{
MenuModeEnum
,
MenuTypeEnum
,
TopMenuAlignEnum
,
TriggerEnum
,
MixSidebarTriggerEnum
,
}
from
'
/@/enums/menuEnum
'
;
import
{
useI18n
}
from
'
/@/hooks/web/useI18n
'
;
import
{
useI18n
}
from
'
/@/hooks/web/useI18n
'
;
...
@@ -20,6 +26,7 @@ export enum HandlerEnum {
...
@@ -20,6 +26,7 @@ export enum HandlerEnum {
MENU_SPLIT
,
MENU_SPLIT
,
MENU_FIXED
,
MENU_FIXED
,
MENU_CLOSE_MIX_SIDEBAR_ON_CHANGE
,
MENU_CLOSE_MIX_SIDEBAR_ON_CHANGE
,
MENU_TRIGGER_MIX_SIDEBAR
,
// header
// header
HEADER_SHOW
,
HEADER_SHOW
,
...
@@ -132,3 +139,14 @@ export const menuTypeList = [
...
@@ -132,3 +139,14 @@ export const menuTypeList = [
type
:
MenuTypeEnum
.
MIX_SIDEBAR
,
type
:
MenuTypeEnum
.
MIX_SIDEBAR
,
},
},
];
];
export
const
mixSidebarTriggerOptions
=
[
{
value
:
MixSidebarTriggerEnum
.
HOVER
,
label
:
t
(
'
layout.setting.triggerHover
'
),
},
{
value
:
MixSidebarTriggerEnum
.
CLICK
,
label
:
t
(
'
layout.setting.triggerClick
'
),
},
];
src/layouts/default/setting/handler.ts
View file @
e821f4c7
...
@@ -67,6 +67,9 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
...
@@ -67,6 +67,9 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
case
HandlerEnum
.
MENU_FIXED
:
case
HandlerEnum
.
MENU_FIXED
:
return
{
menuSetting
:
{
fixed
:
value
}
};
return
{
menuSetting
:
{
fixed
:
value
}
};
case
HandlerEnum
.
MENU_TRIGGER_MIX_SIDEBAR
:
return
{
menuSetting
:
{
mixSideTrigger
:
value
}
};
// ============transition==================
// ============transition==================
case
HandlerEnum
.
OPEN_PAGE_LOADING
:
case
HandlerEnum
.
OPEN_PAGE_LOADING
:
appStore
.
commitPageLoadingState
(
false
);
appStore
.
commitPageLoadingState
(
false
);
...
...
src/locales/lang/en/layout/setting.ts
View file @
e821f4c7
...
@@ -73,4 +73,8 @@ export default {
...
@@ -73,4 +73,8 @@ export default {
fixedHeader
:
'
Fixed header
'
,
fixedHeader
:
'
Fixed header
'
,
fixedSideBar
:
'
Fixed Sidebar
'
,
fixedSideBar
:
'
Fixed Sidebar
'
,
mixSidebarTrigger
:
'
Mixed menu Trigger
'
,
triggerHover
:
'
Hover
'
,
triggerClick
:
'
Click
'
,
};
};
src/locales/lang/zh_CN/layout/setting.ts
View file @
e821f4c7
...
@@ -72,4 +72,8 @@ export default {
...
@@ -72,4 +72,8 @@ export default {
fixedHeader
:
'
固定header
'
,
fixedHeader
:
'
固定header
'
,
fixedSideBar
:
'
固定Sidebar
'
,
fixedSideBar
:
'
固定Sidebar
'
,
mixSidebarTrigger
:
'
混合菜单触发方式
'
,
triggerHover
:
'
悬停
'
,
triggerClick
:
'
点击
'
,
};
};
src/settings/projectSetting.ts
View file @
e821f4c7
import
type
{
ProjectConfig
}
from
'
/@/types/config
'
;
import
type
{
ProjectConfig
}
from
'
/@/types/config
'
;
import
{
MenuTypeEnum
,
MenuModeEnum
,
TriggerEnum
}
from
'
/@/enums/menuEnum
'
;
import
{
MenuTypeEnum
,
MenuModeEnum
,
TriggerEnum
,
MixSidebarTriggerEnum
}
from
'
/@/enums/menuEnum
'
;
import
{
CacheTypeEnum
}
from
'
/@/enums/cacheEnum
'
;
import
{
CacheTypeEnum
}
from
'
/@/enums/cacheEnum
'
;
import
{
ContentEnum
,
PermissionModeEnum
,
ThemeEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
ContentEnum
,
PermissionModeEnum
,
ThemeEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
primaryColor
}
from
'
../../build/config/lessModifyVars
'
;
import
{
primaryColor
}
from
'
../../build/config/lessModifyVars
'
;
...
@@ -109,7 +109,7 @@ const setting: ProjectConfig = {
...
@@ -109,7 +109,7 @@ const setting: ProjectConfig = {
// Switch page to close menu
// Switch page to close menu
closeMixSidebarOnChange
:
false
,
closeMixSidebarOnChange
:
false
,
// Module opening method ‘click’ |'hover'
// Module opening method ‘click’ |'hover'
mixSideTrigger
:
'
click
'
,
mixSideTrigger
:
MixSidebarTriggerEnum
.
CLICK
,
},
},
// Multi-label
// Multi-label
...
...
src/types/config.d.ts
View file @
e821f4c7
import
{
MenuTypeEnum
,
MenuModeEnum
,
TriggerEnum
}
from
'
/@/enums/menuEnum
'
;
import
{
MenuTypeEnum
,
MenuModeEnum
,
TriggerEnum
,
MixSidebarTriggerEnum
}
from
'
/@/enums/menuEnum
'
;
import
{
ContentEnum
,
PermissionModeEnum
,
ThemeEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
ContentEnum
,
PermissionModeEnum
,
ThemeEnum
,
RouterTransitionEnum
}
from
'
/@/enums/appEnum
'
;
import
{
CacheTypeEnum
}
from
'
/@/enums/cacheEnum
'
;
import
{
CacheTypeEnum
}
from
'
/@/enums/cacheEnum
'
;
import
type
{
LocaleType
}
from
'
/@/locales/types
'
;
import
type
{
LocaleType
}
from
'
/@/locales/types
'
;
...
@@ -20,7 +20,7 @@ export interface MenuSetting {
...
@@ -20,7 +20,7 @@ export interface MenuSetting {
accordion
:
boolean
;
accordion
:
boolean
;
closeMixSidebarOnChange
:
boolean
;
closeMixSidebarOnChange
:
boolean
;
collapsedShowTitle
:
boolean
;
collapsedShowTitle
:
boolean
;
mixSideTrigger
:
'
click
'
|
'
hover
'
;
mixSideTrigger
:
MixSidebarTriggerEnum
;
}
}
export
interface
MultiTabsSetting
{
export
interface
MultiTabsSetting
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment