@nutui/nutui-react 3.0.20 → 4.0.0-beta.1

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

@@ -1,5 +1,5 @@
 .nut-tabbar {
-  border: 0px;
+  border: 0;
   box-shadow: $tabbar-box-shadow;
   border-bottom: $tabbar-border-bottom;
   border-top: $tabbar-border-top;
@@ -11,11 +11,11 @@
     display: flex;
 
     &-3 {
-      padding: 0 16px;
+      padding: 0 scale-px(16px);
     }
 
     &-2 {
-      padding: 0 32px;
+      padding: 0 scale-px(32px);
     }
 
     &-horizontal {
@@ -24,12 +24,12 @@
         flex-direction: row;
         justify-content: center;
         .nut-icon {
-          width: 20px;
-          height: 20px;
+          width: scale-px(20px);
+          height: scale-px(20px);
         }
         .nut-tabbar-item-text {
-          margin: 0 4px 0 6px;
-          font-size: 14px;
+          margin: 0 scale-px(4px) 0 scale-px(6px);
+          font-size: $font-size-base;
         }
         .nut-badge-sup {
           &::after {
@@ -42,8 +42,8 @@
 
   &-fixed {
     position: fixed;
-    bottom: 0px;
-    left: 0px;
+    bottom: 0;
+    left: 0;
   }
 }
 
@@ -56,6 +56,6 @@
 
   &-fixed {
     left: auto;
-    right: 0px;
+    right: 0;
   }
 }

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

@@ -3,7 +3,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-tabbar {
-  border: 0px;
+  border: 0;
   box-shadow: var(--nutui-tabbar-box-shadow, none);
   border-bottom: var(--nutui-tabbar-border-bottom, none);
   border-top: var(--nutui-tabbar-border-top, none);
@@ -15,10 +15,10 @@
   display: flex;
 }
 .nut-tabbar-wrap-3 {
-  padding: 0 16px;
+  padding: 0 scale-px(16px);
 }
 .nut-tabbar-wrap-2 {
-  padding: 0 32px;
+  padding: 0 scale-px(32px);
 }
 .nut-tabbar-wrap-horizontal {
   align-items: center;
@@ -28,20 +28,20 @@
   justify-content: center;
 }
 .nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-icon {
-  width: 20px;
-  height: 20px;
+  width: scale-px(20px);
+  height: scale-px(20px);
 }
 .nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-tabbar-item-text {
-  margin: 0 4px 0 6px;
-  font-size: 14px;
+  margin: 0 scale-px(4px) 0 scale-px(6px);
+  font-size: var(--nutui-font-text);
 }
 .nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-badge-sup::after {
   border: 0;
 }
 .nut-tabbar-fixed {
   position: fixed;
-  bottom: 0px;
-  left: 0px;
+  bottom: 0;
+  left: 0;
 }
 
 [dir=rtl] .nut-tabbar:last-child,
@@ -52,5 +52,5 @@
 [dir=rtl] .nut-tabbar-fixed,
 .nut-rtl .nut-tabbar-fixed {
   left: auto;
-  right: 0px;
+  right: 0;
 }

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

@@ -1,5 +1,5 @@
 .nut-tabbar {
-  border: 0px;
+  border: 0;
   box-shadow: $tabbar-box-shadow;
   border-bottom: $tabbar-border-bottom;
   border-top: $tabbar-border-top;
@@ -11,11 +11,11 @@
     display: flex;
 
     &-3 {
-      padding: 0 16px;
+      padding: 0 scale-px(16px);
     }
 
     &-2 {
-      padding: 0 32px;
+      padding: 0 scale-px(32px);
     }
 
     &-horizontal {
@@ -24,12 +24,12 @@
         flex-direction: row;
         justify-content: center;
         .nut-icon {
-          width: 20px;
-          height: 20px;
+          width: scale-px(20px);
+          height: scale-px(20px);
         }
         .nut-tabbar-item-text {
-          margin: 0 4px 0 6px;
-          font-size: 14px;
+          margin: 0 scale-px(4px) 0 scale-px(6px);
+          font-size: $font-size-base;
         }
         .nut-badge-sup {
           &::after {
@@ -42,8 +42,8 @@
 
   &-fixed {
     position: fixed;
-    bottom: 0px;
-    left: 0px;
+    bottom: 0;
+    left: 0;
   }
 }
 
@@ -56,6 +56,6 @@
 
   &-fixed {
     left: auto;
-    right: 0px;
+    right: 0;
   }
 }

package/dist/es/packages/tabbaritem/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 */
@@ -7,14 +17,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: calc(6px * var(--nut-scale-f, 1)) 0 calc(2px * var(--nut-scale-f, 1));
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   height: 100%;
 }
 .nut-tabbar-item .nut-icon {
-  width: 24px;
-  height: 24px;
-  font-size: 24px;
+  width: calc(24px * var(--nut-scale-f, 1));
+  height: calc(24px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-font-size-xxl, calc(24px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   /* #ifdef harmony dynamic*/
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   /* #endif*/
@@ -25,23 +35,23 @@
 .nut-tabbar-item-text {
   display: block;
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, 10px));
-  line-height: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, 10px));
-  margin-top: var(--nutui-tabbar-text-margin-top, 4px);
+  font-size: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  line-height: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  margin-top: var(--nutui-tabbar-text-margin-top, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-tabbar-item .nut-image-default {
-  width: 38px;
-  height: 38px;
-  border-radius: 38px;
+  width: calc(38px * var(--nut-scale-f, 1));
+  height: calc(38px * var(--nut-scale-f, 1));
+  border-radius: calc(38px * var(--nut-scale-f, 1));
 }
 .nut-tabbar-item-large {
   justify-content: center;
   padding: 0;
 }
 .nut-tabbar-item-large .nut-tabbar-item-text {
-  font-size: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, 15px));
+  font-size: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   margin-top: 0;
-  line-height: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, 15px));
+  line-height: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-tabbar-text-large-font-weight, var(--nutui-font-weight, 400));
 }
 .nut-tabbar-item-active {

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

@@ -3,14 +3,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: scale-px(6px) 0 scale-px(2px);
   color: $tabbar-inactive-color;
   height: 100%;
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
-    font-size: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
+    font-size: $font-size-xxl;
     /* #ifdef harmony dynamic*/
     color: $tabbar-inactive-color;
     /* #endif*/
@@ -29,9 +29,9 @@
 
   .nut-image {
     &-default {
-      width: 38px;
-      height: 38px;
-      border-radius: 38px;
+      width: scale-px(38px);
+      height: scale-px(38px);
+      border-radius: scale-px(38px);
     }
   }
 

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

@@ -7,14 +7,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: scale-px(6px) 0 scale-px(2px);
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-text));
   height: 100%;
 }
 .nut-tabbar-item .nut-icon {
-  width: 24px;
-  height: 24px;
-  font-size: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
+  font-size: var(--nutui-font-size-8);
   /* #ifdef harmony dynamic*/
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-text));
   /* #endif*/
