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/tabviews/custom/components/share/normalTable/index.scss | 103 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 91 insertions(+), 12 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss index 9fadcde..cdc9b52 100644 --- a/src/tabviews/custom/components/share/normalTable/index.scss +++ b/src/tabviews/custom/components/share/normalTable/index.scss @@ -1,6 +1,10 @@ .normal-custom-table { position: relative; padding: 0px; + --mk-table-border-color: #e8e8e8; + --mk-table-color: rgba(0, 0, 0, 0.65); + --mk-table-font-size: 14px; + --mk-table-font-weight: normal; .normal-table-footer { padding: 10px 0px; @@ -17,6 +21,36 @@ .ant-table { color: inherit; font-size: inherit; + } + + .mk-disabled { + color: #bcbcbc; + cursor: not-allowed; + --mk-table-color: #bcbcbc; + + span, div { + color: #bcbcbc!important; + } + + .ant-btn { + cursor: not-allowed; + } + .ant-table-selection-column { + > span::after { + content: ' '; + display: block; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 1; + } + } + .ant-checkbox-checked .ant-checkbox-inner { + background-color: #fff!important; + border-color: #d9d9d9!important; + } } table { @@ -135,6 +169,57 @@ } } } + // .ant-table-body::-webkit-scrollbar { + // width: 8px; + // height: 10px; + // } + // ::-webkit-scrollbar-thumb { + // border-radius: 5px; + // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13); + // background: rgba(0, 0, 0, 0.13); + // } + // ::-webkit-scrollbar-track {/*婊氬姩鏉¢噷闈㈣建閬�*/ + // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05); + // border-radius: 3px; + // border: 1px solid rgba(0, 0, 0, 0.07); + // background: rgba(0, 0, 0, 0); + // } + .fix-header { + .ant-table-body { + min-height: unset + } + .ant-table-placeholder { + display: none; + } + .ant-table-wrapper { + display: none; + } + .ant-affix .ant-table-wrapper { + display: block; + } + } + + 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; + + >span, >div:not(.card-cell-list) div, >div:not(.card-cell-list) span { + font-weight: var(--mk-table-font-weight)!important; + } + } + } +} +.normal-custom-table:not(.fixed-height) { .ant-table-body::-webkit-scrollbar { width: 8px; height: 10px; @@ -150,18 +235,12 @@ border: 1px solid rgba(0, 0, 0, 0.07); background: rgba(0, 0, 0, 0); } - .fix-header { - .ant-table-body { - min-height: unset - } - .ant-table-placeholder { - display: none; - } - .ant-table-wrapper { - display: none; - } - .ant-affix .ant-table-wrapper { - display: block; +} +.normal-custom-table.fixed-height { + .ant-table-body { + border-bottom: 1px solid rgba(0, 0, 0, .05); + .ant-table-fixed { + border-bottom: 0; } } } -- Gitblit v1.8.0