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 | 154 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 137 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index a2104f3..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;
@@ -8,11 +12,45 @@
}
.normal-table-footer.pagination {
position: absolute;
- bottom: 40px;
+ bottom: 10px;
}
>.ant-table-wrapper {
position: relative;
z-index: 1;
+ }
+ .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 {
@@ -64,6 +102,9 @@
background-size: cover;
margin: 2px;
}
+ .ant-mk-picture.scale {
+ cursor: zoom-in;
+ }
.action-col {
.ant-btn > .anticon + span {
margin-left: 3px;
@@ -93,6 +134,14 @@
vertical-align: middle;
}
.ant-table-tbody > tr > td.ant-table-column-has-actions {
+ .content {
+ position: relative;
+ z-index: 1;
+ word-wrap: break-word;
+ word-break: break-word;
+ }
+ }
+ .ant-table-tbody > tr > td {
position: relative;
.link-menu {
position: absolute;
@@ -102,13 +151,6 @@
bottom: 0px;
opacity: 0;
cursor: pointer;
- }
-
- .content {
- position: relative;
- z-index: 1;
- word-wrap: break-word;
- word-break: break-word;
}
}
.ant-table-tbody > tr > td .content {
@@ -127,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;
@@ -142,18 +235,45 @@
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
}
- .fix-header {
- .ant-table-body {
- min-height: unset
+}
+.normal-custom-table.fixed-height {
+ .ant-table-body {
+ border-bottom: 1px solid rgba(0, 0, 0, .05);
+ .ant-table-fixed {
+ border-bottom: 0;
}
- .ant-table-placeholder {
- display: none;
+ }
+}
+.normal-custom-table.hidden {
+ thead {
+ display: none;
+ }
+}
+.normal-custom-table.ghost {
+ .main-pickup {
+ display: none;
+ }
+ .ant-table-thead > tr {
+ > th {
+ color: inherit;
+ background: transparent;
+ .ant-table-column-sorter .ant-table-column-sorter-inner {
+ color: inherit;
+ }
}
- .ant-table-wrapper {
- display: none;
+ > th:hover {
+ background: transparent;
}
- .ant-affix .ant-table-wrapper {
- display: block;
+ }
+ .ant-table-body {
+ overflow-x: auto;
+ tr {
+ td {
+ background: transparent!important;
+ }
+ }
+ tr:hover td {
+ background: transparent!important;
}
}
}
--
Gitblit v1.8.0