From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.scss |  172 ++++++++++++++++++++++----------------------------------
 1 files changed, 68 insertions(+), 104 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 6d3798c..9fcaf63 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -7,14 +7,6 @@
   --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 {
     position: relative;
     z-index: 1;
@@ -26,9 +18,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 {
@@ -151,6 +143,7 @@
       height: auto;
       border-radius: 0;
       box-shadow: none!important;
+      text-align: inherit;
     }
     .ant-select {
       padding: 0px;
@@ -174,15 +167,20 @@
       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;
@@ -190,17 +188,15 @@
         border: 1px solid var(--mk-sys-color);
       }
     }
-    .anticon-exclamation-circle {
-      color: #ff4d4f;
-      position: absolute;
-      right: 3px;
-      top: calc(50% - 8px);
+    .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%;
@@ -210,28 +206,27 @@
     }
     .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);
+    .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;
@@ -240,45 +235,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;
@@ -286,8 +247,10 @@
     margin-top: 10px!important;
     margin-right: 10px!important;
   }
-
-  table, tr, th, td {
+  .ant-table-small.ant-table-bordered {
+    border-right: 1px solid #e8e8e8;
+  }
+  table, tr, th, td, .ant-table-small {
     border-color: var(--mk-table-border-color)!important;
   }
   table tr {
@@ -307,15 +270,22 @@
   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-edit-simple {
+  table tbody tr td {
+    min-height: 32px;
+    height: 32px;
   }
 }
 .edit-custom-table.mk-edit-multi {
@@ -324,20 +294,13 @@
   }
 }
 .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) {
@@ -422,36 +385,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