@@ -30,9 +30,9 @@
   margin-top: var(--nutui-tabbar-text-margin-top, 3px);
 }
 .nut-tabbar-item .nut-image-default {
-  width: 38px;
-  height: 38px;
-  border-radius: 38px;
+  width: scale-px(38px);
+  height: scale-px(38px);
+  border-radius: scale-px(38px);
 }
 .nut-tabbar-item-large {
   justify-content: center;

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

@@ -3,14 +3,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: scale-px(6px) 0 scale-px(2px);
   color: $tabbar-inactive-color;
   height: 100%;
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
-    font-size: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
+    font-size: $font-size-xxl;
     /* #ifdef harmony dynamic*/
     color: $tabbar-inactive-color;
     /* #endif*/
@@ -29,9 +29,9 @@
 
   .nut-image {
     &-default {
-      width: 38px;
-      height: 38px;
-      border-radius: 38px;
+      width: scale-px(38px);
+      height: scale-px(38px);
+      border-radius: scale-px(38px);
     }
   }
 

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

@@ -7,14 +7,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: scale-px(6px) 0 scale-px(2px);
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-text));
   height: 100%;
 }
 .nut-tabbar-item .nut-icon {
-  width: 24px;
-  height: 24px;
-  font-size: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
+  font-size: var(--nutui-font-size-8);
   /* #ifdef harmony dynamic*/
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-text));
   /* #endif*/
