From f17f8c64a106c964272c27e9cb012ff2a0e06dd0 Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Sun, 13 Sep 2020 11:00:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20the=20problem=20z=20level=20of=20layout?=
=?UTF-8?q?=20and=20components;=20:bug:=20=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
=?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E7=BB=84=E4=BB=B6=E7=9A=84=E5=B1=82?=
=?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/menu/index.less | 2 +-
src/components/setting/Setting.vue | 9 ++++++---
src/components/tool/Drawer.vue | 4 ++--
src/layouts/header/index.less | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/components/menu/index.less b/src/components/menu/index.less
index 7674fcf..856b376 100644
--- a/src/components/menu/index.less
+++ b/src/components/menu/index.less
@@ -4,7 +4,7 @@
.side-menu{
min-height: 100vh;
overflow-y: auto;
- z-index: 1100;
+ z-index: 10;
.logo{
height: 64px;
position: relative;
diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue
index 76cb4d1..21ceb42 100644
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -33,7 +33,12 @@
<a-list :split="false">
<a-list-item>
{{$t('navigate.content.title')}}
- <a-select :getPopupContainer="getPopupContainer" :dropdown-style="{zIndex: 2001}" size="small" :defaultValue="pageWidth" @change="setPageWidth" slot="actions" style="width: 80px">
+ <a-select
+ :getPopupContainer="getPopupContainer"
+ :value="pageWidth"
+ @change="setPageWidth"
+ class="select-item" size="small" slot="actions"
+ >
<a-select-option value="fluid">{{$t('navigate.content.fluid')}}</a-select-option>
<a-select-option value="fixed">{{$t('navigate.content.fixed')}}</a-select-option>
</a-select>
@@ -77,7 +82,6 @@
<a-select
:value="animate.name"
:getPopupContainer="getPopupContainer"
- :dropdown-style="{zIndex: 2001}"
@change="val => setAnimate({...animate, name: val})"
class="select-item" size="small" slot="actions"
>
@@ -89,7 +93,6 @@
<a-select
:value="animate.direction"
:getPopupContainer="getPopupContainer"
- :dropdown-style="{zIndex: 2001}"
@change="val => setAnimate({...animate, direction: val})"
class="select-item" size="small" slot="actions"
>
diff --git a/src/components/tool/Drawer.vue b/src/components/tool/Drawer.vue
index 9805de4..f3810e9 100644
--- a/src/components/tool/Drawer.vue
+++ b/src/components/tool/Drawer.vue
@@ -66,7 +66,7 @@ export default {
top: 0;
background-color: @shadow-color;
transition: all 0.5s;
- z-index: 2000;
+ z-index: 100;
&.open{
display: inline-block;
}
@@ -78,7 +78,7 @@ export default {
position: fixed;
transition: all 0.5s;
height: 100vh;
- z-index: 2000;
+ z-index: 100;
&.left{
left: 0px;
&.open{
diff --git a/src/layouts/header/index.less b/src/layouts/header/index.less
index d54fca4..f066980 100644
--- a/src/layouts/header/index.less
+++ b/src/layouts/header/index.less
@@ -1,6 +1,6 @@
.admin-header{
padding: 0;
- z-index: 1099;
+ z-index: 2;
box-shadow: @shadow-down;
position: relative;
background: @base-bg-color;