From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/normal-table/index.scss | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.scss b/src/tabviews/custom/components/table/normal-table/index.scss
index 1d09da9..3e10f6a 100644
--- a/src/tabviews/custom/components/table/normal-table/index.scss
+++ b/src/tabviews/custom/components/table/normal-table/index.scss
@@ -1,13 +1,22 @@
.custom-normal-table {
position: relative;
+ background-color: #fff;
- .top-search {
- padding: 0;
+ .normal-header {
+ margin-bottom: 10px;
}
- .commontable-main-action {
- min-height: 25px;
- .button-list {
- padding-right: 110px;
+ .top-search {
+ border-bottom: 1px solid #efefef;
+ }
+ >.button-list.toolbar-button {
+ padding: 0;
+ line-height: 45px;
+ padding-right: 60px;
+ button {
+ margin-right: 0px;
+ margin-bottom: 0px;
+ min-height: 28px;
+ height: auto;
}
}
.ant-modal-mask {
@@ -25,26 +34,54 @@
}
.main-table-box {
position: relative;
+ min-height: 150px;
.main-pickup {
position: absolute;
right: 5px;
top: -22px;
- z-index: 1;
- }
- .custom-control {
- position: absolute;
- z-index: 1;
- right: 0px;
- top: -23px;
- font-size: 18px;
- padding: 3px;
- cursor: pointer;
+ z-index: 2;
}
>.async-spin {
line-height: 150px!important;
}
}
- .normal-data-table {
- padding: 0;
+ .no-action.main-table-box {
+ .main-pickup {
+ position: relative;
+ right: 0px;
+ top: 0px;
+ z-index: 2;
+ float: right;
+ }
+ }
+ .ant-collapse {
+ background-color: transparent;
+ border-radius: 0px;
+ > .ant-collapse-item {
+ border: 0;
+ >.ant-collapse-header {
+ padding: 0;
+ .normal-header {
+ padding-right: 40px;
+ }
+ }
+ }
+ .ant-collapse-item:last-child > .ant-collapse-content {
+ border-radius: 0;
+ .ant-collapse-content-box {
+ padding: 0;
+ >.button-list.toolbar-button {
+ padding: 0;
+ line-height: 45px;
+ padding-right: 60px;
+ button {
+ margin-right: 0px;
+ margin-bottom: 0px;
+ min-height: 28px;
+ height: auto;
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0