From 88f178df654b08411470a7eab75b3d5fed8817c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:37:45 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/share/normalTable/index.scss |   92 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index e234a07..12ad8fd 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -26,6 +26,12 @@
   .mk-disabled {
     color: #bcbcbc;
     cursor: not-allowed;
+    --mk-table-color: #bcbcbc;
+
+    span, div {
+      color: #bcbcbc!important;
+    }
+
     .ant-btn {
       cursor: not-allowed;
     }
@@ -88,16 +94,16 @@
         // vertical-align: top;
 
         .card-cell-list {
-          color: rgba(0, 0, 0, 0.85);
+          color: inherit;
         }
         .ant-mk-picture {
           position: relative;
-          background-position: center center;
-          background-size: cover;
           margin: 2px;
         }
-        .ant-mk-picture.scale {
-          cursor: zoom-in;
+        .video-wrap {
+          .video-react-playback-rate {
+            display: none;
+          }
         }
         .action-col {
           .ant-btn > .anticon + span {
@@ -192,25 +198,34 @@
       display: block;
     }
   }
+  .ant-table-small.ant-table-bordered {
+    border-right: 1px solid #e8e8e8;
+  }
 
-  table, tr, th, td {
+  table, tr, th, td, .ant-table-small {
     border-color: var(--mk-table-border-color)!important;
   }
   table tr {
     th .ant-table-column-title {
-      // color: var(--mk-table-color)!important;
       font-size: var(--mk-table-font-size)!important;
       font-weight: var(--mk-table-font-weight)!important;
     }
     td {
-      color: var(--mk-table-color)!important;
       font-size: var(--mk-table-font-size)!important;
       font-weight: var(--mk-table-font-weight)!important;
 
-      >span, div:not(.card-cell-list), div:not(.card-cell-list) div, div:not(.card-cell-list) span {
+      >span, >div:not(.card-cell-list) div, >div:not(.card-cell-list) span {
         font-weight: var(--mk-table-font-weight)!important;
       }
     }
+  }
+  table tbody tr {
+    color: var(--mk-table-color);
+  }
+}
+.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) {
@@ -243,6 +258,65 @@
     display: none;
   }
 }
+.normal-custom-table.mk-fixed-last-col {
+  table {
+    .ant-table-thead {
+      tr:first-child {
+        th:last-child {
+          position: sticky !important;
+          z-index: 2;
+          right: 0px;
+          box-shadow: 0 1px 1px #bcbcbc;
+        }
+      }
+    }
+    .ant-table-tbody {
+      tr {
+        td:last-child {
+          position: sticky !important;
+          z-index: 2;
+          right: 0px;
+          background: #ffffff;
+          box-shadow: 0 1px 1px #bcbcbc;
+        }
+      }
+    }
+  }
+}
+.normal-custom-table.mk-fixed-first-col {
+  table {
+    .ant-table-thead {
+      tr:first-child {
+        th:first-child {
+          position: sticky !important;
+          z-index: 2;
+          left: 0px;
+        }
+        th.ant-table-selection-column + th {
+          position: sticky !important;
+          z-index: 2;
+          left: 60px;
+        }
+      }
+    }
+    .ant-table-tbody {
+      tr {
+        td:first-child {
+          position: sticky !important;
+          z-index: 2;
+          left: 0px;
+          background: #ffffff;
+        }
+        td.ant-table-selection-column + td{
+          position: sticky !important;
+          z-index: 2;
+          left: 60px;
+          background: #ffffff;
+        }
+      }
+    }
+  }
+}
 .normal-custom-table.ghost {
   .main-pickup {
     display: none;

--
Gitblit v1.8.0