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

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

@@ -2,7 +2,7 @@
   position: fixed;
   z-index: $fixednav-index;
   display: inline-block;
-  height: 50px;
+  height: scale-px(50px);
 
   &.active {
     .nut-fixednav-btn {
@@ -26,17 +26,17 @@
     box-sizing: border-box;
     position: absolute;
     z-index: $fixednav-index;
-    width: 70px;
+    width: scale-px(70px);
     height: 100%;
     background: $fixednav-button-background;
-    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 scale-px(2px) scale-px(4px) 0 rgba(0, 0, 0, 0.2);
     display: flex;
     align-items: center;
     justify-content: center;
 
     .text {
-      width: 24px;
-      line-height: 13px;
+      width: scale-px(24px);
+      line-height: scale-px(13px);
       font-size: $font-size-s;
       color: #fff;
       flex-shrink: 0;
@@ -56,7 +56,7 @@
     background: $fixednav-background-color;
     display: flex;
     justify-content: space-between;
-    box-shadow: 2px 2px 8px 0px rgba(0, 0, 0, 0.2);
+    box-shadow: scale-px(2px) scale-px(2px) scale-px(8px) 0 rgba(0, 0, 0, 0.2);
 
     &-item {
       position: relative;
@@ -66,19 +66,19 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      min-width: 50px;
+      min-width: scale-px(50px);
       flex-shrink: 0;
       color: $fixednav-color;
 
       .nut-fixednav-list-text {
-        font-size: 10px;
+        font-size: $font-size-xxs;
       }
     }
 
     &-image {
-      width: 20px;
-      height: 20px;
-      margin-bottom: 2px;
+      width: scale-px(20px);
+      height: scale-px(20px);
+      margin-bottom: scale-px(2px);
     }
   }
 
@@ -86,19 +86,19 @@
     right: 0;
     .nut-fixednav-btn {
       right: 0;
-      border-radius: 45px 0px 0px 45px;
+      border-radius: scale-px(45px) 0 0 scale-px(45px);
       .nut-icon {
-        margin-right: 5px;
+        margin-right: scale-px(5px);
         transform: rotate(0deg);
       }
     }
     .nut-fixednav-list {
       right: 0;
       transform: translateX(100%);
-      border-radius: 25px 0px 0px 25px;
+      border-radius: scale-px(25px) 0 0 scale-px(25px);
       padding: {
-        left: 20px;
-        right: 80px;
+        left: scale-px(20px);
+        right: scale-px(80px);
       }
     }
   }
@@ -108,9 +108,9 @@
     .nut-fixednav-btn {
       flex-direction: row-reverse;
       left: 0;
-      border-radius: 0 45px 45px 0;
+      border-radius: 0 scale-px(45px) scale-px(45px) 0;
       .nut-icon {
-        margin-left: 5px;
+        margin-left: scale-px(5px);
         transform: rotate(180deg);
       }
     }
@@ -118,10 +118,10 @@
     .nut-fixednav-list {
       transform: translateX(-100%);
       left: 0;
-      border-radius: 0px 25px 25px 0px;
+      border-radius: 0 scale-px(25px) scale-px(25px) 0;
       padding: {
-        left: 80px;
-        right: 20px;
+        left: scale-px(80px);
+        right: scale-px(20px);
       }
     }
   }
@@ -147,10 +147,10 @@
   &-btn {
     right: auto;
     left: 0;
-    border-radius: 0px 45px 45px 0px;
+    border-radius: 0 scale-px(45px) scale-px(45px) 0;
     .nut-icon {
-      margin-right: 0px;
-      margin-left: 5px;
+      margin-right: 0;
+      margin-left: scale-px(5px);
       transform: rotate(180deg);
     }
   }
@@ -159,12 +159,12 @@
     right: auto;
     left: 0;
     transform: translateX(-100%);
