fix(button): fix status style repeat

ecaps1038 · Mar 22, 2024 · f70340e · f70340e
1 parent 9ad8b2e
commit f70340e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/packages/yike-design-ui/components/button/style/index.less b/packages/yike-design-ui/components/button/style/index.less
@@ -1,6 +1,10 @@
 @import '../../styles/mixin.less';
 @import './variables.less';
 
+@typeList: secondary, outline;
+@statusList: primary, success, warning, danger;
+@sizeList: s, m, xl;
+
 .yk-button {
   display: inline-flex;
   justify-content: center;
@@ -12,7 +16,6 @@
   box-sizing: border-box;
   cursor: pointer;
   user-select: none;
-
   .btn-type();
   .btn-size();
 
@@ -32,6 +35,13 @@
     }
   }
 
+  // yk-button--[status]
+  each(@statusList, {
+    &--@{value} {
+      .btn-status(primary, @value);
+    }
+  });
+
   .genTypeAndStatus();
   .gen-size();
 
@@ -57,8 +67,6 @@
 }
 
 .genTypeAndStatus() {
-  @typeList: secondary, outline;
-
   each(@typeList, {
     &--@{value} {
       .btn-type(@value);
@@ -74,15 +82,10 @@
     &--@{type}.yk-button--@{value} {
       .btn-status(@type, @value);
     }
-    &--@{value} {
-      .btn-status(primary, @value);
-    }
   });
 }
 
 .gen-size() {
-  @sizeList: s, m, xl;
-
   each(@sizeList, {
     &--@{value} {
       .btn-size(@value);