From 4bbdc1e87bc4df9e7d41b50388364155720c8723 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 15 三月 2020 20:25:58 +0800
Subject: [PATCH] 修复TagsView组件中，鼠标滚轮按下的时候，可以关闭不可关闭的tag
---
ruoyi-ui/src/layout/components/TagsView/index.vue | 9 ++++++---
ruoyi-ui/src/assets/styles/element-ui.scss | 5 +++++
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/ruoyi-ui/src/assets/styles/element-ui.scss
index 35c224e..558eea4 100644
--- a/ruoyi-ui/src/assets/styles/element-ui.scss
+++ b/ruoyi-ui/src/assets/styles/element-ui.scss
@@ -77,3 +77,8 @@
.el-range-editor.el-input__inner {
display: inline-flex !important;
}
+
+// to fix el-date-picker css style
+.el-range-separator {
+ box-sizing: content-box;
+}
diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
index 1ca89d2..1dfd793 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="!item.hidden" class="menu-wrapper">
+ <div v-if="!item.hidden">
<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index 9fc380f..bb215c8 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -9,16 +9,16 @@
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
- @click.middle.native="closeSelectedTag(tag)"
+ @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
{{ tag.title }}
- <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+ <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link>
</scroll-pane>
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">鍒锋柊椤甸潰</li>
- <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">鍏抽棴褰撳墠</li>
+ <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">鍏抽棴褰撳墠</li>
<li @click="closeOthersTags">鍏抽棴鍏朵粬</li>
<li @click="closeAllTags(selectedTag)">鍏抽棴鎵�鏈�</li>
</ul>
@@ -69,6 +69,9 @@
isActive(route) {
return route.path === this.$route.path
},
+ isAffix(tag) {
+ return tag.meta && tag.meta.affix
+ },
filterAffixTags(routes, basePath = '/') {
let tags = []
routes.forEach(route => {
--
Gitblit v1.9.3