From 80d25863db80001427f796a13d37d2d06135c1d0 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 25 七月 2022 18:32:42 +0800
Subject: [PATCH] !536 防止主键字段名与'row'或'ids'一致导致报错的问题。 Merge pull request !536 from 张政/N/A
---
ruoyi-ui/src/layout/index.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 4d6fe02..202cfcd 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,8 +1,8 @@
<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"/>
- <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" />
@@ -101,6 +101,10 @@
width: calc(100% - 54px);
}
+ .sidebarHide .fixed-header {
+ width: 100%;
+ }
+
.mobile .fixed-header {
width: 100%;
}
--
Gitblit v1.9.2