@@ -30,9 +30,9 @@
   margin-top: var(--nutui-tabbar-text-margin-top, 3px);
 }
 .nut-tabbar-item .nut-image-default {
-  width: 38px;
-  height: 38px;
-  border-radius: 38px;
+  width: scale-px(38px);
+  height: scale-px(38px);
+  border-radius: scale-px(38px);
 }
 .nut-tabbar-item-large {
   justify-content: center;

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

@@ -3,14 +3,14 @@
   flex-direction: column;
   align-items: center;
   flex: 1;
-  padding: 6px 0 2px;
+  padding: scale-px(6px) 0 scale-px(2px);
   color: $tabbar-inactive-color;
   height: 100%;
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
-    font-size: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
+    font-size: $font-size-xxl;
     /* #ifdef harmony dynamic*/
     color: $tabbar-inactive-color;
     /* #endif*/
@@ -29,9 +29,9 @@
 
   .nut-image {
     &-default {
-      width: 38px;
-      height: 38px;
-      border-radius: 38px;
+      width: scale-px(38px);
+      height: scale-px(38px);
+      border-radius: scale-px(38px);
     }
   }
 

package/dist/es/packages/table/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 */
@@ -12,12 +22,12 @@
   display: flex;
   width: 100%;
   flex-direction: column;
-  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))));
   color: var(--nutui-color-title, #1a1a1a);
   overflow-y: auto;
   overflow-x: hidden;
   position: relative;
-  border: 1px solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-table-wrapper-sticky {
   overflow-x: auto;
@@ -59,7 +69,7 @@
   /* #ifndef dynamic*/
   display: table-cell;
   /* #endif */
-  padding: var(--nutui-table-cols-padding, 10px);
+  padding: var(--nutui-table-cols-padding, calc(10px * var(--nut-scale-f, 1)));
   table-layout: fixed;
   background: inherit;
   position: sticky;
@@ -75,7 +85,7 @@
   /* #ifndef dynamic*/
   display: table-cell;
   /* #endif */
-  padding: var(--nutui-table-cols-padding, 10px);
+  padding: var(--nutui-table-cols-padding, calc(10px * var(--nut-scale-f, 1)));
   table-layout: fixed;
   background: inherit;
 }
@@ -84,13 +94,13 @@
 }
 .nut-table-main-head-tr-td-nodata, .nut-table-main-body-tr-td-nodata {
   display: flex;
-  height: 50px;
+  height: calc(50px * var(--nut-scale-f, 1));
   align-items: center;
   justify-content: center;
 }
 .nut-table-main-head-tr-border, .nut-table-main-body-tr-border {
-  border-right: 1px solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  border-bottom: 1px solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-right: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-bottom: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-table-main-head-tr-alignleft, .nut-table-main-head-tr-align, .nut-table-main-body-tr-alignleft, .nut-table-main-body-tr-align {
   text-align: start;
@@ -113,9 +123,9 @@
 }
 .nut-table-sticky-left, .nut-table-sticky-right {
   position: absolute;
-  top: 0px;
-  width: 8px;
-  bottom: -1px;
+  top: 0;
+  width: calc(8px * var(--nut-scale-f, 1));
+  bottom: calc(-1px * var(--nut-scale-f, 1));
   overflow-x: hidden;
   overflow-y: hidden;
   box-shadow: none;
@@ -125,19 +135,19 @@
   background: transparent;
 }
 .nut-table-sticky-left {
-  left: 1px;
-  box-shadow: var(--nutui-table-sticky-left-shadow, 4px 0 8px 0 rgba(0, 0, 0, 0.1));
+  left: calc(1px * var(--nut-scale-f, 1));
+  box-shadow: var(--nutui-table-sticky-left-shadow, calc(4px * var(--nut-scale-f, 1)) 0 calc(8px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.1));
 }
 .nut-table-sticky-right {
-  right: 1px;
-  box-shadow: var(--nutui-table-sticky-right-shadow, -4px 0 8px 0 rgba(0, 0, 0, 0.1));
+  right: calc(1px * var(--nut-scale-f, 1));
+  box-shadow: var(--nutui-table-sticky-right-shadow, calc(-4px * var(--nut-scale-f, 1)) 0 calc(8px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.1));
 }
 .nut-table-fixed-left, .nut-table-fixed-right {
   position: sticky;
   z-index: 2;
 }
 .nut-table-fixed-left.h5-div, .nut-table-fixed-right.h5-div {
-  padding: var(--nutui-table-cols-padding, 10px) 0;
+  padding: var(--nutui-table-cols-padding, calc(10px * var(--nut-scale-f, 1))) 0;
 }
 .nut-table-fixed-left-last {
   border-right: none;
@@ -148,8 +158,8 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 30px;
-  padding: var(--nutui-table-cols-padding, 10px);
+  height: calc(30px * var(--nut-scale-f, 1));
+  padding: var(--nutui-table-cols-padding, calc(10px * var(--nut-scale-f, 1)));
   position: relative;
   z-index: 5;
 }
@@ -170,7 +180,7 @@
 .nut-rtl .nut-table-main-head-tr-border,
 .nut-rtl .nut-table-main-body-tr-border {
   border-right: none;
-  border-left: 1px solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-left: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-table-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 [dir=rtl] .nut-table-main-head-tr-alignleft, [dir=rtl] .nut-table-main-head-tr-align, [dir=rtl] .nut-table-main-body-tr-alignleft, [dir=rtl] .nut-table-main-body-tr-align,
 .nut-rtl .nut-table-main-head-tr-alignleft,
@@ -187,14 +197,14 @@
 [dir=rtl] .nut-table-sticky-left,
 .nut-rtl .nut-table-sticky-left {
   left: auto;
-  right: 1px;
-  box-shadow: var(--nutui-table-sticky-right-shadow, -4px 0 8px 0 rgba(0, 0, 0, 0.1));
+  right: calc(1px * var(--nut-scale-f, 1));
+  box-shadow: var(--nutui-table-sticky-right-shadow, calc(-4px * var(--nut-scale-f, 1)) 0 calc(8px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.1));
 }
 [dir=rtl] .nut-table-sticky-right,
 .nut-rtl .nut-table-sticky-right {
   right: auto;
-  left: 1px;
-  box-shadow: var(--nutui-table-sticky-left-shadow, 4px 0 8px 0 rgba(0, 0, 0, 0.1));
+  left: calc(1px * var(--nut-scale-f, 1));
+  box-shadow: var(--nutui-table-sticky-left-shadow, calc(4px * var(--nut-scale-f, 1)) 0 calc(8px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.1));
 }
 [dir=rtl] .nut-table-fixed-left-last,
 .nut-rtl .nut-table-fixed-left-last {

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

@@ -12,7 +12,7 @@
     overflow-y: auto;
     overflow-x: hidden;
     position: relative;
-    border: 1px solid $table-border-color;
+    border: scale-px(1px) solid $table-border-color;
 
     &-sticky {
       overflow-x: auto;
@@ -101,15 +101,15 @@
 
           &-nodata {
             display: flex;
-            height: 50px;
+            height: scale-px(50px);
             align-items: center;
             justify-content: center;
           }
         }
 
         &-border {
-          border-right: 1px solid $table-border-color;
-          border-bottom: 1px solid $table-border-color;
+          border-right: scale-px(1px) solid $table-border-color;
+          border-bottom: scale-px(1px) solid $table-border-color;
         }
 
         &-alignleft,
@@ -143,9 +143,9 @@
   &-sticky-left,
   &-sticky-right {
     position: absolute;
-    top: 0px;
-    width: 8px;
-    bottom: -1px;
+    top: 0;
+    width: scale-px(8px);
+    bottom: scale-px(-1px);
     overflow-x: hidden;
     overflow-y: hidden;
     box-shadow: none;
@@ -156,12 +156,12 @@
   }
 
   &-sticky-left {
-    left: 1px;
+    left: scale-px(1px);
     box-shadow: $table-sticky-left-shadow;
   }
 
   &-sticky-right {
-    right: 1px;
+    right: scale-px(1px);
     box-shadow: $table-sticky-right-shadow;
   }
 
@@ -186,7 +186,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    height: 30px;
+    height: scale-px(30px);
     padding: $table-cols-padding;
     position: relative;
     z-index: 5;
@@ -215,7 +215,7 @@
 
         &-border {
           border-right: none;
-          border-left: 1px solid $table-border-color;
+          border-left: scale-px(1px) solid $table-border-color;
         }
 
         &-alignleft,
@@ -232,13 +232,13 @@
 
   &-sticky-left {
     left: auto;
-    right: 1px;
+    right: scale-px(1px);
     box-shadow: $table-sticky-right-shadow;
   }
 
   &-sticky-right {
     right: auto;
-    left: 1px;
+    left: scale-px(1px);
     box-shadow: $table-sticky-left-shadow;
   }
   &-fixed-left-last {