From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.scss |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 9fcaf63..1f2fb54 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -9,7 +9,10 @@
 
   >.ant-table-wrapper {
     position: relative;
-    z-index: 1;
+    // z-index: 1;
+  }
+  .ant-table-placeholder {
+    border-top-color: var(--mk-table-border-color);
   }
   .ant-table {
     color: inherit;
@@ -65,6 +68,7 @@
 
         .card-cell-list {
           color: inherit;
+          overflow: hidden;
         }
         .action-col {
           .ant-btn > .anticon + span {
@@ -186,7 +190,16 @@
         right: 0px;
         bottom: 0px;
         border: 1px solid var(--mk-sys-color);
+        background: #ffffff;
       }
+    }
+    .ant-calendar-picker {
+      display: block;
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
     }
     .has-error, .has-error .ant-input-number-input {
       border-color: #ff4d4f!important;
@@ -219,6 +232,10 @@
         padding: 4px 5px;
         text-align: inherit;
       }
+    }
+    .ant-calendar-picker {
+      display: block;
+      height: 30px;
     }
     .has-error, .has-error .ant-input-number-input {
       border-color: #ff4d4f!important;
@@ -254,6 +271,9 @@
     border-color: var(--mk-table-border-color)!important;
   }
   table tr {
+    th .ant-table-column-title {
+      position: unset!important;
+    }
     th .ant-table-column-title, th .ant-table-column-title span:not(.anticon) {
       font-size: var(--mk-table-font-size)!important;
       font-weight: var(--mk-table-font-weight)!important;

--
Gitblit v1.8.0