From 7cc85ad8fff9ed8e2ec829e9ddfdf9fa2a301a14 Mon Sep 17 00:00:00 2001
From: yurj26 <1816387074@qq.com>
Date: Tue, 26 Mar 2024 16:25:17 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat(button):=20=E4=BF=AE=E6=94=B9pla?=
 =?UTF-8?q?in=E6=97=B6=E7=9A=84=E8=BE=B9=E6=A1=86=E5=AE=BD=E5=BA=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a0e8809fc84dff7e5dd89495449a03c5df9f28b3.
---
 src/core/view/components/button/index.vue | 79 +++++++++--------------
 1 file changed, 31 insertions(+), 48 deletions(-)

diff --git a/src/core/view/components/button/index.vue b/src/core/view/components/button/index.vue
index df1997ebef..e6c8447526 100644
--- a/src/core/view/components/button/index.vue
+++ b/src/core/view/components/button/index.vue
@@ -178,6 +178,7 @@ export default {
     line-height: 2.55555556;
     border-radius: 5px;
     -webkit-tap-highlight-color: transparent;
+    overflow: hidden;
     color: #000000;
     background-color: #f8f8f8;
     cursor: pointer;
@@ -261,62 +262,66 @@ export default {
 
   uni-button[type="primary"][plain] {
     color: #007aff;
+    border: 1px solid #007aff;
     background-color: transparent;
   }
 
   uni-button[type="primary"][plain][disabled] {
     color: rgba(0, 0, 0, 0.2);
+    border-color: rgba(0, 0, 0, 0.2);
   }
 
   uni-button[type="primary"][plain]:after {
-    border-color:#007aff;
+    border-width: 0;
   }
 
   uni-button[type="default"][plain] {
     color: #353535;
+    border: 1px solid #353535;
     background-color: transparent;
   }
 
   uni-button[type="default"][plain][disabled] {
     color: rgba(0, 0, 0, 0.2);
+    border-color: rgba(0, 0, 0, 0.2);
   }
 
   uni-button[type="default"][plain]:after {
-    border-color: #353535;
+    border-width: 0;
   }
 
-  uni-button[plain][native] .uni-button-cover-view-inner {
-    padding: 0;
-  }
-
-  uni-button[type="warn"][plain] {
-    color: #e64340;
+  uni-button[plain] {
+    color: #353535;
+    border: 1px solid #353535;
     background-color: transparent;
   }
 
-  uni-button[type="warn"][plain][disabled] {
+  uni-button[plain][disabled] {
     color: rgba(0, 0, 0, 0.2);
+    border-color: rgba(0, 0, 0, 0.2);
   }
 
-  uni-button[type="warn"][plain]:after {
-    border-color: #e64340;
+  uni-button[plain]:after {
+    border-width: 0;
   }
 
-  uni-button[plain] {
-    color: #353535;
-    background-color: transparent;
+  uni-button[plain][native] .uni-button-cover-view-inner {
+    padding: 0;
   }
 
-  uni-button[plain][disabled] {
-    color: rgba(0, 0, 0, 0.2);
+  uni-button[type="warn"][plain] {
+    color: #e64340;
+    border: 1px solid #e64340;
+    background-color: transparent;
   }
 
-  uni-button[plain]:after {
-    border-color: #353535;
+  uni-button[type="warn"][plain][disabled] {
+    color: rgba(0, 0, 0, 0.2);
+    border-color: rgba(0, 0, 0, 0.2);
   }
 
-  uni-button[plain][disabled]:after {
-    border-color: rgba(0, 0, 0, 0.2);
+  uni-button[type="warn"][plain]:after {
+    border-width: 0;
   }
 
   uni-button[size="mini"] {
@@ -390,11 +395,8 @@ export default {
 
   .button-hover[plain] {
     color: rgba(53, 53, 53, 0.6);
-    background-color: transparent;
-  }
-
-  .button-hover[plain]:after {
     border-color: rgba(53, 53, 53, 0.6);
+    background-color: transparent;
   }
 
   .button-hover[type="primary"] {
@@ -404,11 +406,8 @@ export default {
 
   .button-hover[type="primary"][plain] {
     color: rgba(0, 122, 255, 0.6);
-    background-color: transparent;
-  }
-
-  .button-hover[type="primary"][plain]:after {
     border-color: rgba(0, 122, 255, 0.6);
+    background-color: transparent;
   }
 
   .button-hover[type="default"] {
@@ -418,11 +417,8 @@ export default {
 
   .button-hover[type="default"][plain] {
     color: rgba(53, 53, 53, 0.6);
-    background-color: transparent;
-  }
-
-  .button-hover[type="default"][plain]:after {
     border-color: rgba(53, 53, 53, 0.6);
+    background-color: transparent;
   }
 
   .button-hover[type="warn"] {
@@ -432,11 +428,8 @@ export default {
 
   .button-hover[type="warn"][plain] {
     color: rgba(230, 67, 64, 0.6);
-    background-color: transparent;
-  }
-
-  .button-hover[type="warn"][plain]:after {
     border-color: rgba(230, 67, 64, 0.6);
+    background-color: transparent;
   }
 
   @media (prefers-color-scheme: dark) {
@@ -465,10 +458,7 @@ export default {
 
     uni-button[type='default'][plain] {
       color: #d6d6d6;
-    }
-
-    uni-button[type='default'][plain]:after {
-      border-color: #d6d6d6;
+      border: 1px solid #d6d6d6;
     }
 
     .button-hover[type='default'][plain] {
@@ -477,16 +467,9 @@ export default {
       background-color: rgba(50, 50, 50, 0.2);
     }
 
-    .button-hover[type='default'][plain]:after {
-      border-color: rgba(150, 150, 150, 0.6);
-    }
-
     uni-button[type='default'][plain][disabled] {
-      color: hsla(0, 0%, 100%, 0.2);
-    }
-
-    uni-button[type='default'][plain][disabled]:after {
       border-color: hsla(0, 0%, 100%, 0.2);
+      color: hsla(0, 0%, 100%, 0.2);
     }
   }
 </style>
-- 
GitLab