From f04ca57f7a3d8112e6c7f5c5a4dc72f1ba9e8edc Mon Sep 17 00:00:00 2001
From: zouhuu <zouhugz@163.com>
Date: 星期一, 17 四月 2023 16:08:44 +0800
Subject: [PATCH] update ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml. 修复生成列字段注释显示不全问题
---
ruoyi-ui/src/assets/styles/sidebar.scss | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index 9fad799..9f39046 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -1,17 +1,21 @@
#app {
.main-container {
- min-height: 100%;
+ height: 100%;
transition: margin-left .28s;
- margin-left: $sideBarWidth;
+ margin-left: $base-sidebar-width;
position: relative;
+ }
+
+ .sidebarHide {
+ margin-left: 0!important;
}
.sidebar-container {
-webkit-transition: width .28s;
transition: width 0.28s;
- width: $sideBarWidth !important;
- background-color: $menuBg;
+ width: $base-sidebar-width !important;
+ background-color: $base-menu-background;
height: 100%;
position: fixed;
font-size: 0px;
@@ -81,12 +85,12 @@
}
& .theme-dark .is-active > .el-submenu__title {
- color: $subMenuActiveText !important;
+ color: $base-menu-color-active !important;
}
& .nest-menu .el-submenu>.el-submenu__title,
& .el-submenu .el-menu-item {
- min-width: $sideBarWidth !important;
+ min-width: $base-sidebar-width !important;
&:hover {
background-color: rgba(0, 0, 0, 0.06) !important;
@@ -95,10 +99,10 @@
& .theme-dark .nest-menu .el-submenu>.el-submenu__title,
& .theme-dark .el-submenu .el-menu-item {
- background-color: $subMenuBg !important;
+ background-color: $base-sub-menu-background !important;
&:hover {
- background-color: $subMenuHover !important;
+ background-color: $base-sub-menu-hover !important;
}
}
}
@@ -135,9 +139,6 @@
margin-left: 20px;
}
- .el-submenu__icon-arrow {
- display: none;
- }
}
}
@@ -157,7 +158,7 @@
}
.el-menu--collapse .el-menu .el-submenu {
- min-width: $sideBarWidth !important;
+ min-width: $base-sidebar-width !important;
}
// mobile responsive
@@ -168,14 +169,14 @@
.sidebar-container {
transition: transform .28s;
- width: $sideBarWidth !important;
+ width: $base-sidebar-width !important;
}
&.hideSidebar {
.sidebar-container {
pointer-events: none;
transition-duration: 0.3s;
- transform: translate3d(-$sideBarWidth, 0, 0);
+ transform: translate3d(-$base-sidebar-width, 0, 0);
}
}
}
--
Gitblit v1.9.2