From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 196 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 51 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 92c6847..971228d 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -1,6 +1,11 @@
.edit-custom-table {
position: relative;
+ min-height: 150px;
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;
@@ -17,6 +22,13 @@
.ant-table {
color: inherit;
font-size: inherit;
+ }
+ .mk-edit-sign {
+ position: absolute;
+ bottom: 2px;
+ right: 5px;
+ opacity: 0.7;
+ font-size: 14px;
}
table {
@@ -61,15 +73,6 @@
.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 {
@@ -135,28 +138,7 @@
}
}
}
- .ant-input {
- border: none;
- box-shadow: none!important;
- height: auto;
- border-radius: 0;
- }
- .ant-input-number {
- border: none;
- box-shadow: none!important;
- height: auto;
- border-radius: 0;
- position: unset;
-
- .ant-input-number-handler-wrap {
- display: none;
- }
- .ant-input-number-input {
- border-radius: 0;
- padding: 0;
- height: auto;
- }
- }
+
.editing_table_cell {
.ant-input {
padding: 0px;
@@ -165,7 +147,10 @@
left: 0px;
right: 0px;
bottom: 0px;
- border: 1px solid #1890ff;
+ border: 1px solid var(--mk-sys-color);
+ height: auto;
+ border-radius: 0;
+ box-shadow: none!important;
}
.ant-select {
padding: 0px;
@@ -183,18 +168,61 @@
}
}
}
- .ant-input-number-input {
- position: absolute;
- top: 0px;
- left: 0px;
- right: 0px;
- bottom: 0px;
- border: 1px solid #1890ff;
+ .ant-input-number {
+ height: auto;
+ border-radius: 0;
+ position: unset;
+ border: none;
+ box-shadow: none!important;
+
+ .ant-input-number-handler-wrap {
+ display: none;
+ }
+ .ant-input-number-input {
+ border-radius: 0;
+ padding: 0;
+ height: auto;
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ border: 1px solid var(--mk-sys-color);
+ }
}
- .anticon {
+ .anticon-exclamation-circle {
color: #ff4d4f;
position: absolute;
right: 3px;
+ top: calc(50% - 8px);
+ }
+ }
+ .editing_all_table_cell {
+ .ant-input {
+ border-radius: 0;
+ padding: 4px 5px;
+ }
+ .ant-select {
+ width: 100%;
+ .ant-select-selection {
+ border-radius: 0;
+ }
+ }
+ .ant-input-number {
+ border-radius: 0;
+
+ .ant-input-number-handler-wrap {
+ display: none;
+ }
+ .ant-input-number-input {
+ border-radius: 0;
+ padding: 4px 5px;
+ }
+ }
+ .anticon-exclamation-circle {
+ color: #ff4d4f;
+ position: absolute;
+ right: 13px;
top: calc(50% - 8px);
}
}
@@ -214,12 +242,11 @@
}
.mk-editable {
position: absolute;
- display: inline-block;
- top: calc(50% - 13px);
+ display: none;
+ top: calc(50% - 18px);
cursor: pointer;
padding: 10px 5px;
opacity: 0;
- // transition: opacity 0.3s 0.1s, left 0.1s;
}
tr:hover {
.mk-editable {
@@ -234,27 +261,50 @@
}
.mk-plus {
left: 0px;
- // left: -25px;
color: rgb(38, 194, 129);
padding-right: 10px;
}
.mk-del {
right: 0px;
- // right: -25px;
color: rgb(255, 77, 79);
padding-left: 10px;
}
.mk-add-line {
- display: block;
- width: 100%;
+ width: 100px;
color: #26C281;
- border: 1px solid #dddddd;
border-radius: 0;
font-size: 25px;
- height: 40px;
+ height: 45px;
}
- .mk-add-line:disabled {
- border-color: #fafafa!important;
+ .submit-footer-table {
+ float: right;
+ min-height: 24px;
+ height: auto;
+ color: #ffffff;
+ background-color: #1890ff;
+ border-width: 0;
+ margin-top: 10px!important;
+ margin-right: 10px!important;
+ }
+
+ table, tr, th, td {
+ border-color: var(--mk-table-border-color)!important;
+ }
+ table tr {
+ 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;
+
+ >span, >div:not(.card-cell-list) div, >div:not(.card-cell-list) span {
+ font-weight: var(--mk-table-font-weight)!important;
+ }
+ }
}
}
.edit-custom-table.buoyMode {
@@ -279,6 +329,9 @@
}
.ant-table-placeholder {
display: none;
+ }
+ .mk-editable {
+ display: inline-block;
}
}
.edit-custom-table:not(.fixed-height) {
@@ -354,4 +407,45 @@
cursor: pointer;
}
}
+}
+.edit-table-dropdown {
+ .ant-select-dropdown-menu-item {
+ white-space: unset;
+ text-overflow: unset;
+ }
+}
+.edit-custom-table-btn-wrap {
+ float: right;
+ padding: 5px 0px;
+ .main-pickup {
+ position: relative;
+ z-index: 2;
+ }
+ .submit-table {
+ position: relative;
+ z-index: 2;
+ 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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0