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 | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/menu/components/table/edit-table/columns/index.scss b/src/menu/components/table/edit-table/columns/index.scss index 3426cb2..ec4172d 100644 --- a/src/menu/components/table/edit-table/columns/index.scss +++ b/src/menu/components/table/edit-table/columns/index.scss @@ -9,12 +9,20 @@ color: inherit; font-size: inherit; } + .ant-table-selection-column { + width: 60px; + min-width: 60px; + max-width: 60px; + } .submit-btn { - min-height: 24px; + 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; @@ -27,6 +35,7 @@ .col-copy { margin-bottom: 0; display: inline-block; + color: inherit; .ant-typography-copy { position: absolute; left: 2px; @@ -65,19 +74,8 @@ } } } - .action-column { - .card-detail-row:empty { - min-height: 40px; - } - } tr:hover td { background: #ffffff!important; - } - } - - .model-menu-card-cell-list { - .card-detail-row { - min-height: 21px; } } @@ -111,8 +109,9 @@ margin-right: 10px; cursor: pointer; } - >.anticon-copy { + >.anticon-copy, >.anticon-plus { color: #26C281; + margin-left: 5px; } >.anticon-delete { color: #ff4d4f; @@ -127,22 +126,29 @@ .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 { + 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 { - // 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; } } + table tbody tr { + color: var(--mk-table-color); + } } .edit-table-columns.false { .ant-pagination { -- Gitblit v1.8.0