-    border-radius: 0px 25px 25px 0px;
-    box-shadow: -2px 2px 8px 0px rgba(0, 0, 0, 0.2);
+    border-radius: 0 scale-px(25px) scale-px(25px) 0;
+    box-shadow: scale-px(-2px) scale-px(2px) scale-px(8px) 0 rgba(0, 0, 0, 0.2);
 
     padding: {
-      right: 20px;
-      left: 80px;
+      right: scale-px(20px);
+      left: scale-px(80px);
     }
 
     &-item {
@@ -182,12 +182,12 @@
     .nut-fixednav-btn {
       left: auto;
       right: 0;
-      border-radius: 45px 0 0 45px;
+      border-radius: scale-px(45px) 0 0 scale-px(45px);
 
       .nut-icon {
         transform: rotate(0deg);
-        margin-right: 5px;
-        margin-left: 0px;
+        margin-right: scale-px(5px);
+        margin-left: 0;
       }
     }
 
@@ -195,11 +195,11 @@
       transform: translateX(100%);
       right: auto;
       left: auto;
-      border-radius: 25px 0px 0px 25px;
+      border-radius: scale-px(25px) 0 0 scale-px(25px);
 
       padding: {
-        right: 80px;
-        left: 20px;
+        right: scale-px(80px);
+        left: scale-px(20px);
       }
     }
   }

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

@@ -6,7 +6,7 @@
   position: fixed;
   z-index: var(--nutui-fixednav-index, 900);
   display: inline-block;
