@nutui/nutui-react 4.0.0-beta.2 → 4.0.0-beta.4

package/dist/cjs/packages/switch/style/style.css

@@ -8,11 +8,13 @@ page {
   --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
 }
 
-/* #ifdef harmony */
-/* #endif */
-/* #ifndef harmony */
-/* #endif */
 .nut-switch {
+  --nut-switch-height: var(--nutui-switch-height, calc(24px * var(--nut-scale-f, 1)));
+  --nut-switch-inside-width: var(--nutui-switch-inside-width, calc(32px * var(--nut-scale-f, 1)));
+  --nut-switch-border-width: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -23,9 +25,8 @@ page {
   /* #endif */
   flex-direction: row;
   align-items: center;
-  min-width: var(--nutui-switch-width, calc(46px * var(--nut-scale-f, 1)));
-  height: var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1)));
-  line-height: var(--nutui-switch-line-height, calc(28px * var(--nut-scale-f, 1)));
+  min-width: var(--nutui-switch-width, calc(56px * var(--nut-scale-f, 1)));
+  height: var(--nutui-switch-height, calc(24px * var(--nut-scale-f, 1)));
   background-color: var(--nutui-switch-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-switch-border-radius, calc(50px * var(--nut-scale-f, 1)));
   background-size: 100% 100%;
