@nutui/nutui-react-taro 3.0.20 → 3.0.22-cpp

package/dist/es/packages/calendarcard/calendarcard.js

@@ -2,7 +2,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import React, { useCallback, useEffect, useState, useRef } from "react";
+import React, { useCallback, useEffect, useState, useRef, useMemo } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { ArrowLeft, ArrowRight, DoubleLeft, DoubleRight } from "./icon";
@@ -12,12 +12,13 @@ import { useConfig } from "../configprovider/index";
 import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'single',
-    firstDayOfWeek: 0
+    firstDayOfWeek: 0,
+    weekdays: []
 });
 var prefixCls = 'nut-calendarcard';
 export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     var locale = useConfig().locale;
-    var _$_object_spread = _object_spread({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, type = _$_object_spread.type, title = _$_object_spread.title, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
+    var _$_object_spread = _object_spread({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, type = _$_object_spread.type, title = _$_object_spread.title, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, renderDayAriaLabel = _$_object_spread.renderDayAriaLabel, weekdays = _$_object_spread.weekdays, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
     var onPageChangeRef = useRef(onPageChange);
     // 当前月份信息
     var _useState = _sliced_to_array(useState(function() {
@@ -37,7 +38,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     }), 2), month = _useState[0], setMonth = _useState[1];
     // 当前月份对应的日期(6 * 7 视图)
     var _useState1 = _sliced_to_array(useState([]), 2), days = _useState1[0], setDays = _useState1[1];
-    var valueToRange = function(val) {
+    var valueToRange = function valueToRange(val) {
         if (Array.isArray(val)) {
             return val.map(function(date) {
                 return convertDateToDay(date);
@@ -47,7 +48,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             convertDateToDay(val)
         ] : [];
     };
-    var rangeTovalue = function(range) {
+    var rangeTovalue = function rangeTovalue(range) {
         if (Array.isArray(range)) {
             return range.map(function(day) {
                 return convertDayToDate(day);
@@ -62,7 +63,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         defaultValue: defaultValue ? valueToRange(defaultValue) : undefined,
         finalValue: []
     }), 2), innerValue = _usePropsValue[0], setInnerValue = _usePropsValue[1];
-    var change = function(v) {
+    var change = function change(v) {
         setInnerValue(v);
         if (type === 'single') {
             var date = convertDayToDate(v[0]);
@@ -107,10 +108,10 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         getDays,
         firstDayOfWeek
     ]);
-    var isSameDay = function(day1, day2) {
+    var isSameDay = function isSameDay(day1, day2) {
         return (day1 === null || day1 === void 0 ? void 0 : day1.year) === (day2 === null || day2 === void 0 ? void 0 : day2.year) && (day1 === null || day1 === void 0 ? void 0 : day1.month) === (day2 === null || day2 === void 0 ? void 0 : day2.month) && (day1 === null || day1 === void 0 ? void 0 : day1.date) === (day2 === null || day2 === void 0 ? void 0 : day2.date);
     };
-    var compareDay = function(day1, day2) {
+    var compareDay = function compareDay(day1, day2) {
         if (day1 && day2) {
             if (day1.year === day2.year) {
                 if (day1.month === day2.month) {
@@ -121,7 +122,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             return day1.year - day2.year;
         }
     };
-    var isDisable = function(day) {
+    var isDisable = function isDisable(day) {
         if (disableDay && disableDay(day)) {
             return true;
         }
@@ -133,7 +134,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         }
         return false;
     };
-    var isActive = function(day) {
+    var isActive = function isActive(day) {
         if (type === 'single' || type === 'multiple') {
             for(var val in innerValue){
                 if (isSameDay(day, innerValue[val])) {
@@ -145,13 +146,13 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         }
         return false;
     };
-    var isStart = function(day) {
+    var isStart = function isStart(day) {
         return (type === 'range' || type === 'week') && innerValue.length === 2 && isSameDay(day, innerValue[0]);
     };
-    var isEnd = function(day) {
+    var isEnd = function isEnd(day) {
         return (type === 'range' || type === 'week') && innerValue.length === 2 && isSameDay(day, innerValue[1]);
     };
-    var isMid = function(day) {
+    var isMid = function isMid(day) {
         if (type === 'range' || type === 'week') {
             if (innerValue.length === 2) {
                 var c1 = compareDay(innerValue[0], day);
@@ -163,11 +164,24 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         }
         return false;
     };
-    var isWeekend = function(day) {
+    var isWeekend = function isWeekend(day) {
         var d = new Date(day.year, day.month - 1, day.date).getDay();
         return d === 0 || d === 6;
     };
-    var getClasses = function(day) {
+    var isToday = function isToday(day) {
+        var today = new Date();
+        return day.year === today.getFullYear() && day.month === today.getMonth() + 1 && day.date === today.getDate();
+    };
+    // 日期无障碍朗读
+    var getAriaLabel = function getAriaLabel(day) {
+        var _locale_calendaritem_dayAriaLabel, _locale_calendaritem;
+        if (renderDayAriaLabel) {
+            return renderDayAriaLabel(day);
+        }
+        var today = isToday(day);
+        return (_locale_calendaritem_dayAriaLabel = (_locale_calendaritem = locale.calendaritem).dayAriaLabel) === null || _locale_calendaritem_dayAriaLabel === void 0 ? void 0 : _locale_calendaritem_dayAriaLabel.call(_locale_calendaritem, day.year, day.month, day.date, today, isActive(day), isDisable(day));
+    };
+    var getClasses = function getClasses(day) {
         /**
      * active: single、multiple 激活日期
      * start: 范围开始日期
@@ -198,7 +212,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         }
         return res;
     };
-    var jumpTo = function(year, month) {
+    var jumpTo = function jumpTo(year, month) {
         if (startDate) {
             var c = compareDay({
                 year: year,
@@ -224,7 +238,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             month: month
         });
     };
-    var jump = function() {
+    var jump = function jump() {
         var step = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 1;
         var current = month.year * 12 + month.month;
         var newMonth = (current + step) % 12;
@@ -240,7 +254,7 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             jumpTo: jumpTo
         };
     });
-    var handleDayClick = function(day) {
+    var handleDayClick = function handleDayClick(day) {
         onDayClick === null || onDayClick === void 0 ? void 0 : onDayClick(day);
         if (day.type === 'prev' || day.type === 'next' || isDisable(day)) {
             return;
@@ -320,19 +334,19 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         }
     };
     var monthTitle = locale.calendaritem.monthTitle;
-    var renderHeader = function() {
+    var renderHeader = function renderHeader() {
         return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(prefixCls, "-header")
         }, /*#__PURE__*/ React.createElement(View, {
             className: "".concat(prefixCls, "-header-left")
         }, /*#__PURE__*/ React.createElement(View, {
             className: "double-left",
-            onClick: function() {
+            onClick: function onClick() {
                 return jump(-12);
             }
         }, /*#__PURE__*/ React.createElement(DoubleLeft, null)), /*#__PURE__*/ React.createElement(View, {
             className: "left",
-            onClick: function() {
+            onClick: function onClick() {
                 return jump(-1);
             }
         }, /*#__PURE__*/ React.createElement(ArrowLeft, null))), /*#__PURE__*/ React.createElement(View, {
@@ -341,26 +355,31 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             className: "".concat(prefixCls, "-header-right")
         }, /*#__PURE__*/ React.createElement(View, {
             className: "right",
-            onClick: function() {
+            onClick: function onClick() {
                 return jump(1);
             }
         }, /*#__PURE__*/ React.createElement(ArrowRight, null)), /*#__PURE__*/ React.createElement(View, {
             className: "double-right",
-            onClick: function() {
+            onClick: function onClick() {
                 return jump(12);
             }
         }, /*#__PURE__*/ React.createElement(DoubleRight, null))));
     };
-    var _useState2 = _sliced_to_array(useState(function() {
-        var weekdays = locale.calendaritem.weekdays.map(function(day, index) {
+    var weekHeader = useMemo(function() {
+        var weekdaysList = weekdays.length > 0 ? weekdays : locale.calendaritem.weekdays;
+        var weekdaysData = weekdaysList.map(function(day, index) {
             return {
                 name: day,
                 key: index
             };
         });
-        return _to_consumable_array(weekdays.slice(firstDayOfWeek, 7)).concat(_to_consumable_array(weekdays.slice(0, firstDayOfWeek)));
-    }), 1), weekHeader = _useState2[0];
-    var renderContent = function() {
+        return _to_consumable_array(weekdaysData.slice(firstDayOfWeek, 7)).concat(_to_consumable_array(weekdaysData.slice(0, firstDayOfWeek)));
+    }, [
+        weekdays,
+        firstDayOfWeek,
+        locale.calendaritem.weekdays
+    ]);
+    var renderContent = function renderContent() {
         return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(prefixCls, "-content")
         }, /*#__PURE__*/ React.createElement(View, {
@@ -378,13 +397,16 @@ export var CalendarCard = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             return /*#__PURE__*/ React.createElement(View, {
                 className: classNames("".concat(prefixCls, "-day"), day.type, getClasses(day)),
                 key: "".concat(day.year, "-").concat(day.month, "-").concat(day.date),
-                onClick: function() {
+                onClick: function onClick() {
                     return handleDayClick(day);
-                }
+                },
+                ariaLabel: getAriaLabel(day),
+                ariaRole: "button"
             }, /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(prefixCls, "-day-top")
             }, renderDayTop ? renderDayTop(day) : ''), /*#__PURE__*/ React.createElement(View, {
-                className: "".concat(prefixCls, "-day-inner")
+                className: "".concat(prefixCls, "-day-inner"),
+                ariaHidden: true
             }, renderDay ? renderDay(day) : day.date), /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(prefixCls, "-day-bottom")
             }, renderDayBottom ? renderDayBottom(day) : ''));

package/dist/es/packages/calendarcard/icon.js

@@ -1,49 +1,38 @@
 import React from "react";
-import { Image, View } from "@tarojs/components";
-var left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==';
-var right = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTEuMzk2IDkuNDlhLjc3MS43NzEgMCAwIDAgMC0uOThsLTMuNi00LjM3MmEuNzcxLjc3MSAwIDAgMC0xLjE5MS45ODFMOS44IDlsLTMuMTk2IDMuODgxYS43NzEuNzcxIDAgMCAwIDEuMTkuOThsMy42LTQuMzd6Ii8+PC9zdmc+';
-var doubleLeft = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTMuODUzIDQuMDI2YS43NzEuNzcxIDAgMCAxIC4xMiAxLjA4NUwxMC44NjQgOWwzLjExIDMuODg5YS43NzEuNzcxIDAgMSAxLTEuMjA0Ljk2M2wtMy40OTgtNC4zN2EuNzcxLjc3MSAwIDAgMSAwLS45NjRsMy40OTctNC4zNzFhLjc3MS43NzEgMCAwIDEgMS4wODQtLjEyem0tNS4yNDUgMGEuNzcxLjc3MSAwIDAgMSAuMTIgMS4wODVMNS42MTcgOWwzLjExMSAzLjg4OWEuNzcxLjc3MSAwIDAgMS0xLjIwNS45NjNsLTMuNDk3LTQuMzdhLjc3MS43NzEgMCAwIDEgMC0uOTY0bDMuNDk3LTQuMzcxYS43NzEuNzcxIDAgMCAxIDEuMDg1LS4xMnoiLz48L3N2Zz4=';
-var doubleRight = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNC4xNDcgMTMuOTc0YS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUw3LjEzNiA5IDQuMDI4IDUuMTFhLjc3MS43NzEgMCAxIDEgMS4yMDQtLjk2M2wzLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMSAwIC45NjRsLTMuNDk3IDQuMzcxYS43NzEuNzcxIDAgMCAxLTEuMDg0LjEyem01LjI0NSAwYS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUwxMi4zODMgOSA5LjI3MiA1LjExYS43NzEuNzcxIDAgMSAxIDEuMjA1LS45NjNsMy40OTcgNC4zNzFhLjc3MS43NzEgMCAwIDEgMCAuOTY0bC0zLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMS0xLjA4NS4xMnoiLz48L3N2Zz4=';
-if (process.env.TARO_ENV === 'jdharmony_cpp') {
-    left = 'https://img11.360buyimg.com/imagetools/jfs/t1/187031/35/51586/196/6731c464F9b9f8f00/5506e32bf15e29dc.png';
-    right = 'https://img12.360buyimg.com/imagetools/jfs/t1/181006/25/51824/185/6731c452F9e252322/7493147dd6b4a88d.png';
-    doubleLeft = 'https://img13.360buyimg.com/imagetools/jfs/t1/221244/29/45876/259/6731c6bdF515df0a2/624e8eee3c8494a2.png';
-    doubleRight = 'https://img11.360buyimg.com/imagetools/jfs/t1/238382/25/24000/235/6731c6bdF0153286c/4a57e60b6e889af3.png';
-}
-var Icon = function(param) {
+import { Image } from "@tarojs/components";
+var left = 'https://storage.360buyimg.com/imgtools/6437a2b149-bb511b40-4942-11f1-b1e1-7158b9aae0a9.svg';
+var right = 'https://storage.360buyimg.com/imgtools/8aa060341d-baf78990-4942-11f1-9368-cd56fc5fadc6.svg';
+var doubleLeft = 'https://storage.360buyimg.com/imgtools/b5e798f4ed-bbe8c760-4942-11f1-b1e1-7158b9aae0a9.svg';
+var doubleRight = 'https://storage.360buyimg.com/imgtools/d6979fa16d-bbb4bf10-4942-11f1-9368-cd56fc5fadc6.svg';
+var Icon = function Icon(param) {
     var url = param.url;
-    var style = {
-        background: "url('".concat(url, "') no-repeat center"),
-        backgroundSize: '100% 100%',
-        width: 18,
-        height: 18
+    var iconStyle = {
+        color: 'var(--nutui-color-text)'
     };
-    if (process.env.TARO_ENV === 'jdharmony_cpp') {
-        return /*#__PURE__*/ React.createElement(Image, {
-            src: url,
-            style: style
-        });
-    }
-    return /*#__PURE__*/ React.createElement(View, {
-        style: style
+    return /*#__PURE__*/ React.createElement(Image, {
+        className: "nut-calendarcard-icon",
+        svg: true,
+        src: url,
+        mode: "aspectFit",
+        style: iconStyle
     });
 };
-export var ArrowLeft = function() {
+export var ArrowLeft = function ArrowLeft() {
     return /*#__PURE__*/ React.createElement(Icon, {
         url: left
     });
 };
-export var ArrowRight = function() {
+export var ArrowRight = function ArrowRight() {
     return /*#__PURE__*/ React.createElement(Icon, {
         url: right
     });
 };
-export var DoubleLeft = function() {
+export var DoubleLeft = function DoubleLeft() {
     return /*#__PURE__*/ React.createElement(Icon, {
         url: doubleLeft
     });
 };
-export var DoubleRight = function() {
+export var DoubleRight = function DoubleRight() {
     return /*#__PURE__*/ React.createElement(Icon, {
         url: doubleRight
     });

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

@@ -30,6 +30,12 @@
     }
   }
 
+  &-icon {
+    width: 18px;
+    height: 18px;
+    display: block;
+  }
+
   &-days {
     display: flex;
     flex-direction: row;
@@ -49,6 +55,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +79,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

package/dist/es/packages/calendarcard/style/style.css

@@ -29,6 +29,11 @@
 .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
   margin-right: 8px;
 }
+.nut-calendarcard-icon {
+  width: 18px;
+  height: 18px;
+  display: block;
+}
 .nut-calendarcard-days {
   display: flex;
   flex-direction: row;
@@ -47,6 +52,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title, #1a1a1a);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +70,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
+.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, #ff0f23));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -29,6 +29,11 @@
 .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
   margin-right: 8px;
 }
+.nut-calendarcard-icon {
+  width: 18px;
+  height: 18px;
+  display: block;
+}
 .nut-calendarcard-days {
   display: flex;
   flex-direction: row;
@@ -47,6 +52,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title, #1a1a1a);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +70,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
+.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, #ff0f23));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -30,6 +30,12 @@
     }
   }
 
+  &-icon {
+    width: 18px;
+    height: 18px;
+    display: block;
+  }
+
   &-days {
     display: flex;
     flex-direction: row;
@@ -49,6 +55,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +79,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

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

@@ -29,6 +29,11 @@
 .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
   margin-right: 8px;
 }
+.nut-calendarcard-icon {
+  width: 18px;
+  height: 18px;
+  display: block;
+}
 .nut-calendarcard-days {
   display: flex;
   flex-direction: row;
@@ -47,6 +52,9 @@
   margin-bottom: 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;
 }
@@ -62,6 +70,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
 }
+.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));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -30,6 +30,12 @@
     }
   }
 
+  &-icon {
+    width: 18px;
+    height: 18px;
+    display: block;
+  }
+
   &-days {
     display: flex;
     flex-direction: row;
@@ -49,6 +55,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +79,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

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

@@ -29,6 +29,11 @@
 .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
   margin-right: 8px;
 }
+.nut-calendarcard-icon {
+  width: 18px;
+  height: 18px;
+  display: block;
+}
 .nut-calendarcard-days {
   display: flex;
   flex-direction: row;
@@ -47,6 +52,9 @@
   margin-bottom: 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;
 }
@@ -62,6 +70,11 @@
 .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);

package/dist/es/packages/calendarcard/utils.js

@@ -1,17 +1,17 @@
 import { Utils } from "../../utils/date";
-export var convertDateToDay = function(date) {
+export var convertDateToDay = function convertDateToDay(date) {
     return date ? {
         year: date.getFullYear(),
         month: date.getMonth() + 1,
         date: date.getDate()
     } : null;
 };
-export var convertDayToDate = function(day) {
+export var convertDayToDate = function convertDayToDate(day) {
     return day ? new Date(day.year, day.month - 1, day.date) : null;
 };
 /**
  * 获取当月面板中前一个月的日期数据
- */ export var getPrevMonthDays = function(year, month, firstDayOfWeek) {
+ */ export var getPrevMonthDays = function getPrevMonthDays(year, month, firstDayOfWeek) {
     var prevMonth = month - 1;
     var prevYear = year;
     if (prevMonth <= 0) {
@@ -36,7 +36,7 @@ export var convertDayToDate = function(day) {
 };
 /**
  * 获取当前月的日期数据
- */ export var getCurrentMonthDays = function(year, month) {
+ */ export var getCurrentMonthDays = function getCurrentMonthDays(year, month) {
     var days = Utils.getMonthDays("".concat(year), "".concat(month));
     return Array.from(Array(days), function(_, k) {
         return {
@@ -49,7 +49,7 @@ export var convertDayToDate = function(day) {
 };
 /**
  * 根据日期获取当前周的起始日期
- */ export var getCurrentWeekDays = function(day, firstDayOfWeek) {
+ */ export var getCurrentWeekDays = function getCurrentWeekDays(day, firstDayOfWeek) {
     var current = new Date(day.year, day.month - 1, day.date);
     var count = (current.getDay() + 7 - firstDayOfWeek) % 7;
     return [