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

package/dist/cjs/packages/calendar/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 @@
   display: flex;
   flex-direction: column;
   flex: 1;
-  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 15px));
+  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   background-color: var(--nutui-color-background-overlay, #ffffff);
   color: var(--nutui-color-title, #1a1a1a);
   overflow: hidden;
   height: 100%;
 }
 .nut-calendar.nut-calendar-title .nut-calendar-header .calendar-title {
-  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 15px));
+  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-calendar .nut-calendar-taro {
   height: 60vh;
@@ -31,26 +41,26 @@
   text-align: center;
 }
 .nut-calendar-header-buttons {
-  height: var(--nutui-calendar-header-height, 24px);
+  height: var(--nutui-calendar-header-height, calc(24px * var(--nut-scale-f, 1)));
 }
 .nut-calendar-title {
   color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-calendar-title-font-weight, var(--nutui-font-weight-bold, 600));
-  line-height: 50px;
+  line-height: calc(50px * var(--nut-scale-f, 1));
 }
 .nut-calendar-sub-title {
-  padding: 7px 0;
-  line-height: 22px;
-  font-size: var(--nutui-calendar-sub-title-font-size, var(--nutui-font-size-base, 14px));
+  padding: calc(7px * var(--nut-scale-f, 1)) 0;
+  line-height: calc(22px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-calendar-sub-title-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-calendar-weeks {
   display: flex;
   align-items: center;
   justify-content: space-around;
-  height: 36px;
-  border-radius: 0px 0px 12px 12px;
-  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.06);
+  height: calc(36px * var(--nut-scale-f, 1));
+  border-radius: 0 0 calc(12px * var(--nut-scale-f, 1)) calc(12px * var(--nut-scale-f, 1));
+  box-shadow: 0 calc(4px * var(--nut-scale-f, 1)) calc(10px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.06);
 }
 .nut-calendar-week-item:first-of-type, .nut-calendar-week-item:last-of-type {
   color: var(--nutui-color-primary, #ff0f23);
@@ -69,14 +79,14 @@
   box-sizing: border-box;
 }
 .nut-calendar-pannel .calendar-loading-tip {
-  height: 50px;
-  line-height: 50px;
+  height: calc(50px * var(--nut-scale-f, 1));
+  line-height: calc(50px * var(--nut-scale-f, 1));
   text-align: center;
   position: absolute;
-  top: -50px;
+  top: calc(-50px * var(--nut-scale-f, 1));
   left: 0;
   right: 0;
-  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);
 }
 .nut-calendar-month {
@@ -85,9 +95,9 @@
   text-align: center;
 }
 .nut-calendar-month-title {
-  height: 23px;
-  line-height: 23px;
-  margin: 8px 0;
+  height: calc(23px * var(--nut-scale-f, 1));
+  line-height: calc(23px * var(--nut-scale-f, 1));
+  margin: calc(8px * var(--nut-scale-f, 1)) 0;
 }
 .nut-calendar-days {
   overflow: hidden;
@@ -100,62 +110,82 @@
   position: relative;
   float: left;
   width: var(--nutui-calendar-day-width, 14.28%);
-  height: var(--nutui-calendar-day-height, 60px);
+  height: var(--nutui-calendar-day-height, calc(60px * var(--nut-scale-f, 1)));
   font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold, 600));
