Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Bug 终结者
vue-vben-admin
提交
57615038
V
vue-vben-admin
项目概览
Bug 终结者
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
57615038
编写于
2月 13, 2021
作者:
V
vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: update layout
上级
b335e751
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
37 deletion
+22
-37
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
src/components/Application/src/AppLocalePicker.vue
src/components/Application/src/AppLocalePicker.vue
+1
-0
src/layouts/default/feature/index.vue
src/layouts/default/feature/index.vue
+1
-4
src/layouts/default/header/index.less
src/layouts/default/header/index.less
+8
-7
src/layouts/default/header/index.vue
src/layouts/default/header/index.vue
+11
-3
src/layouts/default/setting/index.vue
src/layouts/default/setting/index.vue
+0
-23
未找到文件。
CHANGELOG.zh_CN.md
浏览文件 @
57615038
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
### ⚡ Performance Improvements
### ⚡ Performance Improvements
-
调整获取用户信息接口返回值为数组格式
-
调整获取用户信息接口返回值为数组格式
-
将 error-log 列表固定为系统路由
### 🐛 Bug Fixes
### 🐛 Bug Fixes
...
...
src/components/Application/src/AppLocalePicker.vue
浏览文件 @
57615038
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
-->
-->
<
template
>
<
template
>
<Dropdown
<Dropdown
placement=
"bottomCenter"
:trigger=
"['click']"
:trigger=
"['click']"
:dropMenuList=
"localeList"
:dropMenuList=
"localeList"
:selectedKeys=
"selectedKeys"
:selectedKeys=
"selectedKeys"
...
...
src/layouts/default/feature/index.vue
浏览文件 @
57615038
<
template
>
<
template
>
<LayoutLockPage
/>
<LayoutLockPage
/>
<BackTop
v-if=
"getUseOpenBackTop"
:target=
"getTarget"
/>
<BackTop
v-if=
"getUseOpenBackTop"
:target=
"getTarget"
/>
<SettingDrawer
v-if=
"getShowSettingButton"
/>
</
template
>
</
template
>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
{
defineComponent
}
from
'
vue
'
;
...
@@ -14,15 +13,13 @@
...
@@ -14,15 +13,13 @@
components
:
{
components
:
{
BackTop
,
BackTop
,
LayoutLockPage
:
createAsyncComponent
(()
=>
import
(
'
/@/views/sys/lock/index.vue
'
)),
LayoutLockPage
:
createAsyncComponent
(()
=>
import
(
'
/@/views/sys/lock/index.vue
'
)),
SettingDrawer
:
createAsyncComponent
(()
=>
import
(
'
/@/layouts/default/setting/index.vue
'
)),
},
},
setup
()
{
setup
()
{
const
{
getUseOpenBackTop
,
getShowSettingButton
}
=
useRootSetting
();
const
{
getUseOpenBackTop
}
=
useRootSetting
();
return
{
return
{
getTarget
:
()
=>
document
.
body
,
getTarget
:
()
=>
document
.
body
,
getUseOpenBackTop
,
getUseOpenBackTop
,
getShowSettingButton
,
};
};
},
},
});
});
...
...
src/layouts/default/header/index.less
浏览文件 @
57615038
@header-trigger-prefix-cls: ~'@{namespace}-layout-header-trigger';
@header-trigger-prefix-cls: ~'@{namespace}-layout-header-trigger';
@header-prefix-cls: ~'@{namespace}-layout-header';
@header-prefix-cls: ~'@{namespace}-layout-header';
@locale-prefix-cls: ~'@{namespace}-app-locale-picker';
@breadcrumb-prefix-cls: ~'@{namespace}-layout-breadcrumb';
@breadcrumb-prefix-cls: ~'@{namespace}-layout-breadcrumb';
@logo-prefix-cls: ~'@{namespace}-app-logo';
@logo-prefix-cls: ~'@{namespace}-app-logo';
...
@@ -104,7 +103,7 @@
...
@@ -104,7 +103,7 @@
&-action {
&-action {
display: flex;
display: flex;
min-width: 180px;
min-width: 180px;
padding-right: 12px;
//
padding-right: 12px;
align-items: center;
align-items: center;
&__item {
&__item {
...
@@ -146,13 +145,15 @@
...
@@ -146,13 +145,15 @@
.@{header-prefix-cls}-action {
.@{header-prefix-cls}-action {
&__item {
&__item {
&:hover {
color: @text-color-base;
background: @header-light-bg-hover-color;
.app-iconify {
padding: 0 10px;
font-size: 16px !important;
}
}
.@{locale-prefix-cls} {
&:hover {
padding: 0 6px;
background: @header-light-bg-hover-color;
color: rgba(0, 0, 0, 0.65);
}
}
}
}
...
...
src/layouts/default/header/index.vue
浏览文件 @
57615038
...
@@ -41,14 +41,16 @@
...
@@ -41,14 +41,16 @@
<FullScreen
v-if=
"getShowFullScreen"
:class=
"`$
{prefixCls}-action__item fullscreen-item`" />
<FullScreen
v-if=
"getShowFullScreen"
:class=
"`$
{prefixCls}-action__item fullscreen-item`" />
<UserDropDown
:theme=
"getHeaderTheme"
/>
<AppLocalePicker
<AppLocalePicker
v-if=
"getShowLocale"
v-if=
"getShowLocale"
:reload=
"true"
:reload=
"true"
:showText=
"false"
:showText=
"false"
:class=
"`$
{prefixCls}-action__item`"
:class=
"`$
{prefixCls}-action__item`"
/>
/>
<UserDropDown
:theme=
"getHeaderTheme"
/>
<SettingDrawer
v-if=
"getShowSettingButton"
:class=
"`$
{prefixCls}-action__item`" />
</div>
</div>
</Header>
</Header>
</
template
>
</
template
>
...
@@ -76,6 +78,8 @@
...
@@ -76,6 +78,8 @@
import
{
useAppInject
}
from
'
/@/hooks/web/useAppInject
'
;
import
{
useAppInject
}
from
'
/@/hooks/web/useAppInject
'
;
import
{
useDesign
}
from
'
/@/hooks/web/useDesign
'
;
import
{
useDesign
}
from
'
/@/hooks/web/useDesign
'
;
import
{
createAsyncComponent
}
from
'
/@/utils/factory/createAsyncComponent
'
;
export
default
defineComponent
({
export
default
defineComponent
({
name
:
'
LayoutHeader
'
,
name
:
'
LayoutHeader
'
,
components
:
{
components
:
{
...
@@ -90,6 +94,9 @@
...
@@ -90,6 +94,9 @@
Notify
,
Notify
,
AppSearch
,
AppSearch
,
ErrorAction
,
ErrorAction
,
SettingDrawer
:
createAsyncComponent
(()
=>
import
(
'
/@/layouts/default/setting/index.vue
'
),
{
loading
:
true
,
}),
},
},
props
:
{
props
:
{
fixed
:
propTypes
.
bool
,
fixed
:
propTypes
.
bool
,
...
@@ -105,7 +112,7 @@
...
@@ -105,7 +112,7 @@
getIsMixSidebar
,
getIsMixSidebar
,
}
=
useMenuSetting
();
}
=
useMenuSetting
();
const
{
getShowLocale
}
=
useLocaleSetting
();
const
{
getShowLocale
}
=
useLocaleSetting
();
const
{
getUseErrorHandle
}
=
useRootSetting
();
const
{
getUseErrorHandle
,
getShowSettingButton
}
=
useRootSetting
();
const
{
const
{
getHeaderTheme
,
getHeaderTheme
,
...
@@ -167,6 +174,7 @@
...
@@ -167,6 +174,7 @@
getUseErrorHandle
,
getUseErrorHandle
,
getLogoWidth
,
getLogoWidth
,
getIsMixSidebar
,
getIsMixSidebar
,
getShowSettingButton
,
};
};
},
},
});
});
...
...
src/layouts/default/setting/index.vue
浏览文件 @
57615038
...
@@ -27,26 +27,3 @@
...
@@ -27,26 +27,3 @@
},
},
});
});
</
script
>
</
script
>
<
style
lang=
"less"
>
@prefix-cls: ~'@{namespace}-setting-button';
.@{prefix-cls} {
position: absolute;
top: 45%;
right: 0;
z-index: 10;
display: flex;
padding: 10px;
color: @white;
cursor: pointer;
background: @primary-color;
border-radius: 6px 0 0 6px;
justify-content: center;
align-items: center;
svg {
width: 1em;
height: 1em;
}
}
</
style
>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录