From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 四月 2024 16:00:49 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/assets/css/viewstyle.scss |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index d924c51..ceedbf9 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -175,8 +175,10 @@
     border-color: $color6;
   }
   // 涓嬫媺妗�
-  .ant-select-selection:hover {
-    border-color: $color5;
+  .ant-select:not(.ant-select-disabled) {
+    .ant-select-selection:hover {
+      border-color: $color5;
+    }
   }
   .ant-select-focused .ant-select-selection, .ant-select-selection:focus, .ant-select-selection:active {
     border-color: $color5;
@@ -187,7 +189,7 @@
     background-color: $color6;
   }
   // 杈撳叆妗�
-  .ant-input:hover {
+  .ant-input:not([disabled]):hover {
     border-color: $color5;
   }
   .ant-input:focus, .ant-input:active {
@@ -198,7 +200,7 @@
     border-color: $color5;
     box-shadow: 0 0 0 2px $color2;
   }
-  .ant-input-number:hover, .ant-input-number:focus, .ant-input-number:active, .ant-input-number-input:hover, .ant-input-number-input:focus, .ant-input-number-input:active, .ant-input-number-focused:hover, .ant-input-number-focused:focus, .ant-input-number-focused:active {
+  .ant-input-number:not(.ant-input-number-disabled):hover, .ant-input-number:focus, .ant-input-number:active, .ant-input-number-input:hover, .ant-input-number-input:focus, .ant-input-number-input:active, .ant-input-number-focused:hover, .ant-input-number-focused:focus, .ant-input-number-focused:active {
     border-color: $color5;
   }
   .ant-input-number:focus, .ant-input-number:active {

--
Gitblit v1.8.0