-  margin-bottom: 4px;
+  margin-bottom: calc(4px * var(--nut-scale-f, 1));
+}
+.nut-calendar-day-day, .nut-calendar-day-info-curr {
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
   color: var(--nutui-color-primary, #ff0f23);
 }
+.nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
+.nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
+.nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
+  color: var(--nutui-color-primary, #ff0f23);
+}
 .nut-calendar-day-info, .nut-calendar-day-info-curr {
   position: absolute;
-  bottom: 5px;
+  bottom: calc(5px * var(--nut-scale-f, 1));
   width: 100%;
-  font-size: 12px;
-  line-height: 14px;
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  line-height: calc(14px * var(--nut-scale-f, 1));
 }
 .nut-calendar-day-info-top {
   position: absolute;
   width: 100%;
-  top: 5px;
+  top: calc(5px * var(--nut-scale-f, 1));
 }
 .nut-calendar-day-info-bottom {
   position: absolute;
   width: 100%;
-  bottom: 5px;
+  bottom: calc(5px * var(--nut-scale-f, 1));
 }
 .nut-calendar-day-active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   color: #ffffff !important;
-  border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-calendar-day-active.active-start {
-  border-radius: 0px;
-  border-top-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
-  border-bottom-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-radius: 0;
+  border-top-left-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
+  border-bottom-left-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-calendar-day-active.active-end {
-  border-radius: 0px;
-  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
-  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-radius: 0;
+  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
+  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
-.nut-calendar-day-active .nut-calendar-day-info {
+.nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
+  color: #ffffff;
+}
+.nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
   color: #ffffff;
 }
 .nut-calendar-day-disabled {
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
 }
+.nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
 .nut-calendar-day-disabled .nut-calendar-day-info-curr {
   display: none;
 }
 .nut-calendar-day-choose {
-  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
+  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffe8ee));
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
+}
+.nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-calendar-day-choose-disabled {
   background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
 }
+.nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
 .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
   display: none;
 }
