@nutui/nutui-react 3.0.20 → 3.1.0-beta.2

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

@@ -1,6 +1,6 @@
 .nut-calendarcard {
   background: $color-background-overlay;
-  border-radius: 12px;
+  border-radius: scale-px(12px);
   overflow: hidden;
   font-size: $calendar-base-font-size;
   color: $color-title;
@@ -11,25 +11,31 @@
     align-items: center;
     justify-content: space-between;
     font-weight: normal;
+    line-height: $line-height-l;
 
     &-left,
     &-right {
       display: flex;
       flex-direction: row;
       cursor: pointer;
-      margin: 16px;
-      line-height: 1;
+      margin: scale-px(16px);
 
       .left {
-        margin-left: 8px;
+        margin-left: scale-px(8px);
       }
 
       .right {
-        margin-right: 8px;
+        margin-right: scale-px(8px);
       }
     }
   }
 
+  &-icon {
+    width: scale-px(18px);
+    height: scale-px(18px);
+    display: block;
+  }
+
   &-days {
     display: flex;
     flex-direction: row;
@@ -44,11 +50,18 @@
     flex-direction: column;
     position: relative;
     width: $calendar-day-width;
-    height: 48px;
+    height: scale-px(48px);
     cursor: pointer;
-    margin-bottom: 4px;
+    margin-bottom: scale-px(4px);
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -59,13 +72,19 @@
       align-items: center;
       justify-content: center;
       width: 100%;
-      height: 12px;
-      font-size: 12px;
-      line-height: 12px;
+      height: scale-px(12px);
+      font-size: $font-size-s;
+      line-height: scale-px(12px);
     }
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {
@@ -132,12 +151,12 @@
     &-right {
       .left {
         margin-left: 0;
-        margin-right: 8px;
+        margin-right: scale-px(8px);
       }
 
       .right {
         margin-right: 0;
-        margin-left: 8px;
+        margin-left: scale-px(8px);
       }
 
       .nut-icon-ArrowLeft,

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

@@ -4,7 +4,7 @@
 /* #endif */
 .nut-calendarcard {
   background: var(--nutui-color-surface-2);
-  border-radius: 12px;
+  border-radius: scale-px(12px);
   overflow: hidden;
   font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-text-large));
   color: var(--nutui-color-title);
@@ -15,19 +15,24 @@
   align-items: center;
   justify-content: space-between;
   font-weight: normal;
+  line-height: var(--nutui-line-height-l, var(--nutui-font-text-large));
 }
 .nut-calendarcard-header-left, .nut-calendarcard-header-right {
   display: flex;
   flex-direction: row;
   cursor: pointer;
-  margin: 16px;
-  line-height: 1;
+  margin: scale-px(16px);
 }
 .nut-calendarcard-header-left .left, .nut-calendarcard-header-right .left {
-  margin-left: 8px;
+  margin-left: scale-px(8px);
 }
 .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
-  margin-right: 8px;
+  margin-right: scale-px(8px);
+}
+.nut-calendarcard-icon {
+  width: scale-px(18px);
+  height: scale-px(18px);
+  display: block;
 }
 .nut-calendarcard-days {
   display: flex;
@@ -42,11 +47,14 @@
   flex-direction: column;
   position: relative;
   width: var(--nutui-calendar-day-width, 14.28%);
-  height: 48px;
+  height: scale-px(48px);
   cursor: pointer;
-  margin-bottom: 4px;
+  margin-bottom: scale-px(4px);
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -55,13 +63,18 @@
   align-items: center;
   justify-content: center;
   width: 100%;
-  height: 12px;
-  font-size: 12px;
-  line-height: 12px;
+  height: scale-px(12px);
+  font-size: var(--nutui-font-text-small);
+  line-height: scale-px(12px);
 }
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
 }
+.nut-calendarcard-day.weekend .nut-calendarcard-day-top,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff6666));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
@@ -117,13 +130,13 @@
 .nut-rtl .nut-calendarcard-header-left .left,
 .nut-rtl .nut-calendarcard-header-right .left {
   margin-left: 0;
-  margin-right: 8px;
+  margin-right: scale-px(8px);
 }
 [dir=rtl] .nut-calendarcard-header-left .right, [dir=rtl] .nut-calendarcard-header-right .right,
 .nut-rtl .nut-calendarcard-header-left .right,
 .nut-rtl .nut-calendarcard-header-right .right {
   margin-right: 0;
-  margin-left: 8px;
+  margin-left: scale-px(8px);
 }
 [dir=rtl] .nut-calendarcard-header-left .nut-icon-ArrowLeft,
 [dir=rtl] .nut-calendarcard-header-left .nut-icon-ArrowRight,

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

