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/menu/components/table/edit-table/columns/index.scss |  107 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/index.scss b/src/menu/components/table/edit-table/columns/index.scss
index f376b55..ec4172d 100644
--- a/src/menu/components/table/edit-table/columns/index.scss
+++ b/src/menu/components/table/edit-table/columns/index.scss
@@ -1,14 +1,56 @@
-.normal-table-columns {
+.edit-table-columns {
   position: relative;
+  --mk-table-border-color: #e8e8e8;
+  --mk-table-color: rgba(0, 0, 0, 0.65);
+  --mk-table-font-size: 14px;
+  --mk-table-font-weight: normal;
+
   .ant-table {
     color: inherit;
     font-size: inherit;
+  }
+  .ant-table-selection-column {
+    width: 60px;
+    min-width: 60px;
+    max-width: 60px;
+  }
+  .submit-btn {
+    min-height: 28px;
+    min-width: 65px;
+    height: auto;
+    margin-right: 10px;
+    margin-bottom: 10px!important;
+    background-color: #1890ff;
+    border-width: 0;
+    top: -2px;
+  }
+  .ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters > .ant-table-column-title {
+    position: unset;
   }
   .ant-table-body {
     overflow-x: auto;
     tr {
       td {
         background: #ffffff;
+        .col-copy {
+          margin-bottom: 0;
+          display: inline-block;
+          color: inherit;
+          .ant-typography-copy {
+            position: absolute;
+            left: 2px;
+            top: 0px;
+            margin-left: 0px;
+            font-size: 12px;
+            opacity: 0;
+            transition: opacity 0.2s;
+          }
+        }
+      }
+      td:hover .col-copy {
+        .ant-typography-copy {
+          opacity: 1;
+        }
       }
       td:not(.ant-table-selection-column) {
         position: relative;
@@ -20,11 +62,16 @@
           color: purple;
           font-size: 12px;
         }
-      }
-    }
-    .action-column {
-      .card-detail-row:empty {
-        min-height: 40px;
+        >.close-col {
+          position: absolute;
+          top: 2px;
+          right: 2px;
+          color: orange;
+          font-size: 12px;
+        }
+        >.profile + .close-col {
+          right: 20px;
+        }
       }
     }
     tr:hover td {
@@ -54,17 +101,17 @@
     }
   }
   .col-control {
-    position: absolute;
+    position: relative;
+    float: right;
     z-index: 2;
-    right: 0;
-    top: -25px;
-    >i, >div > i {
+    >.anticon, >div > .anticon {
       font-size: 16px;
       margin-right: 10px;
       cursor: pointer;
     }
-    >.anticon-copy {
+    >.anticon-copy, >.anticon-plus {
       color: #26C281;
+      margin-left: 5px;
     }
     >.anticon-delete {
       color: #ff4d4f;
@@ -79,25 +126,37 @@
   .ant-table-small > .ant-table-content > .ant-table-body {
     margin: 0;
   }
+  .ant-table-small > .ant-table-content .ant-table-thead > tr > th {
+    background-color: #fafafa!important;
+  }
+  .ant-table-small.ant-table-bordered {
+    border-right: 1px solid #e8e8e8;
+  }
+
+  table, tr, th, td, .ant-table-small {
+    border-color: var(--mk-table-border-color)!important;
+  }
+  table tr {
+    th .ant-table-column-title, th .ant-table-column-title > span {
+      font-size: var(--mk-table-font-size)!important;
+      font-weight: var(--mk-table-font-weight)!important;
+    }
+    td {
+      font-size: var(--mk-table-font-size)!important;
+      font-weight: var(--mk-table-font-weight)!important;
+    }
+  }
+  table tbody tr {
+    color: var(--mk-table-color);
+  }
 }
-.normal-table-columns.false {
+.edit-table-columns.false {
   .ant-pagination {
     display: none;
   }
 }
-.normal-table-columns.checkbox {
-  .ant-radio-inner {
-    border-radius: 0;
-  }
-  .ant-radio-inner::after {
-    border-radius: 0;
-  }
-  .ant-radio-checked::after {
-    border-radius: 0;
-  }
-}
 
-.normal-table-columns.ghost {
+.edit-table-columns.ghost {
   .ant-table-thead > tr {
     > th {
       color: inherit;

--
Gitblit v1.8.0