From 99dfce0de93cfcfaf4ec80bf0bd63fbcc7e30004 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十一月 2022 13:07:38 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/basetable/index.scss |  146 +++++++++++-------------------------------------
 1 files changed, 33 insertions(+), 113 deletions(-)

diff --git a/src/tabviews/basetable/index.scss b/src/tabviews/basetable/index.scss
index 242cdf2..4a12545 100644
--- a/src/tabviews/basetable/index.scss
+++ b/src/tabviews/basetable/index.scss
@@ -1,21 +1,20 @@
-.commontable {
+.custom-table-wrap {
   position: relative;
   min-height: calc(100vh - 94px);
+  height: 100%;
   padding-top: 16px;
-  padding-bottom: 0px;
+  padding-bottom: 80px;
+  padding-left: 16px;
+  padding-right: 16px;
+  background-size: 100%;
+  
+  .component-wrap >.ant-col {
+    min-height: 0;
+  }
   .box404 {
     padding-top: 30px;
   }
-  >.top-search {
-    padding: 0px 24px 5px;
-    border-bottom: 1px solid #efefef;
-  }
-  .commontable-main-action {
-    min-height: 25px;
-    .button-list {
-      padding-right: 60px;
-    }
-  }
+
   .ant-modal-mask {
     position: absolute;
   }
@@ -32,109 +31,30 @@
   > .ant-spin {
     position: absolute;
     z-index: 10;
-    left: calc(50% - 22px);
+    left: calc(50% - 16px);
     top: calc(50vh - 70px);
   }
-  > .ant-card {
-    margin: 0 20px 20px;
-    > .ant-card-head {
-      border: 0;
-      padding: 0;
-      min-height: 30px;
-      .ant-card-head-title {
-        padding: 10px 0 0;
-        span {
-          color: #1890ff;
-          display: inline-block;
-          padding: 0 10px;
-          font-size: 15px;
-          border-bottom: 1px solid #1890ff;
-          .anticon {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-    > .ant-card-body {
-      padding: 0;
+  
+  .common-table-copy {
+    position: fixed;
+    z-index: 2;
+    bottom: 65px;
+    right: 30px;
+    width: 40px;
+    height: 40px;
+  }
+  .ant-btn-link:hover {
+    opacity: 0.8;
+  }
+  .button-list.toolbar-button {
+    button {
+      height: auto;
+      min-height: 28px;
     }
   }
-  .main-table-box {
-    position: relative;
-    .main-pickup {
-      position: absolute;
-      right: 0px;
-      top: -22px;
-      z-index: 1;
-    }
-    >.async-spin {
-      line-height: 150px!important;
-    }
+}
+.custom-table-wrap.loading {
+  .ant-spin-spinning:not(.view-spin) {
+    display: none;
   }
-  > .ant-tabs {
-    width: 100%;
-    padding: 0px 20px;
-    margin-bottom: 20px;
-    .ant-tabs-tab:not(.ant-tabs-tab-active) {
-      cursor: pointer;
-    }
-    .ant-tabs-tab.ant-tabs-tab-active {
-      cursor: default;
-    }
-  }
-  .ant-table-fixed-left, .ant-table-fixed-right {
-    z-index: 1;
-  }
-  > .chart-view {
-    position: relative;
-    padding: 0 20px;
-    >.ant-tabs {
-      .ant-tabs-bar {
-        position: relative;
-        z-index: 1;
-        margin: 0;
-        border: 0;
-        .ant-tabs-nav-scroll {
-          text-align: right;
-          padding-right: 20px;
-          .ant-tabs-ink-bar {
-            display: none!important;
-          }
-          .ant-tabs-tab {
-            padding: 6px 5px;
-            margin-right: 5px;
-          }
-        }
-      }
-    }
-    >.ant-col {
-      min-height: 100px;
-    }
-    >.card-view.ant-col-24 {
-      padding: 0!important;
-      .card-row-box {
-        padding: 0;
-      }
-    }
-    .chart-title {
-      position: relative;
-      color: rgba(0, 0, 0, 0.65);
-      font-weight: 400;
-      font-size: 16px;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      margin: 0px;
-      padding: 5px 10px;
-      float: left;
-      max-width: 50%;
-    }
-    .chart-table.chart-title {
-      position: absolute;
-      top: 0px;
-    }
-    .canvas {
-      clear: both;
-    }
-  }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0