From 77eaa966286dbbcf4b4474763533d448e0fa03f9 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 14:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/panel/ToolBoxPanel.vue | 58 ++++++++++++++++++++++++----------------------------------
1 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index feeb4ae..a6dd8d1 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -5,29 +5,27 @@
<img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
<span>宸ュ叿</span>
</el-button>
- <transition name="isD">
- <el-row v-show="selectGroup" class="specific-tools-group">
- <el-popover
- placement="bottom"
- width=""
- trigger="click"
- :popper-class="'tools-panel-content'"
- v-for="(item,index) in menuList" :key="index"
- >
- <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
- @click="changeChoose(index)">
- <img :src="item.icon" alt=""/>
- <span>{{ item.label }}</span>
- </el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT)">
- <img :src="itemT.icon" :title="itemT.title"/>
- </el-button>
- </el-popover>
- <el-button @click="changeSelect" class="special-button">
- <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
+ <el-row v-show="selectGroup" class="specific-tools-group">
+ <el-popover
+ placement="bottom"
+ width=""
+ trigger="click"
+ :popper-class="'tools-panel-content'"
+ v-for="(item,index) in menuList" :key="index"
+ >
+ <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+ @click="changeChoose(index)">
+ <img :src="item.icon" alt=""/>
+ <span>{{ item.label }}</span>
</el-button>
- </el-row>
- </transition>
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT)">
+ <img :src="itemT.icon" :title="itemT.title"/>
+ </el-button>
+ </el-popover>
+ <el-button @click="changeSelect" class="special-button">
+ <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
+ </el-button>
+ </el-row>
</div>
</div>
</template>
@@ -181,8 +179,7 @@
drawLayer: null,
map: null,
L: window.L,
- active: 0,
- isShow: true
+ active: 0
}
},
methods: {
@@ -317,7 +314,6 @@
// 宸︿笂鍔熻兘鎺у埗
changeSelect () {
this.selectGroup = !this.selectGroup
- this.isShow = !this.isShow
}
}
}
@@ -332,8 +328,10 @@
.specific-tools {
display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+
.el-button {
- z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 45px;
@@ -354,7 +352,6 @@
}
.specific-tools-group {
- z-index: 1;
.tools-panel-choose {
border: none;
box-shadow: 0 0 0.03rem @color-shadow;
@@ -376,12 +373,5 @@
color: @color-over;
}
}
-}
-.isD-enter-active, .isD-leave-active{
- transition: all 0.5s;
-}
-.isD-enter, .isD-leave-to{
- opacity: 0;
- transform: translateX(-100px);
}
</style>
--
Gitblit v1.8.0