From 49fabbaab6ad5ab8ab6d8da3954384e0281f6134 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 六月 2024 23:49:17 +0800
Subject: [PATCH] 2024-06-05

---
 src/tabviews/custom/components/card/double-data-card/index.scss |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index 3f19dd4..07c69b2 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -8,6 +8,7 @@
 
   .pickup-wrap {
     float: right;
+    margin-bottom: 3px;
     button {
       margin-top: 3px;
     }
@@ -26,6 +27,7 @@
   .data-zoom {
     display: flex;
     position: relative;
+    min-width: var(--mk-data-zoom-width, 100%);
     .mk-disabled {
       >.card-item-box {
         cursor: not-allowed;
@@ -42,14 +44,6 @@
   .card-row-list {
     flex: 10;
     max-width: 100%;
-  }
-  .card-row-list.flex-layout {
-    display: flex;
-    width: 100%;
-    >.ant-col {
-      width: 5%;
-      flex: 1;
-    }
   }
   .card-item-box {
     position: relative;
@@ -279,19 +273,31 @@
     width: 100%;
     overflow-x: auto;
     overflow-y: auto;
-    padding-bottom: 10px;
     border: 1px solid #e8e8e8;
     border-radius: 4px;
 
-    .extend-card:first-child {
-      position: sticky;
-      top: 0px;
-      z-index: 2;
+    .fix-height .card-row-list {
+      .extend-card:first-child {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+        .card-item-box {
+          margin-top: 0!important;
+          margin-bottom: 0!important;
+        }
+      }
+      div:last-child {
+        .sub-card-wrap {
+          .card-item-box {
+            border-bottom: none!important;
+          }
+        }
+      }
     }
   }
   .data-zoom-box::-webkit-scrollbar {
     height: 9px;
-    width: 9px;
+    width: 7px;
   }
   .data-zoom-box::-webkit-scrollbar-thumb {
     border-radius: 5px;
@@ -322,16 +328,16 @@
     }
   }
 }
-.double-data-card-box::-webkit-scrollbar {
+.double-data-card-box::-webkit-scrollbar, .double-data-card-box .card-row-list::-webkit-scrollbar {
   width: 7px;
   height: 7px;
 }
-.double-data-card-box::-webkit-scrollbar-thumb {
+.double-data-card-box::-webkit-scrollbar-thumb, .double-data-card-box .card-row-list::-webkit-scrollbar-thumb {
   border-radius: 5px;
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
   background: rgba(0, 0, 0, 0.13);
 }
-.double-data-card-box::-webkit-scrollbar-track {
+.double-data-card-box::-webkit-scrollbar-track, .double-data-card-box .card-row-list::-webkit-scrollbar-track {
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
   border-radius: 3px;
   border: 1px solid rgba(0, 0, 0, 0.07);

--
Gitblit v1.8.0