From d712ae0a0d338bdc96c463c9ffe42f8c844f3c37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 12:46:57 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/card/double-data-card/index.scss |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 4969ee5..f483742 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -236,6 +236,20 @@
     .circle-select:hover {
       border-color: var(--mk-sys-color);
     }
+    >.card-row-list {
+      >.ant-col:not(.extend-card) {
+        .card-item-box:hover {
+          background-color: var(--mk-sys-color2);
+        }
+      }
+    }
+    .sub-card-wrap.mk-parity-bg {
+      .ant-col:nth-child(even){
+        .card-item-box:not(:hover) {
+          background-color: var(--mk-sys-color1);
+        }
+      }
+    }
   }
   .card-item-wrap {
     .card-item-box {
@@ -284,11 +298,6 @@
       overflow: hidden;
       transition: height 0.3s;
     }
-    .sub-card-wrap {
-      .card-item-box:hover {
-        background-color: var(--mk-sys-color2);
-      }
-    }
   }
   .card-item-wrap.flex-card {
     >.card-item-box:first-child {
@@ -302,10 +311,12 @@
     margin-right: 35px;
   }
 
-  .sub-card-wrap.mk-parity-bg {
-    .ant-col:nth-child(even){
-      .card-item-box:not(:hover) {
-        background-color: var(--mk-sys-color1);
+  .data-zoom:not(.check) {
+    .sub-card-wrap.mk-parity-bg {
+      .ant-col:nth-child(even){
+        .card-item-box {
+          background-color: var(--mk-sys-color1);
+        }
       }
     }
   }

--
Gitblit v1.8.0