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/tabviews/custom/components/share/normalTable/index.scss | 344 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 274 insertions(+), 70 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index e98044f..d23ed74 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -1,18 +1,73 @@
.normal-custom-table {
position: relative;
- padding: 0 0px 30px;
+ padding: 0px;
+ min-height: 40px;
+ --mk-table-border-color: #e8e8e8;
+ --mk-table-color: rgba(0, 0, 0, 0.65);
+ --mk-table-font-size: 14px;
+ --mk-table-font-weight: normal;
+ .main-pickup {
+ position: absolute;
+ right: 5px;
+ top: -22px;
+ z-index: 2;
+ }
+ .ant-table-placeholder {
+ border-top-color: var(--mk-table-border-color);
+ }
.normal-table-footer {
padding: 10px 0px;
color: rgba(0, 0, 0, 0.65);
}
.normal-table-footer.pagination {
position: absolute;
- bottom: 40px;
+ bottom: 10px;
}
- >.ant-table-wrapper {
+ .ant-table-wrapper {
position: relative;
- z-index: 1;
+ }
+ .ant-table {
+ color: inherit;
+ font-size: inherit;
+ }
+
+ .clickable {
+ color: var(--mk-sys-color);
+ cursor: pointer;
+ }
+ .clickable:hover {
+ text-decoration: underline;
+ }
+
+ .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 {
@@ -53,76 +108,147 @@
overflow-x: auto!important;
table {
.ant-table-tbody > tr > td {
- vertical-align: top;
+ // vertical-align: top;
- .ant-mk-picture {
- background-position: center center;
- background-size: cover;
- margin: 2px;
+ .card-cell-list {
+ color: inherit;
+ overflow: hidden;
}
- .action-col {
- .ant-btn > .anticon + span {
- margin-left: 3px;
- }
- button {
- border: 0;
- background-color: transparent;
- color: #1890ff;
- box-shadow: none;
- padding: 0 5px;
- .anticon-loading {
- display: none;
- }
- }
- > div {
- margin: 0 3px;
- }
- > button {
- margin: 0 3px;
- }
- .ant-btn.ant-btn-loading:not(.ant-btn-circle):not(.ant-btn-circle-outline):not(.ant-btn-icon-only) {
- padding-left: 0px;
+ .ant-mk-picture {
+ position: relative;
+ margin: 2px;
+ }
+ .video-wrap {
+ .video-react-playback-rate {
+ display: none;
}
}
}
.ant-table-tbody > tr > td[rowspan] {
vertical-align: middle;
}
- .ant-table-tbody > tr > td.ant-table-column-has-actions {
+ // .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;
- top: 0px;
- left: 0px;
- right: 0px;
- 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 {
- p {
- margin-bottom: 2px;
- }
- span {
- display: inline-block;
- margin-right: 5px;
- }
- }
- .ant-table-tbody > tr > td .button {
- .ant-btn {
- margin-bottom: 10px;
- }
+ // .ant-table-tbody > tr > td .content {
+ // p {
+ // margin-bottom: 2px;
+ // }
+ // span {
+ // display: inline-block;
+ // margin-right: 5px;
+ // }
+ // }
+ // .ant-table-tbody > tr > td .button {
+ // .ant-btn {
+ // margin-bottom: 10px;
+ // }
+ // }
+ }
+ }
+ .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;
+ }
+ }
+ .ant-table-small.ant-table-bordered {
+ border-right: 1px solid #e8e8e8;
+
+ .ant-table-content {
+ border-radius: inherit;
+
+ .ant-table-scroll {
+ border-radius: inherit;
}
}
}
+
+ table, tr, th, td, .ant-table-small {
+ border-color: var(--mk-table-border-color)!important;
+ }
+ table tr {
+ th .ant-table-column-title {
+ font-size: var(--mk-table-font-size)!important;
+ font-weight: var(--mk-table-font-weight)!important;
+ }
+ td {
+ 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;
+ }
+ }
+ }
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
+
+ .mk-tree-node {
+ display: inline-block;
+ text-align: right;
+ --tree-node-width: 18px;
+
+ .anticon-caret-right, .anticon-caret-down {
+ cursor: pointer;
+ padding-right: 3px;
+ }
+ .anticon-caret-down {
+ display: none;
+ }
+ }
+ .mk-tree-open {
+ .mk-tree-node {
+ .anticon-caret-right {
+ display: none;
+ }
+ .anticon-caret-down {
+ display: inline-block;
+ }
+ }
+ }
+ .mk-tree-hide {
+ display: none;
+ }
+ .mk-tree-td {
+ overflow: hidden;
+ word-break: break-word;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ .mk-tree-pagination {
+ float: right;
+ margin: 16px 0;
+ }
+}
+.normal-custom-table.mk-parity {
+ .ant-table-tbody tr:nth-child(even) {
+ background: #fafafa;
+ }
+}
+.normal-custom-table:not(.ghost) {
+ .ant-table-small > .ant-table-content .ant-table-thead > tr > th {
+ background-color: #fafafa!important;
+ }
+}
+.normal-custom-table:not(.fixed-table-height) {
.ant-table-body::-webkit-scrollbar {
width: 8px;
height: 10px;
@@ -138,18 +264,96 @@
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.hidden {
+ thead {
+ display: none;
+ }
+}
+.normal-custom-table.mk-fixed-last-col {
+ table {
+ .ant-table-thead {
+ tr:first-child {
+ th:last-child {
+ position: sticky !important;
+ z-index: 2;
+ right: 0px;
+ box-shadow: 0 1px 1px #bcbcbc;
+ }
+ }
}
- .ant-table-placeholder {
- display: none;
+ .ant-table-tbody {
+ tr {
+ td:last-child {
+ position: sticky !important;
+ z-index: 2;
+ right: 0px;
+ background: #ffffff;
+ box-shadow: 0 1px 1px #bcbcbc;
+ }
+ }
}
- .ant-table-wrapper {
- display: none;
+ }
+}
+.normal-custom-table.mk-fixed-first-col {
+ table {
+ .ant-table-thead {
+ tr:first-child {
+ th:first-child {
+ position: sticky !important;
+ z-index: 2;
+ left: 0px;
+ }
+ th.ant-table-selection-column + th {
+ position: sticky !important;
+ z-index: 2;
+ left: 60px;
+ }
+ }
}
- .ant-affix .ant-table-wrapper {
- display: block;
+ .ant-table-tbody {
+ tr {
+ td:first-child {
+ position: sticky !important;
+ z-index: 2;
+ left: 0px;
+ background: #ffffff;
+ }
+ td.ant-table-selection-column + td{
+ position: sticky !important;
+ z-index: 2;
+ left: 60px;
+ background: #ffffff;
+ }
+ }
+ }
+ }
+}
+.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;
+ }
+ }
+ > th:hover {
+ background: transparent;
+ }
+ }
+ .ant-table-body {
+ overflow-x: auto;
+ tr {
+ td {
+ background: transparent!important;
+ }
+ }
+ tr:hover td {
+ background: transparent!important;
}
}
}
--
Gitblit v1.8.0