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/share/normalTable/index.scss |   86 ++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index 6dbd534..d23ed74 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -24,13 +24,20 @@
     position: absolute;
     bottom: 10px;
   }
-  >.ant-table-wrapper {
+  .ant-table-wrapper {
     position: relative;
-    z-index: 1;
   }
   .ant-table {
     color: inherit;
     font-size: inherit;
+  }
+
+  .clickable {
+    color: var(--mk-sys-color);
+    cursor: pointer;
+  }
+  .clickable:hover {
+    text-decoration: underline;
   }
 
   .mk-disabled {
@@ -147,21 +154,6 @@
       // }
     }
   }
-  // .ant-table-body::-webkit-scrollbar {
-  //   width: 8px;
-  //   height: 10px;
-  // }
-  // ::-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);
-  // }
-  // ::-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);
-  //   background: rgba(0, 0, 0, 0);
-  // }
   .fix-header {
     .ant-table-body {
       min-height: unset
@@ -178,6 +170,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 {
@@ -200,13 +200,55 @@
   table tbody tr {
     color: var(--mk-table-color);
   }
+
+  .mk-tree-node {
+    display: inline-block;
+    text-align: right;
+    --tree-node-width: 18px;
+    
+    .anticon-caret-right, .anticon-caret-down {
+      cursor: pointer;
+      padding-right: 3px;
+    }
+    .anticon-caret-down {
+      display: none;
+    }
+  }
+  .mk-tree-open {
+    .mk-tree-node {
+      .anticon-caret-right {
+        display: none;
+      }
+      .anticon-caret-down {
+        display: inline-block;
+      }
+    }
+  }
+  .mk-tree-hide {
+    display: none;
+  }
+  .mk-tree-td {
+    overflow: hidden;
+    word-break: break-word;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .mk-tree-pagination {
+    float: right;
+    margin: 16px 0;
+  }
+}
+.normal-custom-table.mk-parity {
+  .ant-table-tbody tr:nth-child(even) {
+    background: #fafafa;
+  }
 }
 .normal-custom-table:not(.ghost) {
   .ant-table-small > .ant-table-content .ant-table-thead > tr > th {
     background-color: #fafafa!important;
   }
 }
-.normal-custom-table:not(.fixed-height) {
+.normal-custom-table:not(.fixed-table-height) {
   .ant-table-body::-webkit-scrollbar {
     width: 8px;
     height: 10px;
@@ -221,14 +263,6 @@
     border-radius: 3px;
     border: 1px solid rgba(0, 0, 0, 0.07);
     background: rgba(0, 0, 0, 0);
-  }
-}
-.normal-custom-table.fixed-height {
-  .ant-table-body {
-    border-bottom: 1px solid rgba(0, 0, 0, .05);
-    .ant-table-fixed {
-      border-bottom: 0;
-    }
   }
 }
 .normal-custom-table.hidden {

--
Gitblit v1.8.0