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/assets/styles/ruoyi.scss | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index ffb04a3..e3912ce 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -37,7 +37,7 @@
.mb10 {
margin-bottom: 10px;
}
-.ml0 {
+.ml10 {
margin-left: 10px;
}
.mt20 {
@@ -49,12 +49,26 @@
.mb20 {
margin-bottom: 20px;
}
-.m20 {
+.ml20 {
margin-left: 20px;
}
-.el-dialog:not(.is-fullscreen){
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+ font-family: inherit;
+ font-weight: 500;
+ line-height: 1.1;
+ color: inherit;
+}
+
+.el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
+}
+
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+ overflow: auto;
+ overflow-x: hidden;
+ max-height: 70vh;
+ padding: 10px 20px 0;
}
.el-table {
@@ -65,6 +79,11 @@
color: #515a6e;
height: 40px;
font-size: 13px;
+ }
+ }
+ .el-table__body-wrapper {
+ .el-button [class*="el-icon-"] + span {
+ margin-left: 1px;
}
}
}
@@ -87,16 +106,43 @@
padding: 10px 20px !important;
}
+/* tree border */
+.tree-border {
+ margin-top: 5px;
+ border: 1px solid #e5e6e7;
+ background: #FFFFFF none;
+ border-radius:4px;
+}
+
.pagination-container .el-pagination {
right: 0;
position: absolute;
}
+@media ( max-width : 768px) {
+ .pagination-container .el-pagination > .el-pagination__jump {
+ display: none !important;
+ }
+ .pagination-container .el-pagination > .el-pagination__sizes {
+ display: none !important;
+ }
+}
+
.el-table .fixed-width .el-button--mini {
- color: #409EFF;
padding-left: 0;
padding-right: 0;
width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF;
+ margin-left: 5px;
+}
+
+.el-table .el-dropdown, .el-icon-arrow-down {
+ font-size: 12px;
}
.el-tree-node__content > .el-checkbox {
@@ -207,8 +253,8 @@
position: absolute;
top: 50%;
transform: translate(50%, -50%);
- width: 180px;
- height: 180px;
+ width: 200px;
+ height: 200px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
@@ -222,5 +268,6 @@
}
.top-right-btn {
+ position: relative;
float: right;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2