@@ -41,39 +42,39 @@ page {
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  height: calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2);
-  width: calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2);
-  border-radius: var(--nutui-switch-inside-border-radius, 50%);
-  background: #ffffff;
+  height: var(--nutui-switch-inside-height, calc(20px * var(--nut-scale-f, 1)));
+  width: var(--nutui-switch-inside-width, calc(32px * var(--nut-scale-f, 1)));
+  border-radius: var(--nutui-switch-inside-border-radius, calc(50px * var(--nut-scale-f, 1)));
+  background: var(--nutui-color-primary-text, #ffffff);
   transition: left 0.3s linear;
-  box-shadow: var(--nutui-switch-inside-box-shadow, 0px calc(2px * var(--nut-scale-f, 1)) calc(6px * var(--nut-scale-f, 1)) 0px rgba(0, 0, 0, 0.1));
+  box-shadow: var(--nutui-switch-inside-box-shadow, 0px calc(4px * var(--nut-scale-f, 1)) calc(8px * var(--nut-scale-f, 1)) 0px rgba(0, 0, 0, 0.12));
 }
 .nut-switch-button-open {
-  left: calc(100% - var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) + var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-button-open-rtl {
-  left: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close {
-  left: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close-rtl {
-  left: calc(100% - var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) + var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))));
-}
-.nut-switch-button .nut-icon {
-  width: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
-  height: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
-  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-close {
-  background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #c2c4cc));
+  background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #b4b8bf));
 }
 .nut-switch-close-line {
-  width: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
+  width: calc((var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5);
   height: calc(2px * var(--nut-scale-f, 1));
-  background: var(--nutui-switch-inactive-line-background-color, #ffffff);
+  background: var(--nutui-switch-inactive-line-background-color, var(--nutui-color-primary-text, #ffffff));
   border-radius: calc(2px * var(--nut-scale-f, 1));
 }
+.nut-switch .nut-icon {
+  width: calc(var(--nut-switch-height) * 0.5);
+  height: calc(var(--nut-switch-height) * 0.5);
+  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
+}
 .nut-switch-label {
   /* #ifdef dynamic*/
   display: flex;
@@ -84,33 +85,33 @@ page {
   align-items: center;
   height: 100%;
   white-space: nowrap;
-  color: var(--nutui-switch-label-text-color, #ffffff);
-  font-size: var(--nutui-switch-label-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  color: var(--nutui-switch-label-text-color, var(--nutui-color-primary-text, #ffffff));
+  font-size: var(--nutui-switch-label-font-size, var(--nutui-font-size-xs, calc(11px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-switch-label .nut-icon {
-  color: var(--nutui-switch-label-text-color, #ffffff);
+  color: var(--nutui-switch-label-text-color, var(--nutui-color-primary-text, #ffffff));
 }
 .nut-switch-label-open {
-  margin: 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1)) 0 calc(7px * var(--nut-scale-f, 1));
+  margin: 0 var(--nut-switch-label-margin-offset) 0 calc(7px * var(--nut-scale-f, 1));
 }
 .nut-switch-label-open-rtl {
-  margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1));
+  margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close {
-  margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1));
+  margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close-rtl {
-  margin: 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1)) 0 calc(7px * var(--nut-scale-f, 1));
+  margin: 0 var(--nut-switch-label-margin-offset) 0 calc(7px * var(--nut-scale-f, 1));
 }
 .nut-switch-label-close-disabled {
-  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #b4b8bf));
 }
 .nut-switch-label-close-disabled .nut-icon {
-  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #b4b8bf));
 }
 .nut-switch-disabled {
   background-color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
 }
 .nut-switch-disabled-close {
-  background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-color-background, #f2f3f5));
+  background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-color-background-component));
 }

package/dist/cjs/packages/switch/style/switch.scss

@@ -1,4 +1,11 @@
 .nut-switch {
+  --nut-switch-height: #{$switch-height};
+  --nut-switch-inside-width: #{$switch-inside-width};
+  --nut-switch-border-width: #{$switch-border-width};
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
+
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -11,13 +18,12 @@
   align-items: center;
   min-width: $switch-width;
   height: $switch-height;
-  line-height: $switch-line-height;
   background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
-  flex: 0 0 auto; // 防止被压缩
+  flex: 0 0 auto;
 
   &-button {
     position: absolute;
@@ -27,41 +33,48 @@
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: calc($switch-height - $switch-border-width * 2);
-    width: calc($switch-height - $switch-border-width * 2);
+    height: $switch-inside-height;
+    width: $switch-inside-width;
     border-radius: $switch-inside-border-radius;
     background: $color-primary-text;
     transition: left 0.3s linear;
     box-shadow: $switch-inside-box-shadow;
     &-open {
-      left: calc(100% - $switch-height + $switch-border-width);
+      left: calc(
+        100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+      );
       &-rtl {
-        left: $switch-border-width;
+        left: var(--nut-switch-border-width);
       }
     }
     &-close {
-      left: $switch-border-width;
+      left: var(--nut-switch-border-width);
       &-rtl {
-        left: calc(100% - $switch-height + $switch-border-width);
+        left: calc(
+          100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+        );
       }
     }
-    .nut-icon {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
-      height: calc(($switch-height - $switch-border-width * 2) / 2);
-      color: $switch-active-disabled-background-color;
-    }
   }
 
   &-close {
     background-color: $switch-inactive-background-color;
     &-line {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
+      width: calc(
+        (var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5
+      );
       height: scale-px(2px);
       background: $switch-inactive-line-background-color;
       border-radius: scale-px(2px);
     }
   }
 
+  .nut-icon {
+    width: calc(var(--nut-switch-height) * 0.5);
+    height: calc(var(--nut-switch-height) * 0.5);
+    color: $switch-active-disabled-background-color;
+  }
+
   &-label {
     /* #ifdef dynamic*/
     display: flex;
@@ -78,16 +91,16 @@
       color: $switch-label-text-color;
     }
     &-open {
-      margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+      margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       &-rtl {
-        margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+        margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       }
     }
 
     &-close {
-      margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+      margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       &-rtl {
-        margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+        margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       }
     }
 

package/dist/cjs/packages/switch/style-jmapp/style.css

@@ -3,6 +3,12 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-switch {
+  --nut-switch-height: var(--nutui-switch-height, 24px);
+  --nut-switch-inside-width: var(--nutui-switch-inside-width, 20px);
+  --nut-switch-border-width: var(--nutui-switch-border-width, 2px);
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -15,7 +21,6 @@
   align-items: center;
   min-width: var(--nutui-switch-width, 40px);
   height: var(--nutui-switch-height, 24px);
-  line-height: var(--nutui-switch-line-height, 24px);
   background-color: var(--nutui-switch-active-background-color, var(--nutui-color-primary));
   border-radius: var(--nutui-switch-border-radius, 24px);
   background-size: 100% 100%;
@@ -31,39 +36,39 @@
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  height: calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2);
-  width: calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2);
+  height: var(--nutui-switch-inside-height, 20px);
+  width: var(--nutui-switch-inside-width, 20px);
   border-radius: var(--nutui-switch-inside-border-radius, var(--nutui-radius-s));
   background: var(--nutui-color-text-dark);
   transition: left 0.3s linear;
   box-shadow: var(--nutui-switch-inside-box-shadow, 0px 2px 6px 0px rgba(0, 0, 0, 0.1));
 }
 .nut-switch-button-open {
-  left: calc(100% - var(--nutui-switch-height, 24px) + var(--nutui-switch-border-width, 2px));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-button-open-rtl {
-  left: var(--nutui-switch-border-width, 2px);
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close {
-  left: var(--nutui-switch-border-width, 2px);
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close-rtl {
-  left: calc(100% - var(--nutui-switch-height, 24px) + var(--nutui-switch-border-width, 2px));
-}
-.nut-switch-button .nut-icon {
-  width: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
-  height: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
-  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-close {
   background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-default));
 }
 .nut-switch-close-line {
-  width: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
+  width: calc((var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5);
   height: scale-px(2px);
   background: var(--nutui-switch-inactive-line-bg-color, #fff);
   border-radius: scale-px(2px);
 }
+.nut-switch .nut-icon {
+  width: calc(var(--nut-switch-height) * 0.5);
+  height: calc(var(--nut-switch-height) * 0.5);
+  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled));
+}
 .nut-switch-label {
   /* #ifdef dynamic*/
   display: flex;
@@ -81,16 +86,16 @@
   color: var(--nutui-switch-label-text-color, var(--nutui-color-text-dark));
 }
 .nut-switch-label-open {
-  margin: 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px)) 0 scale-px(7px);
+  margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
 }
 .nut-switch-label-open-rtl {
-  margin: 0 scale-px(7px) 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px));
+  margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close {
-  margin: 0 scale-px(7px) 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px));
+  margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close-rtl {
-  margin: 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px)) 0 scale-px(7px);
+  margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
 }
 .nut-switch-label-close-disabled {
   color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled));

package/dist/cjs/packages/switch/style-jmapp/switch.scss

@@ -1,4 +1,11 @@
 .nut-switch {
+  --nut-switch-height: #{$switch-height};
+  --nut-switch-inside-width: #{$switch-inside-width};
+  --nut-switch-border-width: #{$switch-border-width};
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
+
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -11,13 +18,12 @@
   align-items: center;
   min-width: $switch-width;
   height: $switch-height;
-  line-height: $switch-line-height;
   background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
-  flex: 0 0 auto; // 防止被压缩
+  flex: 0 0 auto;
 
   &-button {
     position: absolute;
@@ -27,41 +33,48 @@
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: calc($switch-height - $switch-border-width * 2);
-    width: calc($switch-height - $switch-border-width * 2);
+    height: $switch-inside-height;
+    width: $switch-inside-width;
     border-radius: $switch-inside-border-radius;
     background: $color-primary-text;
     transition: left 0.3s linear;
     box-shadow: $switch-inside-box-shadow;
     &-open {
-      left: calc(100% - $switch-height + $switch-border-width);
+      left: calc(
+        100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+      );
       &-rtl {
-        left: $switch-border-width;
+        left: var(--nut-switch-border-width);
       }
     }
     &-close {
-      left: $switch-border-width;
+      left: var(--nut-switch-border-width);
       &-rtl {
-        left: calc(100% - $switch-height + $switch-border-width);
+        left: calc(
+          100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+        );
       }
     }
-    .nut-icon {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
-      height: calc(($switch-height - $switch-border-width * 2) / 2);
-      color: $switch-active-disabled-background-color;
-    }
   }
 
   &-close {
     background-color: $switch-inactive-background-color;
     &-line {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
+      width: calc(
+        (var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5
+      );
       height: scale-px(2px);
       background: $switch-inactive-line-background-color;
       border-radius: scale-px(2px);
     }
   }
 
+  .nut-icon {
+    width: calc(var(--nut-switch-height) * 0.5);
+    height: calc(var(--nut-switch-height) * 0.5);
+    color: $switch-active-disabled-background-color;
+  }
+
   &-label {
     /* #ifdef dynamic*/
     display: flex;
@@ -78,16 +91,16 @@
       color: $switch-label-text-color;
     }
     &-open {
-      margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+      margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       &-rtl {
-        margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+        margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       }
     }
 
     &-close {
-      margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+      margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       &-rtl {
-        margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+        margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       }
     }
 

package/dist/cjs/packages/switch/style-jrkf/style.css

@@ -3,6 +3,12 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-switch {
+  --nut-switch-height: var(--nutui-switch-height, 24px);
+  --nut-switch-inside-width: var(--nutui-switch-inside-width, 20px);
+  --nut-switch-border-width: var(--nutui-switch-border-width, 2px);
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -15,7 +21,6 @@
   align-items: center;
   min-width: var(--nutui-switch-width, 40px);
   height: var(--nutui-switch-height, 24px);
-  line-height: var(--nutui-switch-line-height, 24px);
   background-color: var(--nutui-switch-active-background-color, var(--nutui-color-primary, #ff6666));
   border-radius: var(--nutui-switch-border-radius, 24px);
   background-size: 100% 100%;
@@ -31,39 +36,39 @@
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  height: calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2);
-  width: calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2);
+  height: var(--nutui-switch-inside-height, 20px);
+  width: var(--nutui-switch-inside-width, 20px);
   border-radius: var(--nutui-switch-inside-border-radius, var(--nutui-radius-s));
   background: var(--nutui-color-text-dark);
   transition: left 0.3s linear;
   box-shadow: var(--nutui-switch-inside-box-shadow, 0px 2px 6px 0px rgba(0, 0, 0, 0.1));
 }
 .nut-switch-button-open {
-  left: calc(100% - var(--nutui-switch-height, 24px) + var(--nutui-switch-border-width, 2px));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-button-open-rtl {
-  left: var(--nutui-switch-border-width, 2px);
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close {
-  left: var(--nutui-switch-border-width, 2px);
+  left: var(--nut-switch-border-width);
 }
 .nut-switch-button-close-rtl {
-  left: calc(100% - var(--nutui-switch-height, 24px) + var(--nutui-switch-border-width, 2px));
-}
-.nut-switch-button .nut-icon {
-  width: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
-  height: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
-  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ffadbe));
+  left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
 }
 .nut-switch-close {
   background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled));
 }
 .nut-switch-close-line {
-  width: calc((var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
+  width: calc((var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5);
   height: scale-px(2px);
   background: var(--nutui-switch-inactive-line-background-color, #ffffff);
   border-radius: scale-px(2px);
 }
+.nut-switch .nut-icon {
+  width: calc(var(--nut-switch-height) * 0.5);
+  height: calc(var(--nut-switch-height) * 0.5);
+  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ffadbe));
+}
 .nut-switch-label {
   /* #ifdef dynamic*/
   display: flex;
@@ -81,16 +86,16 @@
   color: var(--nutui-switch-label-text-color, var(--nutui-color-text-dark));
 }
 .nut-switch-label-open {
-  margin: 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px)) 0 scale-px(7px);
+  margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
 }
 .nut-switch-label-open-rtl {
-  margin: 0 scale-px(7px) 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px));
+  margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close {
-  margin: 0 scale-px(7px) 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px));
+  margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
 }
 .nut-switch-label-close-rtl {
-  margin: 0 calc(var(--nutui-switch-height, 24px) - var(--nutui-switch-border-width, 2px) + scale-px(3px)) 0 scale-px(7px);
+  margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
 }
 .nut-switch-label-close-disabled {
   color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled));

