From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 172 +++++++++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 84 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 84cb88f..1573c0b 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -7,17 +7,11 @@
--mk-table-font-size: 14px;
--mk-table-font-weight: normal;
- .normal-table-footer {
- padding: 10px 0px;
- color: rgba(0, 0, 0, 0.65);
- }
- .normal-table-footer.pagination {
- position: absolute;
- bottom: 10px;
- }
- >.ant-table-wrapper {
+ .ant-table-wrapper {
position: relative;
- z-index: 1;
+ }
+ .ant-table-placeholder {
+ border-top-color: var(--mk-table-border-color);
}
.ant-table {
color: inherit;
@@ -73,69 +67,37 @@
.card-cell-list {
color: inherit;
- }
- .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;
- }
+ overflow: hidden;
}
}
.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;
+ // }
+ // }
}
}
@@ -194,7 +156,16 @@
right: 0px;
bottom: 0px;
border: 1px solid var(--mk-sys-color);
+ background: #ffffff;
}
+ }
+ .ant-calendar-picker {
+ display: block;
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
}
.has-error, .has-error .ant-input-number-input {
border-color: #ff4d4f!important;
@@ -228,6 +199,10 @@
text-align: inherit;
}
}
+ .ant-calendar-picker {
+ display: block;
+ height: 30px;
+ }
.has-error, .has-error .ant-input-number-input {
border-color: #ff4d4f!important;
}
@@ -257,11 +232,22 @@
}
.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 {
+ position: unset!important;
+ }
th .ant-table-column-title, th .ant-table-column-title span:not(.anticon) {
font-size: var(--mk-table-font-size)!important;
font-weight: var(--mk-table-font-weight)!important;
@@ -278,16 +264,21 @@
table tbody tr {
color: var(--mk-table-color);
}
- .ant-table-bordered {
- table {
- tbody {
- tr:last-child {
- td {
- border-bottom: none;
- }
- }
- }
- }
+ // .ant-table-bordered {
+ // table {
+ // tbody {
+ // tr:last-child {
+ // td {
+ // border-bottom: none;
+ // }
+ // }
+ // }
+ // }
+ // }
+}
+.edit-custom-table.mk-parity {
+ .ant-table-tbody tr:nth-child(even) {
+ background: #fafafa;
}
}
.edit-custom-table.mk-edit-simple {
@@ -311,7 +302,7 @@
background-color: #fafafa!important;
}
}
-.edit-custom-table:not(.fixed-height) {
+.edit-custom-table:not(.fixed-table-height) {
.ant-table-body::-webkit-scrollbar {
width: 8px;
height: 10px;
@@ -326,14 +317,6 @@
border-radius: 3px;
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
- }
-}
-.edit-custom-table.fixed-height {
- .ant-table-body {
- border-bottom: 1px solid rgba(0, 0, 0, .05);
- .ant-table-fixed {
- border-bottom: 0;
- }
}
}
.edit-custom-table.hidden {
@@ -406,3 +389,24 @@
margin-bottom: 10px!important;
}
}
+.mk-user-confirm {
+ top: 30vh;
+
+ .ant-modal-body {
+ font-size: 16px;
+ }
+ .anticon-question-circle {
+ color: orange;
+ font-size: 16px;
+ margin-right: 5px;
+ }
+ .ant-modal-footer {
+ border-top: 0px;
+ padding: 10px 20px 25px 0px;
+ .table-refresh, .table-refresh:hover, .table-refresh:active, .table-refresh:focus {
+ color: #fff!important;
+ background-color: #ff4d4f!important;
+ border-color: #ff4d4f!important;
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0