@@ -166,18 +196,18 @@
   background-color: #ffffff;
 }
 .nut-calendar-footer .calendar-confirm-btn {
-  height: 40px;
-  line-height: 40px;
-  margin: 6px 16px;
+  height: calc(40px * var(--nut-scale-f, 1));
+  line-height: calc(40px * var(--nut-scale-f, 1));
+  margin: calc(6px * var(--nut-scale-f, 1)) calc(16px * var(--nut-scale-f, 1));
   text-align: center;
-  border-radius: var(--nutui-radius-base, 8px);
-  background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
+  border-radius: var(--nutui-radius-base, calc(8px * var(--nut-scale-f, 1)));
+  background: var(--nutui-button-primary-background-color, var(--nutui-color-primary, #ff0f23));
   color: #ffffff;
   font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 .nut-calendar-popup .nut-popup-title-right {
-  top: 7px !important;
+  top: calc(7px * var(--nut-scale-f, 1)) !important;
 }
 
 [dir=rtl] .nut-calendar-day,
@@ -187,14 +217,14 @@
 [dir=rtl] .nut-calendar-day-active.active-start,
 .nut-rtl .nut-calendar-day-active.active-start {
   border-top-left-radius: 0;
-  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-calendar-day-active.active-end,
 .nut-rtl .nut-calendar-day-active.active-end {
   border-top-right-radius: 0;
-  border-top-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-top-left-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
   border-bottom-right-radius: 0;
-  border-bottom-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
+  border-bottom-left-radius: var(--nutui-calendar-day-active-border-radius, calc(4px * var(--nut-scale-f, 1)));
 }

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

@@ -44,12 +44,12 @@
     color: $color-title;
     font-size: $calendar-title-font-size;
     font-weight: $calendar-title-font-weight;
-    line-height: 50px;
+    line-height: scale-px(50px);
   }
 
   &-sub-title {
-    padding: 7px 0;
-    line-height: 22px;
+    padding: scale-px(7px) 0;
+    line-height: scale-px(22px);
     font-size: $calendar-sub-title-font-size;
   }
 
@@ -57,9 +57,9 @@
     display: flex;
     align-items: center;
     justify-content: space-around;
-    height: 36px;
-    border-radius: 0px 0px 12px 12px;
-    box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
+    height: scale-px(36px);
+    border-radius: 0 0 scale-px(12px) scale-px(12px);
+    box-shadow: 0 scale-px(4px) scale-px(10px) 0 rgba($color: #000000, $alpha: 0.06);
   }
 
   &-week-item {
@@ -85,11 +85,11 @@
     box-sizing: border-box;
 
     .calendar-loading-tip {
-      height: 50px;
-      line-height: 50px;
+      height: scale-px(50px);
+      line-height: scale-px(50px);
       text-align: center;
       position: absolute;
-      top: -50px;
+      top: scale-px(-50px);
       left: 0;
       right: 0;
       font-size: $font-size-s;
@@ -103,9 +103,9 @@
     text-align: center;
 
     &-title {
-      height: 23px;
-      line-height: 23px;
-      margin: 8px 0;
+      height: scale-px(23px);
+      line-height: scale-px(23px);
+      margin: scale-px(8px) 0;
     }
   }
 
@@ -123,32 +123,43 @@
     width: $calendar-day-width;
     height: $calendar-day-height;
     font-weight: $calendar-day-font-weight;
-    margin-bottom: 4px;
+    margin-bottom: scale-px(4px);
+
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-day,
+    &-info-curr {
+      color: $color-title;
+    }
 
     &:nth-child(7n + 0),
     &:nth-child(7n + 1) {
       color: $color-primary;
+
+      .nut-calendar-day-day,
+      .nut-calendar-day-info-curr {
+        color: $color-primary;
+      }
     }
 
     &-info,
     &-info-curr {
       position: absolute;
-      bottom: 5px;
+      bottom: scale-px(5px);
       width: 100%;
-      font-size: 12px;
-      line-height: 14px;
+      font-size: $font-size-s;
+      line-height: scale-px(14px);
     }
 
     &-info-top {
       position: absolute;
       width: 100%;
-      top: 5px;
+      top: scale-px(5px);
     }
 
     &-info-bottom {
       position: absolute;
       width: 100%;
-      bottom: 5px;
+      bottom: scale-px(5px);
     }
 
     &-active {
@@ -157,18 +168,23 @@
       border-radius: $calendar-day-active-border-radius;
 
       &.active-start {
-        border-radius: 0px;
+        border-radius: 0;
         border-top-left-radius: $calendar-day-active-border-radius;
         border-bottom-left-radius: $calendar-day-active-border-radius;
       }
 
       &.active-end {
-        border-radius: 0px;
+        border-radius: 0;
         border-top-right-radius: $calendar-day-active-border-radius;
         border-bottom-right-radius: $calendar-day-active-border-radius;
       }
 
-      .nut-calendar-day-info {
+      &.nut-calendar-day-active .nut-calendar-day-info {
+        color: $color-primary-text;
+      }
+
+      &.nut-calendar-day-active .nut-calendar-day-day,
+      &.nut-calendar-day-active .nut-calendar-day-info-curr {
         color: $color-primary-text;
       }
     }
@@ -176,6 +192,11 @@
     &-disabled {
       color: $calendar-disable-color !important;
 
+      &.nut-calendar-day-disabled .nut-calendar-day-day,
+      &.nut-calendar-day-disabled .nut-calendar-day-info-curr {
+        color: $calendar-disable-color;
+      }
+
       .nut-calendar-day-info-curr {
         display: none;
       }
@@ -185,10 +206,20 @@
       background-color: $calendar-choose-background-color;
       color: $calendar-choose-color;
 
+      &.nut-calendar-day-choose .nut-calendar-day-day,
+      &.nut-calendar-day-choose .nut-calendar-day-info-curr {
+        color: $calendar-choose-color;
+      }
+
       &-disabled {
         background-color: $calendar-choose-disable-background-color;
         color: $calendar-disable-color !important;
 
+        &.nut-calendar-day-choose-disabled .nut-calendar-day-day,
+        &.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
+          color: $calendar-disable-color;
+        }
+
         .nut-calendar-day-info-curr {
           display: none;
         }
@@ -204,9 +235,9 @@
     background-color: $white;
 
     .calendar-confirm-btn {
-      height: 40px;
-      line-height: 40px;
-      margin: 6px 16px;
+      height: scale-px(40px);
+      line-height: scale-px(40px);
+      margin: scale-px(6px) scale-px(16px);
       text-align: center;
       border-radius: $radius-base;
       background: $button-primary-background-color;
@@ -217,7 +248,7 @@
 }
 
 .nut-calendar-popup .nut-popup-title-right {
-  top: 7px !important;
+  top: scale-px(7px) !important;
 }
 
 [dir='rtl'] .nut-calendar,

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

@@ -37,20 +37,20 @@
   color: var(--nutui-color-title);
   font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-h2));
   font-weight: var(--nutui-calendar-title-font-weight, var(--nutui-font-weight-bold));
-  line-height: 50px;
+  line-height: scale-px(50px);
 }
 .nut-calendar-sub-title {
-  padding: 7px 0;
-  line-height: 22px;
+  padding: scale-px(7px) 0;
+  line-height: scale-px(22px);
   font-size: var(--nutui-calendar-sub-title-font-size, var(--nutui-font-text));
 }
 .nut-calendar-weeks {
   display: flex;
   align-items: center;
   justify-content: space-around;
-  height: 36px;
-  border-radius: 0px 0px 12px 12px;
-  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.06);
+  height: scale-px(36px);
+  border-radius: 0 0 scale-px(12px) scale-px(12px);
+  box-shadow: 0 scale-px(4px) scale-px(10px) 0 rgba(0, 0, 0, 0.06);
 }
 .nut-calendar-week-item:first-of-type, .nut-calendar-week-item:last-of-type {
   color: var(--nutui-color-primary);
@@ -69,11 +69,11 @@
   box-sizing: border-box;
 }
 .nut-calendar-pannel .calendar-loading-tip {
-  height: 50px;
-  line-height: 50px;
+  height: scale-px(50px);
+  line-height: scale-px(50px);
   text-align: center;
   position: absolute;
-  top: -50px;
+  top: scale-px(-50px);
   left: 0;
   right: 0;
   font-size: var(--nutui-font-text-small);
@@ -85,9 +85,9 @@
   text-align: center;
 }
 .nut-calendar-month-title {
-  height: 23px;
-  line-height: 23px;
-  margin: 8px 0;
+  height: scale-px(23px);
+  line-height: scale-px(23px);
+  margin: scale-px(8px) 0;
 }
 .nut-calendar-days {
   overflow: hidden;
@@ -102,27 +102,35 @@
   width: var(--nutui-calendar-day-width, 14.28%);
   height: var(--nutui-calendar-day-height, 60px);
   font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold));
-  margin-bottom: 4px;
+  margin-bottom: scale-px(4px);
+}
+.nut-calendar-day-day, .nut-calendar-day-info-curr {
+  color: var(--nutui-color-title);
 }
 .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
   color: var(--nutui-color-primary);
 }