package/dist/cjs/packages/switch/style-jrkf/switch.scss

@@ -1,4 +1,11 @@
 .nut-switch {
+  --nut-switch-height: #{$switch-height};
+  --nut-switch-inside-width: #{$switch-inside-width};
+  --nut-switch-border-width: #{$switch-border-width};
+  --nut-switch-label-margin-offset: calc(
+    var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
+  );
+
   cursor: pointer;
   position: relative;
   /* #ifdef dynamic*/
@@ -11,13 +18,12 @@
   align-items: center;
   min-width: $switch-width;
   height: $switch-height;
-  line-height: $switch-line-height;
   background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
-  flex: 0 0 auto; // 防止被压缩
+  flex: 0 0 auto;
 
   &-button {
     position: absolute;
@@ -27,41 +33,48 @@
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: calc($switch-height - $switch-border-width * 2);
-    width: calc($switch-height - $switch-border-width * 2);
+    height: $switch-inside-height;
+    width: $switch-inside-width;
     border-radius: $switch-inside-border-radius;
     background: $color-primary-text;
     transition: left 0.3s linear;
     box-shadow: $switch-inside-box-shadow;
     &-open {
-      left: calc(100% - $switch-height + $switch-border-width);
+      left: calc(
+        100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+      );
       &-rtl {
-        left: $switch-border-width;
+        left: var(--nut-switch-border-width);
       }
     }
     &-close {
-      left: $switch-border-width;
+      left: var(--nut-switch-border-width);
       &-rtl {
-        left: calc(100% - $switch-height + $switch-border-width);
+        left: calc(
+          100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
+        );
       }
     }
-    .nut-icon {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
-      height: calc(($switch-height - $switch-border-width * 2) / 2);
-      color: $switch-active-disabled-background-color;
-    }
   }
 
   &-close {
     background-color: $switch-inactive-background-color;
     &-line {
-      width: calc(($switch-height - $switch-border-width * 2) / 2);
+      width: calc(
+        (var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5
+      );
       height: scale-px(2px);
       background: $switch-inactive-line-background-color;
       border-radius: scale-px(2px);
     }
   }
 
+  .nut-icon {
+    width: calc(var(--nut-switch-height) * 0.5);
+    height: calc(var(--nut-switch-height) * 0.5);
+    color: $switch-active-disabled-background-color;
+  }
+
   &-label {
     /* #ifdef dynamic*/
     display: flex;
@@ -78,16 +91,16 @@
       color: $switch-label-text-color;
     }
     &-open {
-      margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+      margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       &-rtl {
-        margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+        margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       }
     }
 
     &-close {
-      margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
+      margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
       &-rtl {
-        margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
+        margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
       }
     }
 

package/dist/cjs/packages/tabbar/style/style.css

@@ -8,10 +8,6 @@ page {
   --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
 }
 
-/* #ifdef harmony */
-/* #endif */
-/* #ifndef harmony */
-/* #endif */
 .nut-tabbar {
   border: 0;
   box-shadow: var(--nutui-tabbar-box-shadow, none);

package/dist/cjs/packages/tabbaritem/style/style.css

@@ -8,10 +8,6 @@ page {
   --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
 }
 
-/* #ifdef harmony */
-/* #endif */
-/* #ifndef harmony */
-/* #endif */
 .nut-tabbar-item {
   display: flex;
   flex-direction: column;