From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/table/edit-table/columns/index.scss |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/index.scss b/src/menu/components/table/edit-table/columns/index.scss
index 320709e..de150a6 100644
--- a/src/menu/components/table/edit-table/columns/index.scss
+++ b/src/menu/components/table/edit-table/columns/index.scss
@@ -1,11 +1,17 @@
 .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;
   }
   .submit-btn {
-    height: 24px;
+    min-height: 24px;
+    height: auto;
     margin-right: 10px;
     background-color: #1890ff;
     border-width: 0;
@@ -63,11 +69,10 @@
     }
   }
   .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;
@@ -88,6 +93,22 @@
   .ant-table-small > .ant-table-content > .ant-table-body {
     margin: 0;
   }
+
+  table, tr, th, td {
+    border-color: var(--mk-table-border-color)!important;
+  }
+  table tr {
+    th .ant-table-column-title, th .ant-table-column-title > span {
+      // 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;
+    }
+  }
 }
 .edit-table-columns.false {
   .ant-pagination {

--
Gitblit v1.8.0