From 729fb5e7f41f45c6962993d86c3a4eb81c2c784b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:06 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/normalTable/index.scss | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 85 insertions(+), 82 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index 1a1123c..d23ed74 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -13,7 +13,9 @@
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);
@@ -22,13 +24,20 @@
position: absolute;
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 {
@@ -114,85 +123,37 @@
display: none;
}
}
- .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-table-tbody > tr > td[rowspan] {
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.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;
- }
}
- .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;
+ // }
+ // }
}
}
- // .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
@@ -209,6 +170,14 @@
}
.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 {
@@ -231,13 +200,55 @@
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-height) {
+.normal-custom-table:not(.fixed-table-height) {
.ant-table-body::-webkit-scrollbar {
width: 8px;
height: 10px;
@@ -252,14 +263,6 @@
border-radius: 3px;
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
- }
-}
-.normal-custom-table.fixed-height {
- .ant-table-body {
- border-bottom: 1px solid rgba(0, 0, 0, .05);
- .ant-table-fixed {
- border-bottom: 0;
- }
}
}
.normal-custom-table.hidden {
--
Gitblit v1.8.0