@@ -1,3 +1,13 @@
+: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 */

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

@@ -7,8 +7,8 @@
   border-radius: $card-border-radius;
 
   &-left {
-    width: 120px;
-    height: 120px;
+    width: scale-px(120px);
+    height: scale-px(120px);
     flex-shrink: 0;
 
     > img {
@@ -21,25 +21,25 @@
 
   &-right {
     flex: 1;
-    padding: 0 10px 8px;
+    padding: 0 scale-px(10px) scale-px(8px);
 
     &-title {
       @include moreline-ellipsis();
-      line-height: 1.5;
-      font-size: 14px;
+      line-height: $line-height-2xl;
+      font-size: $font-size-base;
       color: $color-title;
     }
 
     &-price {
       display: flex;
       align-items: center;
-      height: 18px;
-      line-height: 18px;
-      margin-top: 9px;
+      height: scale-px(18px);
+      line-height: scale-px(18px);
+      margin-top: scale-px(9px);
 
       &-origin {
         &.nut-price {
-          margin-left: 2px;
+          margin-left: scale-px(2px);
           .nut-price-symbol,
           .nut-price-integer,
           .nut-price-decimal {
@@ -52,11 +52,11 @@
     &-other {
       display: flex;
       align-items: center;
-      padding: 5px 0 2px;
+      padding: scale-px(5px) 0 scale-px(2px);
 
       .nut-tag {
-        padding: 0 2px;
-        margin-right: 5px;
+        padding: 0 scale-px(2px);
+        margin-right: scale-px(5px);
         font-size: $font-size-xs;
       }
     }
@@ -67,10 +67,10 @@
       align-items: center;
 
       &-name {
-        line-height: 1.5;
+        line-height: $line-height-xl;
         color: $color-text;
-        font-size: 12px;
-        padding-top: 4px;
+        font-size: $font-size-s;
+        padding-top: scale-px(4px);
       }
     }
   }
@@ -83,7 +83,7 @@
       &-origin {
         &.nut-price {
           margin-left: 0;
-          margin-right: 2px;
+          margin-right: scale-px(2px);
         }
       }
     }
@@ -91,7 +91,7 @@
     &-other {
       .nut-tag {
         margin-right: 0;
-        margin-left: 5px;
+        margin-left: scale-px(5px);
       }
     }
   }

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

@@ -1,3 +1,13 @@
+: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 */
@@ -6,22 +16,22 @@
   width: 100%;
   display: flex;
   background-color: inherit;
-  border-radius: var(--nutui-card-border-radius, 4px);
+  border-radius: var(--nutui-card-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-card-left {
-  width: 120px;
-  height: 120px;
+  width: calc(120px * var(--nut-scale-f, 1));
+  height: calc(120px * var(--nut-scale-f, 1));
   flex-shrink: 0;
 }
 .nut-card-left > img {
   display: block;
   width: 100%;
   height: 100%;
-  border-radius: var(--nutui-card-border-radius, 4px);
+  border-radius: var(--nutui-card-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-card-right {
   flex: 1;
-  padding: 0 10px 8px;
+  padding: 0 calc(10px * var(--nut-scale-f, 1)) calc(8px * var(--nut-scale-f, 1));
 }
 .nut-card-right-title {
   display: -webkit-box;
@@ -29,19 +39,19 @@
   -webkit-line-clamp: 2;
   overflow: hidden;
   word-break: break-all;
-  line-height: 1.5;
-  font-size: 14px;
+  line-height: var(--nutui-line-height-2xl, var(--nutui-font-size-2xl, calc(20px * var(--nut-scale-font, 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-color-title, #1a1a1a);
 }
 .nut-card-right-price {
   display: flex;
   align-items: center;
-  height: 18px;
-  line-height: 18px;
-  margin-top: 9px;
+  height: calc(18px * var(--nut-scale-f, 1));
+  line-height: calc(18px * var(--nut-scale-f, 1));
+  margin-top: calc(9px * var(--nut-scale-f, 1));
 }
 .nut-card-right-price-origin.nut-price {
-  margin-left: 2px;
+  margin-left: calc(2px * var(--nut-scale-f, 1));
 }
 .nut-card-right-price-origin.nut-price .nut-price-symbol,
 .nut-card-right-price-origin.nut-price .nut-price-integer,
@@ -51,12 +61,12 @@
 .nut-card-right-other {
   display: flex;
   align-items: center;
-  padding: 5px 0 2px;
+  padding: calc(5px * var(--nut-scale-f, 1)) 0 calc(2px * var(--nut-scale-f, 1));
 }
 .nut-card-right-other .nut-tag {
-  padding: 0 2px;
-  margin-right: 5px;
-  font-size: var(--nutui-font-size-xs, 11px);
+  padding: 0 calc(2px * var(--nut-scale-f, 1));
+  margin-right: calc(5px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-font-size-xs, calc(11px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-card-right-shop {
   display: flex;
@@ -64,19 +74,19 @@
   align-items: center;
 }
 .nut-card-right-shop-name {
-  line-height: 1.5;
+  line-height: var(--nutui-line-height-xl, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-color-text, #505259);
-  font-size: 12px;
-  padding-top: 4px;
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  padding-top: calc(4px * var(--nut-scale-f, 1));
 }
 
 [dir=rtl] .nut-card-right-price-origin.nut-price,
 .nut-rtl .nut-card-right-price-origin.nut-price {
   margin-left: 0;
-  margin-right: 2px;
+  margin-right: calc(2px * var(--nut-scale-f, 1));
 }
 [dir=rtl] .nut-card-right-other .nut-tag,
 .nut-rtl .nut-card-right-other .nut-tag {
   margin-right: 0;
-  margin-left: 5px;
+  margin-left: calc(5px * var(--nut-scale-f, 1));
 }

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

@@ -7,8 +7,8 @@
   border-radius: $card-border-radius;
 
   &-left {
-    width: 120px;
-    height: 120px;
+    width: scale-px(120px);
+    height: scale-px(120px);
     flex-shrink: 0;
 
     > img {
@@ -21,25 +21,25 @@
 
   &-right {
     flex: 1;
-    padding: 0 10px 8px;
+    padding: 0 scale-px(10px) scale-px(8px);
 
     &-title {
       @include moreline-ellipsis();
-      line-height: 1.5;
-      font-size: 14px;
+      line-height: $line-height-2xl;
+      font-size: $font-size-base;
       color: $color-title;
     }
 
     &-price {
       display: flex;
       align-items: center;
-      height: 18px;
-      line-height: 18px;
-      margin-top: 9px;
+      height: scale-px(18px);
+      line-height: scale-px(18px);
+      margin-top: scale-px(9px);
 
       &-origin {
         &.nut-price {
-          margin-left: 2px;
+          margin-left: scale-px(2px);
           .nut-price-symbol,
           .nut-price-integer,
           .nut-price-decimal {
@@ -52,11 +52,11 @@
     &-other {
       display: flex;
       align-items: center;
-      padding: 5px 0 2px;
+      padding: scale-px(5px) 0 scale-px(2px);
 
       .nut-tag {
-        padding: 0 2px;
-        margin-right: 5px;
+        padding: 0 scale-px(2px);
+        margin-right: scale-px(5px);
         font-size: $font-size-xs;
       }
     }
@@ -67,10 +67,10 @@
       align-items: center;
 
       &-name {
-        line-height: 1.5;
+        line-height: $line-height-xl;
         color: $color-text;
-        font-size: 12px;
-        padding-top: 4px;
+        font-size: $font-size-s;
+        padding-top: scale-px(4px);
       }
     }
   }
@@ -83,7 +83,7 @@
       &-origin {
         &.nut-price {
           margin-left: 0;
-          margin-right: 2px;
+          margin-right: scale-px(2px);
         }
       }
     }
@@ -91,7 +91,7 @@
     &-other {
       .nut-tag {
         margin-right: 0;
-        margin-left: 5px;
+        margin-left: scale-px(5px);
       }
     }
   }

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

@@ -9,8 +9,8 @@
   border-radius: var(--nutui-card-border-radius, 4px);
 }
 .nut-card-left {
-  width: 120px;
-  height: 120px;
+  width: scale-px(120px);
+  height: scale-px(120px);
   flex-shrink: 0;
 }
 .nut-card-left > img {
@@ -21,7 +21,7 @@
 }
 .nut-card-right {
   flex: 1;
-  padding: 0 10px 8px;
+  padding: 0 scale-px(10px) scale-px(8px);
 }
 .nut-card-right-title {
   display: -webkit-box;
@@ -29,19 +29,19 @@
   -webkit-line-clamp: 2;
   overflow: hidden;
   word-break: break-all;
-  line-height: 1.5;
-  font-size: 14px;
+  line-height: var(--nutui-line-height-2xl, var(--nutui-font-size-2xl, 20px));
+  font-size: var(--nutui-font-text);
   color: var(--nutui-color-title);
 }
 .nut-card-right-price {
   display: flex;
   align-items: center;
-  height: 18px;
-  line-height: 18px;
-  margin-top: 9px;
+  height: scale-px(18px);
+  line-height: scale-px(18px);
+  margin-top: scale-px(9px);
 }
 .nut-card-right-price-origin.nut-price {
-  margin-left: 2px;
+  margin-left: scale-px(2px);
 }
 .nut-card-right-price-origin.nut-price .nut-price-symbol,
 .nut-card-right-price-origin.nut-price .nut-price-integer,
@@ -51,11 +51,11 @@
 .nut-card-right-other {
   display: flex;
   align-items: center;
-  padding: 5px 0 2px;
+  padding: scale-px(5px) 0 scale-px(2px);
 }
 .nut-card-right-other .nut-tag {
-  padding: 0 2px;
-  margin-right: 5px;
+  padding: 0 scale-px(2px);
+  margin-right: scale-px(5px);
   font-size: var(--nutui-font-text-xs);
 }
 .nut-card-right-shop {
@@ -64,19 +64,19 @@
   align-items: center;
 }
 .nut-card-right-shop-name {
-  line-height: 1.5;
+  line-height: var(--nutui-line-height-xl, var(--nutui-font-h2));
   color: var(--nutui-color-text);
-  font-size: 12px;
-  padding-top: 4px;
+  font-size: var(--nutui-font-text-small);
+  padding-top: scale-px(4px);
 }
 
 [dir=rtl] .nut-card-right-price-origin.nut-price,
 .nut-rtl .nut-card-right-price-origin.nut-price {
   margin-left: 0;
-  margin-right: 2px;
+  margin-right: scale-px(2px);
 }
 [dir=rtl] .nut-card-right-other .nut-tag,
 .nut-rtl .nut-card-right-other .nut-tag {
   margin-right: 0;
-  margin-left: 5px;
+  margin-left: scale-px(5px);
 }

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

@@ -7,8 +7,8 @@
   border-radius: $card-border-radius;
 
   &-left {
-    width: 120px;
-    height: 120px;
+    width: scale-px(120px);
+    height: scale-px(120px);
     flex-shrink: 0;
 
     > img {
@@ -21,25 +21,25 @@
 
   &-right {
     flex: 1;
-    padding: 0 10px 8px;
+    padding: 0 scale-px(10px) scale-px(8px);
 
     &-title {
       @include moreline-ellipsis();
-      line-height: 1.5;
-      font-size: 14px;
+      line-height: $line-height-2xl;
+      font-size: $font-size-base;
       color: $color-title;
     }
 
     &-price {
       display: flex;
       align-items: center;
-      height: 18px;
-      line-height: 18px;
-      margin-top: 9px;
+      height: scale-px(18px);
+      line-height: scale-px(18px);
+      margin-top: scale-px(9px);
 
       &-origin {
         &.nut-price {
-          margin-left: 2px;
+          margin-left: scale-px(2px);
           .nut-price-symbol,
           .nut-price-integer,
           .nut-price-decimal {
@@ -52,11 +52,11 @@
     &-other {
       display: flex;
       align-items: center;
-      padding: 5px 0 2px;
+      padding: scale-px(5px) 0 scale-px(2px);
 
       .nut-tag {
-        padding: 0 2px;
-        margin-right: 5px;
+        padding: 0 scale-px(2px);
+        margin-right: scale-px(5px);
         font-size: $font-size-xs;
       }
     }
@@ -67,10 +67,10 @@
       align-items: center;
 
       &-name {
-        line-height: 1.5;
+        line-height: $line-height-xl;
         color: $color-text;
-        font-size: 12px;
-        padding-top: 4px;
+        font-size: $font-size-s;
+        padding-top: scale-px(4px);
       }
     }
   }
@@ -83,7 +83,7 @@
       &-origin {
         &.nut-price {
           margin-left: 0;
-          margin-right: 2px;
+          margin-right: scale-px(2px);
         }
       }
     }
@@ -91,7 +91,7 @@
     &-other {
       .nut-tag {
         margin-right: 0;
-        margin-left: 5px;
+        margin-left: scale-px(5px);
       }
     }
   }