+.nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
+.nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
+.nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
+  color: var(--nutui-color-primary);
+}
 .nut-calendar-day-info, .nut-calendar-day-info-curr {
   position: absolute;
-  bottom: 5px;
+  bottom: scale-px(5px);
   width: 100%;
-  font-size: 12px;
-  line-height: 14px;
+  font-size: var(--nutui-font-text-small);
+  line-height: scale-px(14px);
 }
 .nut-calendar-day-info-top {
   position: absolute;
   width: 100%;
-  top: 5px;
+  top: scale-px(5px);
 }
 .nut-calendar-day-info-bottom {
   position: absolute;
   width: 100%;
-  bottom: 5px;
+  bottom: scale-px(5px);
 }
 .nut-calendar-day-active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary));
@@ -130,21 +138,27 @@
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendar-day-active.active-start {
-  border-radius: 0px;
+  border-radius: 0;
   border-top-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
   border-bottom-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendar-day-active.active-end {
-  border-radius: 0px;
+  border-radius: 0;
   border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
   border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
-.nut-calendar-day-active .nut-calendar-day-info {
+.nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
+  color: var(--nutui-color-text-dark);
+}
+.nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
   color: var(--nutui-color-text-dark);
 }
 .nut-calendar-day-disabled {
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
 }
+.nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
+}
 .nut-calendar-day-disabled .nut-calendar-day-info-curr {
   display: none;
 }
@@ -152,10 +166,16 @@
   background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed));
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
 }
+.nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
+}
 .nut-calendar-day-choose-disabled {
   background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
 }
+.nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
+}
 .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
   display: none;
 }
@@ -166,9 +186,9 @@
   background-color: #ffffff;
 }
 .nut-calendar-footer .calendar-confirm-btn {
-  height: 40px;
-  line-height: 40px;
-  margin: 6px 16px;
+  height: scale-px(40px);
+  line-height: scale-px(40px);
+  margin: scale-px(6px) scale-px(16px);
   text-align: center;
   border-radius: var(--nutui-radius-base);
   background: var(--nutui-color-primary);
@@ -177,7 +197,7 @@
 }
 
 .nut-calendar-popup .nut-popup-title-right {
-  top: 7px !important;
+  top: scale-px(7px) !important;
 }
 
 [dir=rtl] .nut-calendar-day,