From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/table/normal-table/index.scss |   64 +++++++++++---------------------
 1 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.scss b/src/tabviews/custom/components/table/normal-table/index.scss
index 6955b50..30ecedf 100644
--- a/src/tabviews/custom/components/table/normal-table/index.scss
+++ b/src/tabviews/custom/components/table/normal-table/index.scss
@@ -1,54 +1,34 @@
 .custom-normal-table {
   position: relative;
+  background-color: #fff;
 
   .normal-header {
     margin-bottom: 10px;
   }
-  .top-search {
+  .mk-search-wrap {
     border-bottom: 1px solid #efefef;
+    padding-top: 10px;
   }
-  >.button-list.toolbar-button {
-    padding: 0;
-    line-height: 55px;
-    padding-right: 110px;
-    button {
-      margin-right: 0px;
-      margin-bottom: 0px;
+  .button-list.toolbar-button {
+    padding-right: 60px;
+  }
+  .ant-collapse {
+    background-color: transparent;
+    border-radius: 0px;
+    > .ant-collapse-item {
+      border: 0;
+      >.ant-collapse-header {
+        padding: 0;
+        .normal-header {
+          padding-right: 40px;
+        }
+      }
     }
-  }
-  .ant-modal-mask {
-    position: absolute;
-  }
-  .ant-modal-wrap {
-    position: absolute;
-  }
-  .action-modal .ant-modal {
-    top: 40px;
-    max-width: 95%;
-    .ant-modal-body {
-      max-height: calc(100vh - 265px);
-    }
-  }
-  .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;
-    }
-    >.async-spin {
-      line-height: 150px!important;
+    .ant-collapse-item:last-child > .ant-collapse-content {
+      border-radius: 0;
+      .ant-collapse-content-box {
+        padding: 0;
+      }
     }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0