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 | 86 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 11 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 05967cd..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;
@@ -23,6 +28,7 @@
bottom: 2px;
right: 5px;
opacity: 0.7;
+ font-size: 14px;
}
table {
@@ -67,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 {
@@ -150,7 +147,7 @@
left: 0px;
right: 0px;
bottom: 0px;
- border: 1px solid var(--antd-wave-shadow-color);
+ border: 1px solid var(--mk-sys-color);
height: auto;
border-radius: 0;
box-shadow: none!important;
@@ -190,7 +187,7 @@
left: 0px;
right: 0px;
bottom: 0px;
- border: 1px solid var(--antd-wave-shadow-color);
+ border: 1px solid var(--mk-sys-color);
}
}
.anticon-exclamation-circle {
@@ -203,6 +200,7 @@
.editing_all_table_cell {
.ant-input {
border-radius: 0;
+ padding: 4px 5px;
}
.ant-select {
width: 100%;
@@ -218,6 +216,7 @@
}
.ant-input-number-input {
border-radius: 0;
+ padding: 4px 5px;
}
}
.anticon-exclamation-circle {
@@ -276,6 +275,36 @@
border-radius: 0;
font-size: 25px;
height: 45px;
+ }
+ .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 {
@@ -384,4 +413,39 @@
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