From f4cb5400349af359b8efc80b423240ab477a14cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 14 Jun 2021 10:33:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-react/src/assets/style/lib/form.less      | 35 ++++---------------
 web-react/src/assets/style/lib/scrollbar.less |  6 ++--
 web-react/src/assets/style/main.less          | 32 ++++++++++++++---
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/web-react/src/assets/style/lib/form.less b/web-react/src/assets/style/lib/form.less
index fdb8800..7725cf9 100644
--- a/web-react/src/assets/style/lib/form.less
+++ b/web-react/src/assets/style/lib/form.less
@@ -43,10 +43,9 @@
     .ant-input,
     .ant-input-number,
     .ant-mentions,
-    .ant-select-selection,
+    .ant-select-selector,
     .ant-input-group-addon,
-    .ant-cascader-picker,
-    .ant-cascader-input.ant-input {
+    .ant-cascader-picker {
       z-index: 1;
 
       text-align: left;
@@ -115,45 +114,26 @@
       }
     }
   }
-  .ant-form-item-control-wrapper {
+  .ant-form-item-control {
     flex: 0 0 61.8%;
 
     width: 61.8%;
     min-width: 220px;
   }
   .yo-form--fluid {
-    .ant-form-item-control-wrapper {
+    .ant-form-item-control {
       flex: 0 0 100%;
 
       width: 100%;
     }
   }
   .yo-form--short {
-    .ant-form-item-control-wrapper {
+    .ant-form-item-control {
       flex: 0 0 38.2%;
 
       width: 38.2%;
     }
   }
-  .ant-form-explain {
-    font-size: @font-size-base - 1px;
-
-    margin-top: @padding-xs;
-    margin-bottom: @padding-xxs;
-    margin-left: -61.8%;
-
-    transition: none;
-    animation: none;
-    text-align: left;
-
-    opacity: 1;
-    color: fade(darken(@primary-color, 38.2%), 61.8%);
-  }
-  .has-error {
-    .ant-form-explain {
-      color: @error-color;
-    }
-  }
   // 上下布局
   .yo-form--vertical {
     display: block;
@@ -305,16 +285,13 @@
     line-height: 1.5;
 
     margin-right: @padding-xs;
-    padding-top: @padding-sm - 2px;
 
     white-space: normal;
   }
 }
 .ant-form-item-required {
   &::before {
-    margin-top: -4px;
-
-    content: '';
+    content: '' !important;
     vertical-align: middle;
 
     border-top: 4px solid transparent;
diff --git a/web-react/src/assets/style/lib/scrollbar.less b/web-react/src/assets/style/lib/scrollbar.less
index 2afa697..bcdea38 100644
--- a/web-react/src/assets/style/lib/scrollbar.less
+++ b/web-react/src/assets/style/lib/scrollbar.less
@@ -3,12 +3,12 @@
   width: 7px;
   height: 7px;
 
-  background-color: lighten(@primary-color, 35%);
+  background-color: fade(@black, 10%);
 }
 ::-webkit-scrollbar-thumb {
   border-radius: @border-radius-base;
-  background-color: fade(@primary-color, 70%);
+  background-color: fade(@black, 30%);
 }
 ::-webkit-scrollbar-thumb:active {
-  background-color: @primary-color;
+  background-color: fade(@black, 50%);
 }
diff --git a/web-react/src/assets/style/main.less b/web-react/src/assets/style/main.less
index a03a52b..722cbd9 100644
--- a/web-react/src/assets/style/main.less
+++ b/web-react/src/assets/style/main.less
@@ -201,11 +201,16 @@
             &:hover {
               color: @black;
             }
+            .ant-tabs-tab-btn {
+              transition: none;
+            }
             &.ant-tabs-tab-active {
-              color: @white;
               border-color: darken(@primary-color, 10%);
               background-color: @primary-color;
-              .ant-tabs-close-x {
+              .ant-tabs-tab-btn {
+                color: @white;
+              }
+              .ant-tabs-tab-remove {
                 color: fade(@white, 70%);
                 &:hover {
                   color: @white;
@@ -228,6 +233,18 @@
             }
             +.ant-tabs-tab {
               margin-left: 0;
+              &::before {
+                position: absolute;
+                left: -.5px;
+
+                width: 1px;
+                height: 24px;
+
+                content: '';
+                transform: scaleX(.5);
+
+                background: linear-gradient(transparent, fade(@black, 30%), transparent);
+              }
             }
             .ant-dropdown-trigger {
               padding: 0 @padding-md * 2 0 @padding-md;
@@ -237,16 +254,21 @@
                 padding: 0 @padding-lg 0 @padding-md;
               }
             }
-            .ant-tabs-close-x {
+            .ant-tabs-tab-remove {
+              line-height: 28px;
+
               position: absolute;
-              top: 9px;
-              right: 9px;
+              top: 0;
+              right: 0;
 
               margin: 0;
 
               transition: none;
             }
           }
+          .ant-tabs-nav-more {
+            padding: 5px @padding-md;
+          }
         }
       }
       >.yo-tab-external-mount-content {