From e02f6923593bd49f87caccd87e063baf312aaa3f Mon Sep 17 00:00:00 2001
From: 稚屿 <1491182878@qq.com>
Date: 星期一, 22 八月 2022 14:19:08 +0800
Subject: [PATCH] 修复菜单管理已知问题 问题描述：在菜单管理下，类型为菜单或者按钮的条目下点击修改按钮。 情况1，如果是类型为菜单，第一次点击修改按钮正常，则第二次点击另一个条目后面的修改按钮时报错！ 情况2，如果是类型为按钮，第一次点击修改时正常，当点击取消按钮关闭弹窗时，浏览器报错！
---
ruoyi-ui/src/layout/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index c6e9b3b..202cfcd 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,14 +1,14 @@
<template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
- <sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
- <div :class="{hasTagsView:needTagsView}" class="main-container">
+ <sidebar v-if="!sidebar.hide" class="sidebar-container" />
+ <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<div :class="{'fixed-header':fixedHeader}">
<navbar />
<tags-view v-if="needTagsView" />
</div>
<app-main />
- <right-panel v-if="showSettings">
+ <right-panel>
<settings />
</right-panel>
</div>
@@ -39,7 +39,6 @@
sideTheme: state => state.settings.sideTheme,
sidebar: state => state.app.sidebar,
device: state => state.app.device,
- showSettings: state => state.settings.showSettings,
needTagsView: state => state.settings.tagsView,
fixedHeader: state => state.settings.fixedHeader
}),
@@ -94,12 +93,16 @@
top: 0;
right: 0;
z-index: 9;
- width: calc(100% - #{$sideBarWidth});
+ width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s;
}
.hideSidebar .fixed-header {
- width: calc(100% - 54px)
+ width: calc(100% - 54px);
+ }
+
+ .sidebarHide .fixed-header {
+ width: 100%;
}
.mobile .fixed-header {
--
Gitblit v1.9.2