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 | 312 ++++++++++++++++++++++------------------------------
1 files changed, 132 insertions(+), 180 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 754dda6..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;
@@ -26,9 +20,9 @@
.mk-edit-sign {
position: absolute;
bottom: 2px;
- right: 5px;
- opacity: 0.7;
- font-size: 14px;
+ right: 3px;
+ opacity: 0.5;
+ font-size: 10px;
}
table {
@@ -72,79 +66,38 @@
// vertical-align: top;
.card-cell-list {
- color: rgba(0, 0, 0, 0.85);
- }
- .ant-mk-picture {
- position: relative;
- background-position: center center;
- background-size: cover;
- margin: 2px;
- }
- .ant-mk-picture.scale {
- cursor: zoom-in;
- }
- .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;
- }
+ color: inherit;
+ 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;
+ // }
+ // }
}
}
@@ -160,6 +113,7 @@
height: auto;
border-radius: 0;
box-shadow: none!important;
+ text-align: inherit;
}
.ant-select {
padding: 0px;
@@ -183,33 +137,45 @@
position: unset;
border: none;
box-shadow: none!important;
+ text-align: inherit;
.ant-input-number-handler-wrap {
display: none;
+ }
+ .ant-input-number-input-wrap {
+ text-align: inherit;
}
.ant-input-number-input {
border-radius: 0;
padding: 0;
height: auto;
position: absolute;
+ text-align: inherit;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
border: 1px solid var(--mk-sys-color);
+ background: #ffffff;
}
}
- .anticon-exclamation-circle {
- color: #ff4d4f;
+ .ant-calendar-picker {
+ display: block;
position: absolute;
- right: 3px;
- top: calc(50% - 8px);
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ }
+ .has-error, .has-error .ant-input-number-input {
+ border-color: #ff4d4f!important;
}
}
.editing_all_table_cell {
.ant-input {
border-radius: 0;
padding: 4px 5px;
+ text-align: inherit;
}
.ant-select {
width: 100%;
@@ -219,28 +185,31 @@
}
.ant-input-number {
border-radius: 0;
+ text-align: inherit;
.ant-input-number-handler-wrap {
display: none;
}
+ .ant-input-number-input-wrap {
+ text-align: inherit;
+ }
.ant-input-number-input {
border-radius: 0;
padding: 4px 5px;
+ text-align: inherit;
}
}
- .anticon-exclamation-circle {
- color: #ff4d4f;
- position: absolute;
- right: 13px;
- top: calc(50% - 8px);
+ .ant-calendar-picker {
+ display: block;
+ height: 30px;
+ }
+ .has-error, .has-error .ant-input-number-input {
+ border-color: #ff4d4f!important;
}
}
td.pointer {
position: relative;
- }
- td.pointer {
.mk-mask {
- display: none;
cursor: pointer;
position: absolute;
top: 0;
@@ -249,45 +218,11 @@
right: 0;
}
}
- .mk-editable {
- position: absolute;
- display: none;
- top: calc(50% - 18px);
- cursor: pointer;
- padding: 10px 5px;
- opacity: 0;
- }
- tr:hover {
- .mk-editable {
- opacity: 1;
- }
- .mk-plus {
- left: -25px;
- }
- .mk-del {
- right: -25px;
- }
- }
- .mk-plus {
- left: 0px;
- color: rgb(38, 194, 129);
- padding-right: 10px;
- }
- .mk-del {
- right: 0px;
- color: rgb(255, 77, 79);
- padding-left: 10px;
- }
- .mk-add-line {
- width: 100px;
- color: #26C281;
- border-radius: 0;
- font-size: 25px;
- height: 45px;
- }
+
.submit-footer-table {
float: right;
- min-height: 24px;
+ min-height: 28px;
+ min-width: 65px;
height: auto;
color: #ffffff;
background-color: #1890ff;
@@ -295,18 +230,29 @@
margin-top: 10px!important;
margin-right: 10px!important;
}
+ .ant-table-small.ant-table-bordered {
+ border-right: 1px solid #e8e8e8;
- table, tr, th, td {
+ .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) {
- // 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;
@@ -315,35 +261,48 @@
}
}
}
+ table tbody tr {
+ color: var(--mk-table-color);
+ }
+ // .ant-table-bordered {
+ // table {
+ // tbody {
+ // tr:last-child {
+ // td {
+ // border-bottom: none;
+ // }
+ // }
+ // }
+ // }
+ // }
}
-.edit-custom-table.buoyMode {
- .ant-table-scroll {
- overflow: unset;
- overflow-x: unset;
-
- .ant-table-body {
- overflow-x: unset!important;
- }
+.edit-custom-table.mk-parity {
+ .ant-table-tbody tr:nth-child(even) {
+ background: #fafafa;
+ }
+}
+.edit-custom-table.mk-edit-simple {
+ table tbody tr td {
+ min-height: 32px;
+ height: 32px;
+ }
+}
+.edit-custom-table.mk-edit-multi {
+ th .ant-table-column-title .anticon-edit {
+ display: none;
}
}
.edit-custom-table.editable {
- td {
- background-color: #ffffff!important;
- }
- td.pointer .mk-mask {
- display: block;
- }
- .mk-operation {
- display: none;
- }
.ant-table-placeholder {
display: none;
}
- .mk-editable {
- display: inline-block;
+}
+.edit-custom-table:not(.ghost) {
+ .ant-table-small > .ant-table-content .ant-table-thead > tr > th {
+ 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;
@@ -358,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 {
@@ -425,36 +376,37 @@
}
.edit-custom-table-btn-wrap {
float: right;
- padding: 5px 0px;
- .main-pickup {
- position: relative;
- z-index: 2;
- }
.submit-table {
position: relative;
z-index: 2;
+ min-width: 65px;
margin-right: 15px;
- min-height: 24px;
- height: auto;
- color: #ffffff;
- background-color: #1890ff;
- border-width: 0;
- margin-top: 0px!important;
- margin-bottom: 0px!important;
- }
-}
-.edit-custom-table-leftbtn-wrap {
- float: left;
- line-height: 45px;
- .submit-table {
- position: relative;
- z-index: 2;
min-height: 28px;
height: auto;
color: #ffffff;
background-color: #1890ff;
border-width: 0;
- margin-top: 0px;
- margin-bottom: 0px;
+ 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