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/normal-table/columns/index.scss | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 99 insertions(+), 4 deletions(-) diff --git a/src/menu/components/table/normal-table/columns/index.scss b/src/menu/components/table/normal-table/columns/index.scss index a2428be..3d4835c 100644 --- a/src/menu/components/table/normal-table/columns/index.scss +++ b/src/menu/components/table/normal-table/columns/index.scss @@ -1,10 +1,37 @@ .normal-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; + font-weight: inherit; + } .ant-table-body { overflow-x: auto; - padding-bottom: 20px; - tr td:not(.ant-table-selection-column) { - padding: 12px 8px; - background: #ffffff; + tr { + td { + background: #ffffff; + } + td:not(.ant-table-selection-column) { + position: relative; + padding: 12px 8px; + >.profile { + position: absolute; + top: 2px; + right: 2px; + color: purple; + font-size: 12px; + } + } + } + .action-column { + .card-detail-row:empty { + min-height: 40px; + } } tr:hover td { background: #ffffff!important; @@ -32,6 +59,48 @@ } } } + .col-control { + position: absolute; + z-index: 2; + right: 0; + top: -25px; + >.anticon, >div > .anticon { + font-size: 16px; + margin-right: 10px; + cursor: pointer; + } + >.anticon-copy { + color: #26C281; + } + >.anticon-delete { + color: #ff4d4f; + } + >.anticon-file-sync { + color: #1890ff; + } + >div >.profile { + color: purple; + } + } + .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 { + // 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; + } + } } .normal-table-columns.false { .ant-pagination { @@ -49,3 +118,29 @@ border-radius: 0; } } + +.normal-table-columns.ghost { + .ant-table-thead > tr { + > th { + color: inherit; + background: transparent; + .ant-table-column-sorter .ant-table-column-sorter-inner { + color: inherit; + } + } + > th:hover { + background: transparent; + } + } + .ant-table-body { + overflow-x: auto; + tr { + td { + background: transparent; + } + } + tr:hover td { + background: transparent!important; + } + } +} -- Gitblit v1.8.0