@nutui/nutui-react-taro 3.0.21-cpp → 3.1.0-beta.2

package/dist/es/packages/actionsheet/style/style.harmony.css

@@ -1,4 +1,14 @@
 @charset "UTF-8";
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -63,7 +73,7 @@
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-base, 14px);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-popup-title {
   display: flex;
@@ -71,7 +81,7 @@
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
-  padding: var(--nutui-popup-title-padding, 11px);
+  padding: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
   position: relative;
 }
 .nut-popup-title-wrapper {
@@ -83,28 +93,31 @@
 .nut-popup-title-title {
   color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-popup-title-description {
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-description-gap {
-  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1))));
 }
 .nut-popup-title-left {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 11px);
-  right: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  display: flex;
+  align-items: center;
+  justify-content: center;
   z-index: 1;
-  width: var(--nutui-popup-icon-size, 20px);
-  height: var(--nutui-popup-icon-size, 20px);
+  width: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
+  height: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
   color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
@@ -112,16 +125,16 @@
   opacity: 0.7;
 }
 .nut-popup-title-right-top-left {
-  top: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-left {
-  bottom: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-right {
-  right: var(--nutui-popup-title-padding, 11px);
-  bottom: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-center {
   top: 50%;
@@ -133,7 +146,7 @@
   transform: translate(-50%, -50%);
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -143,7 +156,7 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0;
 }
 .nut-popup-bottom-top {
   position: absolute;
@@ -157,7 +170,7 @@
   height: 100%;
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-left {
   top: 0;
@@ -168,7 +181,7 @@
   height: 100%;
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0;
 }
 .nut-popup-top {
   top: 0;
@@ -178,7 +191,7 @@
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -360,27 +373,27 @@
 [dir=rtl] .nut-popup-title-left,
 .nut-rtl .nut-popup-title-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right,
 .nut-rtl .nut-popup-title-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-top-left,
 .nut-rtl .nut-popup-title-right-top-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-left,
 .nut-rtl .nut-popup-title-right-bottom-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-right,
 .nut-rtl .nut-popup-title-right-bottom-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title .nut-icon-ArrowLeft,
 .nut-rtl .nut-popup-title .nut-icon-ArrowLeft {
@@ -411,7 +424,7 @@
   background-color: var(--nutui-actionsheet-background-color, var(--nutui-color-background-overlay, #ffffff));
 }
 .nut-actionsheet .nut-popup-title {
-  border-bottom: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-bottom: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-actionsheet-list {
   display: block;
@@ -422,25 +435,25 @@
 }
 .nut-actionsheet-cancel, .nut-actionsheet-item {
   display: block;
-  padding: 10px;
+  padding: calc(10px * var(--nut-scale-f, 1));
   text-align: var(--nutui-actionsheet-item-text-align, center);
-  line-height: var(--nutui-actionsheet-item-line-height, 24px);
-  font-size: var(--nutui-font-size-base, 14px);
+  line-height: var(--nutui-actionsheet-item-line-height, calc(24px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   color: var(--nutui-actionsheet-item-color, var(--nutui-color-title, #1a1a1a));
   cursor: pointer;
 }
 .nut-actionsheet-cancel-name, .nut-actionsheet-item-name {
   text-align: var(--nutui-actionsheet-item-text-align, center);
-  line-height: var(--nutui-actionsheet-item-line-height, 24px);
-  font-size: var(--nutui-font-size-base, 14px);
+  line-height: var(--nutui-actionsheet-item-line-height, calc(24px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   color: var(--nutui-actionsheet-item-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-actionsheet-cancel-description, .nut-actionsheet-item-description {
   display: block;
-  font-size: var(--nutui-font-size-s, 12px);
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   color: var(--nutui-color-text, #505259);
   text-align: var(--nutui-actionsheet-item-text-align, center);
-  line-height: var(--nutui-actionsheet-item-line-height, 24px);
+  line-height: var(--nutui-actionsheet-item-line-height, calc(24px * var(--nut-scale-f, 1)));
 }
 .nut-actionsheet-cancel-danger, .nut-actionsheet-item-danger {
   color: var(--nutui-actionsheet-item-danger, var(--nutui-color-danger, #ff0f23));
@@ -450,8 +463,8 @@
   cursor: not-allowed;
 }
 .nut-actionsheet-cancel {
-  margin-top: 5px;
-  border-top: 1px solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  margin-top: calc(5px * var(--nut-scale-f, 1));
+  border-top: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-actionsheet-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-radius: var(--nutui-actionsheet-border-radius, 0);
 }
 .nut-actionsheet-safe-area {

package/dist/es/packages/actionsheet/style-jmapp/actionsheet.scss

@@ -7,7 +7,7 @@
   }
 
   .nut-popup-title {
-    border-bottom: 1px solid $actionsheet-border-color;
+    border-bottom: scale-px(1px) solid $actionsheet-border-color;
   }
 
   &-list {
@@ -21,7 +21,7 @@
   &-cancel,
   &-item {
     display: block;
-    padding: 10px;
+    padding: scale-px(10px);
     text-align: $actionsheet-item-text-align;
     line-height: $actionsheet-item-line-height;
     font-size: $font-size-base;
@@ -52,8 +52,8 @@
   }
 
   &-cancel {
-    margin-top: 5px;
-    border-top: 1px solid $actionsheet-border-color;
+    margin-top: scale-px(5px);
+    border-top: scale-px(1px) solid $actionsheet-border-color;
     border-radius: $actionsheet-border-radius;
   }
 

package/dist/es/packages/actionsheet/style-jmapp/style.css

@@ -10,7 +10,7 @@
   background-color: var(--nutui-actionsheet-background-color, var(--nutui-color-surface-1));
 }
 .nut-actionsheet .nut-popup-title {
-  border-bottom: 1px solid var(--nutui-actionsheet-border-color, none);
+  border-bottom: scale-px(1px) solid var(--nutui-actionsheet-border-color, none);
 }
 .nut-actionsheet-list {
   display: block;
@@ -21,7 +21,7 @@
 }
 .nut-actionsheet-cancel, .nut-actionsheet-item {
   display: block;
-  padding: 10px;
+  padding: scale-px(10px);
   text-align: var(--nutui-actionsheet-item-text-align, center);
   line-height: var(--nutui-actionsheet-item-line-height, 24px);
   font-size: var(--nutui-font-text);
@@ -49,8 +49,8 @@
   cursor: not-allowed;
 }
 .nut-actionsheet-cancel {
-  margin-top: 5px;
-  border-top: 1px solid var(--nutui-actionsheet-border-color, none);
+  margin-top: scale-px(5px);
+  border-top: scale-px(1px) solid var(--nutui-actionsheet-border-color, none);
   border-radius: var(--nutui-actionsheet-border-radius, var(--nutui-radius-l));
 }
 .nut-actionsheet-safe-area {

package/dist/es/packages/actionsheet/style-jrkf/actionsheet.scss

@@ -7,7 +7,7 @@
   }
 
   .nut-popup-title {
-    border-bottom: 1px solid $actionsheet-border-color;
+    border-bottom: scale-px(1px) solid $actionsheet-border-color;
   }
 
   &-list {
@@ -21,7 +21,7 @@
   &-cancel,
   &-item {
     display: block;
-    padding: 10px;
+    padding: scale-px(10px);
     text-align: $actionsheet-item-text-align;
     line-height: $actionsheet-item-line-height;
     font-size: $font-size-base;
@@ -52,8 +52,8 @@
   }
 
   &-cancel {
-    margin-top: 5px;
-    border-top: 1px solid $actionsheet-border-color;
+    margin-top: scale-px(5px);
+    border-top: scale-px(1px) solid $actionsheet-border-color;
     border-radius: $actionsheet-border-radius;
   }
 

package/dist/es/packages/actionsheet/style-jrkf/style.css

@@ -10,7 +10,7 @@
   background-color: var(--nutui-actionsheet-background-color, var(--nutui-color-surface-1));
 }
 .nut-actionsheet .nut-popup-title {
-  border-bottom: 1px solid var(--nutui-actionsheet-border-color, none);
+  border-bottom: scale-px(1px) solid var(--nutui-actionsheet-border-color, none);
 }
 .nut-actionsheet-list {
   display: block;
@@ -21,7 +21,7 @@
 }
 .nut-actionsheet-cancel, .nut-actionsheet-item {
   display: block;
-  padding: 10px;
+  padding: scale-px(10px);
   text-align: var(--nutui-actionsheet-item-text-align, center);
   line-height: var(--nutui-actionsheet-item-line-height, 24px);
   font-size: var(--nutui-font-text);
@@ -49,8 +49,8 @@
   cursor: not-allowed;
 }
 .nut-actionsheet-cancel {
-  margin-top: 5px;
-  border-top: 1px solid var(--nutui-actionsheet-border-color, none);
+  margin-top: scale-px(5px);
+  border-top: scale-px(1px) solid var(--nutui-actionsheet-border-color, none);
   border-radius: var(--nutui-actionsheet-border-radius, var(--nutui-radius-l));
 }
 .nut-actionsheet-safe-area {

package/dist/es/packages/address/style/address.scss

@@ -1,15 +1,15 @@
 .nut-address {
   &-exist {
     display: block;
-    padding: 15px 20px 0;
-    height: 279px;
+    padding: scale-px(15px) scale-px(20px) 0;
+    height: scale-px(279px);
     overflow-y: auto;
     box-sizing: border-box;
 
     &-item {
       display: flex;
       align-items: center;
-      margin-bottom: 20px;
+      margin-bottom: scale-px(20px);
       font-size: $font-size-s;
       line-height: $font-size-base;
       color: $color-title;
@@ -19,26 +19,26 @@
       }
 
       &-info {
-        margin-left: 9px;
+        margin-left: scale-px(9px);
       }
     }
   }
 
   &-footer {
     width: 100%;
-    height: 54px;
-    padding: 6px 0px 0;
-    border-top: 1px solid $color-border;
+    height: scale-px(54px);
+    padding: scale-px(6px) 0 0;
+    border-top: scale-px(1px) solid $color-border;
 
     &-btn {
       width: 90%;
-      height: 42px;
-      line-height: 42px;
+      height: scale-px(42px);
+      line-height: scale-px(42px);
       margin: auto;
       text-align: center;
       background: $button-primary-background-color;
-      border-radius: 21px;
-      font-size: 15px;
+      border-radius: scale-px(21px);
+      font-size: $font-size-l;
       color: $color-primary-text;
     }
   }
@@ -46,12 +46,12 @@
 
 .nut-address {
   &-title {
-    font-size: 14px;
+    font-size: $font-size-base;
     font-weight: 500;
-    padding: 16px 16px 12px 16px;
+    padding: scale-px(16px) scale-px(16px) scale-px(12px) scale-px(16px);
   }
   &-hotlist {
-    padding: 0 16px;
+    padding: 0 scale-px(16px);
     display: flex;
     flex-wrap: wrap;
     align-items: flex-start;
@@ -59,16 +59,16 @@
       display: flex;
       justify-content: center;
       align-items: center;
-      width: 63px;
-      height: 28px;
-      font-size: 12px;
-      border-radius: 4px;
-      margin-bottom: 7px;
+      width: scale-px(63px);
+      height: scale-px(28px);
+      font-size: $font-size-s;
+      border-radius: scale-px(4px);
+      margin-bottom: scale-px(7px);
       /* #ifdef harmony dynamic*/
-      margin-right: 6px;
+      margin-right: scale-px(6px);
       /* #endif */
       /* #ifndef harmony dynamic*/
-      margin-right: 7px;
+      margin-right: scale-px(7px);
       /* #endif */
       background-color: $color-background-sunken;
       color: $color-title;
@@ -80,36 +80,36 @@
     &.hotlist-more {
       .nut-address-hotlist-item {
         width: auto;
-        padding: 0 16px;
-        margin-right: 7px;
+        padding: 0 scale-px(16px);
+        margin-right: scale-px(7px);
       }
     }
   }
 
   &-selected {
     width: 100%;
-    height: 60px;
-    padding: 0 16px;
+    height: scale-px(60px);
+    padding: 0 scale-px(16px);
     display: flex;
     align-items: center;
-    border-bottom: 1px solid $color-border;
+    border-bottom: scale-px(1px) solid $color-border;
     &-item {
-      font-size: 12px;
+      font-size: $font-size-s;
       display: inline-block;
-      height: 28px;
-      line-height: 28px;
-      padding: 0 12px;
-      border-radius: 4px;
+      height: scale-px(28px);
+      line-height: scale-px(28px);
+      padding: 0 scale-px(12px);
+      border-radius: scale-px(4px);
       background-color: $color-background-sunken;
 
       &.active {
-        border: 1px solid $color-primary;
+        border: scale-px(1px) solid $color-primary;
         background-color: $color-primary-light-pressed;
         color: $color-primary;
       }
     }
     &-border {
-      margin: 0 2px;
+      margin: 0 scale-px(2px);
       color: $color-text-disabled;
     }
   }
@@ -119,15 +119,15 @@
     .nut-elevator-list {
       &-item {
         position: relative;
-        padding-left: 20px;
+        padding-left: scale-px(20px);
       }
       &-item-code {
         display: inline;
         position: absolute;
         left: 0;
         top: 0;
-        height: 30px;
-        line-height: 30px;
+        height: scale-px(30px);
+        line-height: scale-px(30px);
         border-bottom: 0;
         color: $color-text-help;
         font-weight: 500;
@@ -142,11 +142,11 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        width: 16px;
-        height: 16px;
-        font-size: 10px;
-        border-radius: 16px;
-        margin-bottom: 2px;
+        width: scale-px(16px);
+        height: scale-px(16px);
+        font-size: $font-size-xxs;
+        border-radius: scale-px(16px);
+        margin-bottom: scale-px(2px);
         color: $color-text-help;
         &-active {
           background-color: $color-primary;
@@ -164,7 +164,7 @@
     &-item {
       &-info {
         margin-left: 0;
-        margin-right: 9px;
+        margin-right: scale-px(9px);
       }
     }
   }