From 32973f90869ff466401759c23681fc06fa65c71a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:50 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 1fdde89..1573c0b 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -7,9 +7,8 @@
--mk-table-font-size: 14px;
--mk-table-font-weight: normal;
- >.ant-table-wrapper {
+ .ant-table-wrapper {
position: relative;
- // z-index: 1;
}
.ant-table-placeholder {
border-top-color: var(--mk-table-border-color);
@@ -233,6 +232,14 @@
}
.ant-table-small.ant-table-bordered {
border-right: 1px solid #e8e8e8;
+
+ .ant-table-content {
+ border-radius: inherit;
+
+ .ant-table-scroll {
+ border-radius: inherit;
+ }
+ }
}
table, tr, th, td, .ant-table-small {
border-color: var(--mk-table-border-color)!important;
@@ -295,7 +302,7 @@
background-color: #fafafa!important;
}
}
-.edit-custom-table:not(.fixed-height) {
+.edit-custom-table:not(.fixed-table-height) {
.ant-table-body::-webkit-scrollbar {
width: 8px;
height: 10px;
@@ -310,14 +317,6 @@
border-radius: 3px;
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
- }
-}
-.edit-custom-table.fixed-height {
- .ant-table-body {
- border-bottom: 1px solid rgba(0, 0, 0, .05);
- .ant-table-fixed {
- border-bottom: 0;
- }
}
}
.edit-custom-table.hidden {
--
Gitblit v1.8.0