-  height: 50px;
+  height: scale-px(50px);
 }
 .nut-fixednav.active .nut-fixednav-btn .nut-icon {
   transform: rotate(180deg);
@@ -21,17 +21,17 @@
   box-sizing: border-box;
   position: absolute;
   z-index: var(--nutui-fixednav-index, 900);
-  width: 70px;
+  width: scale-px(70px);
   height: 100%;
   background: var(--nutui-fixednav-button-background, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff9999) 0%, var(--nutui-color-primary-stop-2, #ff6666) 100%));
-  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 scale-px(2px) scale-px(4px) 0 rgba(0, 0, 0, 0.2);
   display: flex;
   align-items: center;
   justify-content: center;
 }
 .nut-fixednav-btn .text {
-  width: 24px;
-  line-height: 13px;
+  width: scale-px(24px);
+  line-height: scale-px(13px);
   font-size: var(--nutui-font-text-small);
   color: #fff;
   flex-shrink: 0;
@@ -48,7 +48,7 @@
   background: var(--nutui-fixednav-background-color, #ffffff);
   display: flex;
   justify-content: space-between;
-  box-shadow: 2px 2px 8px 0px rgba(0, 0, 0, 0.2);
+  box-shadow: scale-px(2px) scale-px(2px) scale-px(8px) 0 rgba(0, 0, 0, 0.2);
 }
 .nut-fixednav-list-item {
   position: relative;
@@ -58,35 +58,35 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 50px;
+  min-width: scale-px(50px);
   flex-shrink: 0;
   color: var(--nutui-fixednav-color, #1a1a1a);
 }
 .nut-fixednav-list-item .nut-fixednav-list-text {
-  font-size: 10px;
+  font-size: var(--nutui-font-text-mini);
 }
 .nut-fixednav-list-image {
-  width: 20px;
-  height: 20px;
-  margin-bottom: 2px;
+  width: scale-px(20px);
+  height: scale-px(20px);
+  margin-bottom: scale-px(2px);
 }
 .nut-fixednav-right {
   right: 0;
 }
 .nut-fixednav-right .nut-fixednav-btn {
   right: 0;
-  border-radius: 45px 0px 0px 45px;
+  border-radius: scale-px(45px) 0 0 scale-px(45px);
 }
 .nut-fixednav-right .nut-fixednav-btn .nut-icon {
-  margin-right: 5px;
+  margin-right: scale-px(5px);
   transform: rotate(0deg);
 }
 .nut-fixednav-right .nut-fixednav-list {
   right: 0;
   transform: translateX(100%);
-  border-radius: 25px 0px 0px 25px;
-  padding-left: 20px;
-  padding-right: 80px;
+  border-radius: scale-px(25px) 0 0 scale-px(25px);
+  padding-left: scale-px(20px);
+  padding-right: scale-px(80px);
 }
 .nut-fixednav-left {
   left: 0;
@@ -94,18 +94,18 @@
 .nut-fixednav-left .nut-fixednav-btn {
   flex-direction: row-reverse;
   left: 0;
-  border-radius: 0 45px 45px 0;
+  border-radius: 0 scale-px(45px) scale-px(45px) 0;
 }
 .nut-fixednav-left .nut-fixednav-btn .nut-icon {
-  margin-left: 5px;
+  margin-left: scale-px(5px);
   transform: rotate(180deg);
 }
 .nut-fixednav-left .nut-fixednav-list {
   transform: translateX(-100%);
   left: 0;
-  border-radius: 0px 25px 25px 0px;
-  padding-left: 80px;
-  padding-right: 20px;
+  border-radius: 0 scale-px(25px) scale-px(25px) 0;
+  padding-left: scale-px(80px);
+  padding-right: scale-px(20px);
 }
 
 [dir=rtl] .nut-fixednav-right,
@@ -125,12 +125,12 @@
 .nut-rtl .nut-fixednav-btn {
   right: auto;
   left: 0;
-  border-radius: 0px 45px 45px 0px;
+  border-radius: 0 scale-px(45px) scale-px(45px) 0;
 }
 [dir=rtl] .nut-fixednav-btn .nut-icon,
 .nut-rtl .nut-fixednav-btn .nut-icon {
-  margin-right: 0px;
-  margin-left: 5px;
+  margin-right: 0;
+  margin-left: scale-px(5px);
   transform: rotate(180deg);
 }
 [dir=rtl] .nut-fixednav-list,
@@ -138,10 +138,10 @@
   right: auto;
   left: 0;
   transform: translateX(-100%);
-  border-radius: 0px 25px 25px 0px;
-  box-shadow: -2px 2px 8px 0px rgba(0, 0, 0, 0.2);
-  padding-right: 20px;
-  padding-left: 80px;
+  border-radius: 0 scale-px(25px) scale-px(25px) 0;
+  box-shadow: scale-px(-2px) scale-px(2px) scale-px(8px) 0 rgba(0, 0, 0, 0.2);
+  padding-right: scale-px(20px);
+  padding-left: scale-px(80px);
 }
 [dir=rtl] .nut-fixednav-list-item .b,
 .nut-rtl .nut-fixednav-list-item .b {
@@ -157,22 +157,22 @@
 .nut-rtl .nut-fixednav-left .nut-fixednav-btn {
   left: auto;
   right: 0;
-  border-radius: 45px 0 0 45px;
+  border-radius: scale-px(45px) 0 0 scale-px(45px);
 }
 [dir=rtl] .nut-fixednav-left .nut-fixednav-btn .nut-icon,
 .nut-rtl .nut-fixednav-left .nut-fixednav-btn .nut-icon {
   transform: rotate(0deg);
-  margin-right: 5px;
-  margin-left: 0px;
+  margin-right: scale-px(5px);
+  margin-left: 0;
 }
 [dir=rtl] .nut-fixednav-left .nut-fixednav-list,
 .nut-rtl .nut-fixednav-left .nut-fixednav-list {
   transform: translateX(100%);
   right: auto;
   left: auto;
-  border-radius: 25px 0px 0px 25px;
-  padding-right: 80px;
-  padding-left: 20px;
+  border-radius: scale-px(25px) 0 0 scale-px(25px);
+  padding-right: scale-px(80px);
+  padding-left: scale-px(20px);
 }
 
 .nut-drag .nut-fixednav {

package/dist/es/packages/form/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/es/packages/formitem/style/formitem.scss

@@ -23,14 +23,14 @@
       color: $form-item-required-color;
       margin-right: $form-item-required-margin-right;
       position: absolute;
-      left: -10px;
+      left: scale-px(-10px);
     }
 
     &-right-required {
       color: $form-item-required-color;
       margin-left: $form-item-required-margin-right;
       position: absolute;
-      right: -10px;
+      right: scale-px(-10px);
     }
   }
 
@@ -68,7 +68,7 @@
       }
 
       .nut-range-container {
-        min-height: 24px;
+        min-height: scale-px(24px);
       }
 
       .nut-textarea {
@@ -132,13 +132,13 @@
 
 .nut-form-item-label-right {
   justify-content: flex-end;
-  padding-right: 24px;
+  padding-right: scale-px(24px);
   white-space: nowrap;
 }
 
 .nut-form-item-label-left {
   position: relative;
-  padding-left: 12px;
+  padding-left: scale-px(12px);
   white-space: nowrap;
 }
 
@@ -150,8 +150,8 @@
 
 .nut-form-item-label-top {
   display: block;
-  padding-bottom: 4px;
-  padding-right: 24px;
+  padding-bottom: scale-px(4px);
+  padding-right: scale-px(24px);
 }
 
 .nut-form-item-body-top {
@@ -163,25 +163,25 @@
 .nut-rtl .form-layout-right .nut-form-item-label {
   text-align: left;
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: scale-px(24px);
 }
 
 [dir='rtl'] .form-layout-left .nut-form-item-label,
 .nut-rtl .form-layout-left .nut-form-item-label {
   text-align: right;
   padding-left: 0;
-  padding-right: 12px;
+  padding-right: scale-px(12px);
 
-  .required {
-    left: auto;
-    right: 0.1em;
-  }
+  // .required {
+  //   left: auto;
+  //   right: 0.1em;
+  // }
 }
 
 [dir='rtl'] .form-layout-top .nut-form-item-label,
 .nut-rtl .form-layout-top .nut-form-item-label {
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: scale-px(24px);
 }
 
 [dir='rtl'] .form-layout-top .nut-form-item-body,

package/dist/es/packages/formitem/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 */
@@ -13,10 +23,10 @@
 .nut-form-item-label {
   display: flex;
   flex-direction: row;
-  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: normal;
-  width: var(--nutui-form-item-label-width, 90px);
-  margin-right: var(--nutui-form-item-label-margin-right, 10px);
+  width: var(--nutui-form-item-label-width, calc(90px * var(--nut-scale-f, 1)));
+  margin-right: var(--nutui-form-item-label-margin-right, calc(10px * var(--nut-scale-f, 1)));
   flex: 0 0 auto;
   word-wrap: break-word;
   text-align: var(--nutui-form-item-label-text-align, left);
@@ -24,19 +34,19 @@
 }
 .nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
-  margin-right: var(--nutui-form-item-required-margin-right, 4px);
+  margin-right: var(--nutui-form-item-required-margin-right, calc(4px * var(--nut-scale-f, 1)));
   position: absolute;
-  left: -10px;
+  left: calc(-10px * var(--nut-scale-f, 1));
 }
 .nut-form-item-label-right-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
-  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  margin-left: var(--nutui-form-item-required-margin-right, calc(4px * var(--nut-scale-f, 1)));
   position: absolute;
-  right: -10px;
+  right: calc(-10px * var(--nut-scale-f, 1));
 }
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-form-item-body {
   flex: 1;
@@ -54,7 +64,7 @@
   height: auto;
 }
 .nut-form-item-body-slots .nut-input-text {
-  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   text-align: var(--nutui-form-item-body-input-text-align, left);
   color: var(--nutui-color-title, #1a1a1a);
   width: 100%;
@@ -64,7 +74,7 @@
   background: transparent;
 }
 .nut-form-item-body-slots .nut-range-container {
-  min-height: 24px;
+  min-height: calc(24px * var(--nut-scale-f, 1));
 }
 .nut-form-item-body-slots .nut-textarea {
   padding: 0;
@@ -75,7 +85,7 @@
 }
 .nut-form-item-body-tips {
   text-align: var(--nutui-form-item-tip-text-align, left);
-  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-xs, 11px));
+  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-xs, calc(11px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-form-item-error-message-color, var(--nutui-color-primary, #ff0f23));
 }
 
@@ -83,12 +93,12 @@
 .nut-rtl .nut-form-item-label {
   text-align: right;
   margin-right: 0;
-  margin-left: var(--nutui-form-item-label-margin-right, 10px);
+  margin-left: var(--nutui-form-item-label-margin-right, calc(10px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-form-item-label .required::before,
 .nut-rtl .nut-form-item-label .required::before {
   margin-right: 0;
-  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  margin-left: var(--nutui-form-item-required-margin-right, calc(4px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-form-item-body-slots,
 .nut-rtl .nut-form-item-body-slots {
@@ -116,13 +126,13 @@
 /* position */
 .nut-form-item-label-right {
   justify-content: flex-end;
-  padding-right: 24px;
+  padding-right: calc(24px * var(--nut-scale-f, 1));
   white-space: nowrap;
 }
 
 .nut-form-item-label-left {
   position: relative;
-  padding-left: 12px;
+  padding-left: calc(12px * var(--nut-scale-f, 1));
   white-space: nowrap;
 }
 
@@ -134,8 +144,8 @@
 
 .nut-form-item-label-top {
   display: block;
-  padding-bottom: 4px;
-  padding-right: 24px;
+  padding-bottom: calc(4px * var(--nut-scale-f, 1));
+  padding-right: calc(24px * var(--nut-scale-f, 1));
 }
 
 .nut-form-item-body-top {
@@ -147,25 +157,20 @@
 .nut-rtl .form-layout-right .nut-form-item-label {
   text-align: left;
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: calc(24px * var(--nut-scale-f, 1));
 }
 
 [dir=rtl] .form-layout-left .nut-form-item-label,
 .nut-rtl .form-layout-left .nut-form-item-label {
   text-align: right;
   padding-left: 0;
-  padding-right: 12px;
-}
-[dir=rtl] .form-layout-left .nut-form-item-label .required,
-.nut-rtl .form-layout-left .nut-form-item-label .required {
-  left: auto;
-  right: 0.1em;
+  padding-right: calc(12px * var(--nut-scale-f, 1));
 }
 
 [dir=rtl] .form-layout-top .nut-form-item-label,
 .nut-rtl .form-layout-top .nut-form-item-label {
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: calc(24px * var(--nut-scale-f, 1));
 }
 
 [dir=rtl] .form-layout-top .nut-form-item-body,

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

@@ -23,14 +23,14 @@
       color: $form-item-required-color;
       margin-right: $form-item-required-margin-right;
       position: absolute;
-      left: -10px;
+      left: scale-px(-10px);
     }
 
     &-right-required {
       color: $form-item-required-color;
       margin-left: $form-item-required-margin-right;
       position: absolute;
-      right: -10px;
+      right: scale-px(-10px);
     }
   }
 
@@ -68,7 +68,7 @@
       }
 
       .nut-range-container {
-        min-height: 24px;
+        min-height: scale-px(24px);
       }
 
       .nut-textarea {
@@ -132,13 +132,13 @@
 
 .nut-form-item-label-right {
   justify-content: flex-end;
-  padding-right: 24px;
+  padding-right: scale-px(24px);
   white-space: nowrap;
 }
 
 .nut-form-item-label-left {
   position: relative;
-  padding-left: 12px;
+  padding-left: scale-px(12px);
   white-space: nowrap;
 }
 
@@ -150,8 +150,8 @@
 
 .nut-form-item-label-top {
   display: block;
-  padding-bottom: 4px;
-  padding-right: 24px;
+  padding-bottom: scale-px(4px);
+  padding-right: scale-px(24px);
 }
 
 .nut-form-item-body-top {
@@ -163,25 +163,25 @@
 .nut-rtl .form-layout-right .nut-form-item-label {
   text-align: left;
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: scale-px(24px);
 }
 
 [dir='rtl'] .form-layout-left .nut-form-item-label,
 .nut-rtl .form-layout-left .nut-form-item-label {
   text-align: right;
   padding-left: 0;
-  padding-right: 12px;
+  padding-right: scale-px(12px);
 
-  .required {
-    left: auto;
-    right: 0.1em;
-  }
+  // .required {
+  //   left: auto;
+  //   right: 0.1em;
+  // }
 }
 
 [dir='rtl'] .form-layout-top .nut-form-item-label,
 .nut-rtl .form-layout-top .nut-form-item-label {
   padding-right: 0;
-  padding-left: 24px;
+  padding-left: scale-px(24px);
 }
 
 [dir='rtl'] .form-layout-top .nut-form-item-body,