@nutui/nutui-react 3.0.14 → 3.0.16

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

@@ -18,19 +18,25 @@
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
     line-height: unset;
-  }
 
-  &-label-required {
-    color: $form-item-required-color;
-    margin-right: $form-item-required-margin-right;
-    display: block;
-    position: absolute;
-    left: -10px;
+    &-left-required {
+      color: $form-item-required-color;
+      margin-right: $form-item-required-margin-right;
+      position: absolute;
+      left: -10px;
+    }
+
+    &-right-required {
+      color: $form-item-required-color;
+      margin-left: $form-item-required-margin-right;
+      position: absolute;
+      right: -10px;
+    }
   }
 
   .nut-form-item-labeltxt {
     position: relative;
-    font-size: 12px;
+    font-size: $form-item-label-font-size;
   }
 
   &-body {
@@ -136,13 +142,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

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

@@ -22,16 +22,21 @@
   text-align: var(--nutui-form-item-label-text-align, left);
   line-height: unset;
 }
-.nut-form-item-label-required {
+.nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
-  display: block;
   position: absolute;
   left: -10px;
 }
+.nut-form-item-label-right-required {
+  color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
+  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  position: absolute;
+  right: -10px;
+}
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: 12px;
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
 }
 .nut-form-item-body {
   flex: 1;
@@ -121,13 +126,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

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

@@ -18,19 +18,25 @@
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
     line-height: unset;
-  }
 
-  &-label-required {
-    color: $form-item-required-color;
-    margin-right: $form-item-required-margin-right;
-    display: block;
-    position: absolute;
-    left: -10px;
+    &-left-required {
+      color: $form-item-required-color;
+      margin-right: $form-item-required-margin-right;
+      position: absolute;
+      left: -10px;
+    }
+
+    &-right-required {
+      color: $form-item-required-color;
+      margin-left: $form-item-required-margin-right;
+      position: absolute;
+      right: -10px;
+    }
   }
 
   .nut-form-item-labeltxt {
     position: relative;
-    font-size: 12px;
+    font-size: $form-item-label-font-size;
   }
 
   &-body {
@@ -136,13 +142,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

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

@@ -22,16 +22,21 @@
   text-align: var(--nutui-form-item-label-text-align, left);
   line-height: unset;
 }
-.nut-form-item-label-required {
+.nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
-  display: block;
   position: absolute;
   left: -10px;
 }
+.nut-form-item-label-right-required {
+  color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
+  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  position: absolute;
+  right: -10px;
+}
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: 12px;
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
 }
 .nut-form-item-body {
   flex: 1;
@@ -121,13 +126,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/cjs/packages/imagepreview/imagepreview.js

@@ -12,6 +12,7 @@ var _interop_require_default = require("@swc/helpers/_/_interop_require_default"
 var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
@@ -24,6 +25,7 @@ var _swiper = /*#__PURE__*/ _interop_require_default._(require("../swiper"));
 var _swiperitem = /*#__PURE__*/ _interop_require_default._(require("../swiperitem"));
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../hooks/use-props-value");
+var _utils = require("../../utils");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     images: [],
     videos: [],
@@ -40,7 +42,24 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     onClose: function onClose() {}
 });
 var ImagePreview = function ImagePreview(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), value = _$_object_spread.value, className = _$_object_spread.className, style = _$_object_spread.style, images = _$_object_spread.images, videos = _$_object_spread.videos, visible = _$_object_spread.visible, defaultValue = _$_object_spread.defaultValue, indicatorColor = _$_object_spread.indicatorColor, pagination = _$_object_spread.pagination, indicator = _$_object_spread.indicator, autoPlay = _$_object_spread.autoPlay, closeOnContentClick = _$_object_spread.closeOnContentClick, closeIcon = _$_object_spread.closeIcon, closeIconPosition = _$_object_spread.closeIconPosition, onClose = _$_object_spread.onClose, onChange = _$_object_spread.onChange;
+    var _mergeProps = (0, _utils.mergeProps)(defaultProps, props), value = _mergeProps.value, className = _mergeProps.className, style = _mergeProps.style, images = _mergeProps.images, videos = _mergeProps.videos, visible = _mergeProps.visible, defaultValue = _mergeProps.defaultValue, indicatorColor = _mergeProps.indicatorColor, pagination = _mergeProps.pagination, indicator = _mergeProps.indicator, autoPlay = _mergeProps.autoPlay, closeOnContentClick = _mergeProps.closeOnContentClick, closeIcon = _mergeProps.closeIcon, closeIconPosition = _mergeProps.closeIconPosition, onClose = _mergeProps.onClose, onChange = _mergeProps.onChange, rest = (0, _object_without_properties._)(_mergeProps, [
+        "value",
+        "className",
+        "style",
+        "images",
+        "videos",
+        "visible",
+        "defaultValue",
+        "indicatorColor",
+        "pagination",
+        "indicator",
+        "autoPlay",
+        "closeOnContentClick",
+        "closeIcon",
+        "closeIconPosition",
+        "onClose",
+        "onChange"
+    ]);
     var classPrefix = 'nut-imagepreview';
     var ref = (0, _react.useRef)(null);
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
@@ -179,21 +198,18 @@ var ImagePreview = function ImagePreview(props) {
         style: style,
         ref: ref,
         onTouchStart: onTouchStart
-    }, showPop && /*#__PURE__*/ _react.default.createElement(_swiper.default, {
-        autoPlay: !!duration,
-        duration: duration,
+    }, showPop && /*#__PURE__*/ _react.default.createElement(_swiper.default, (0, _object_spread._)({
+        autoplay: !!duration,
         className: "".concat(classPrefix, "-swiper"),
-        loop: true,
         style: {
             '--nutui-indicator-color': indicatorColor
         },
-        direction: "horizontal",
         onChange: function onChange(page) {
             return slideChangeEnd(page);
         },
         defaultValue: innerNo > maxNo ? maxNo - 1 : innerNo - 1,
         indicator: indicator
-    }, (0, _to_consumable_array._)(videos.map(function(item) {
+    }, rest), (0, _to_consumable_array._)(videos.map(function(item) {
         return {
             type: 'video',
             data: item

package/dist/cjs/packages/noticebar/noticebar.js

@@ -14,6 +14,7 @@ var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
+var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _iconsreact = require("@nutui/icons-react");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
@@ -57,9 +58,10 @@ var NoticeBar = function NoticeBar(props) {
     var _useState8 = (0, _sliced_to_array._)((0, _react.useState)(null), 2), isCanScroll = _useState8[0], SetIsCanScroll = _useState8[1];
     var isVertical = direction === 'vertical';
     var _useState9 = (0, _sliced_to_array._)((0, _react.useState)(null), 2), rect = _useState9[0], setRect = _useState9[1];
-    var active = 0;
+    var activeRef = (0, _react.useRef)(0);
     var _useState10 = (0, _sliced_to_array._)((0, _react.useState)(false), 2), ready = _useState10[0], setReady = _useState10[1];
     var container = (0, _react.useRef)(null);
+    var _useState11 = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isContainerReady = _useState11[0], setIsContainerReady = _useState11[1];
     var innerRef = (0, _react.useRef)(null);
     var swiperRef = (0, _react.useRef)({
         moving: false,
@@ -69,8 +71,8 @@ var NoticeBar = function NoticeBar(props) {
         offset: 0,
         size: 0
     });
-    var _useState11 = (0, _sliced_to_array._)((0, _react.useState)([]), 2), childOffset = _useState11[0], setChildOffset = _useState11[1];
-    var _useState12 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), offset = _useState12[0], setOffset = _useState12[1];
+    var _useState12 = (0, _sliced_to_array._)((0, _react.useState)([]), 2), childOffset = _useState12[0], setChildOffset = _useState12[1];
+    var _useState13 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), offset = _useState13[0], setOffset = _useState13[1];
     var _useMemo = (0, _react.useMemo)(function() {
         var childCount = 0;
         var childs = _react.default.Children.map(children, function(child) {
@@ -110,7 +112,9 @@ var NoticeBar = function NoticeBar(props) {
             // 销毁事件
             clearInterval(timer);
         };
-    }, []);
+    }, [
+        childs
+    ]);
     (0, _react.useEffect)(function() {
         initScrollWrap(content);
     }, [
@@ -208,24 +212,24 @@ var NoticeBar = function NoticeBar(props) {
     };
     // 垂直自定义滚动方式
     var init = function init() {
-        var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : +0;
+        var activeIndex = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
         var rects = (0, _getrect.getRect)(container === null || container === void 0 ? void 0 : container.current);
-        var _active = Math.max(Math.min(childCount - 1, active), 0);
+        var _active = Math.max(Math.min(childCount - 1, activeIndex), 0);
         var _height = rects.height;
         trackSize = childCount * Number(_height);
         var targetOffset = getOffset(_active);
-        swiperRef.current.moving = true;
-        if (ready) {
-            swiperRef.current.moving = false;
-        }
-        active = _active;
+        activeRef.current = _active;
         setRect(rects);
         setOffset(targetOffset);
+        setChildOffset(new Array(childCount).fill(0));
+        // 关闭动画并立即设置样式
+        swiperRef.current.moving = true;
+        setStyle(targetOffset, rects);
+        swiperRef.current.moving = false;
         setReady(true);
     };
     (0, _react.useEffect)(function() {
         if (ready) {
-            stopAutoPlay();
             autoplay();
         }
         return function() {
@@ -235,18 +239,19 @@ var NoticeBar = function NoticeBar(props) {
         ready
     ]);
     (0, _react.useEffect)(function() {
-        if (isVertical && children) {
-            init();
+        if (isVertical && children && isContainerReady) {
             stopAutoPlay();
-            autoplay();
+            setReady(false);
+            init();
         }
     }, [
         children,
-        container === null || container === void 0 ? void 0 : container.current
+        isContainerReady
     ]);
     // 清除定时器
     var stopAutoPlay = function stopAutoPlay() {
         clearTimeout(swiperRef.current.autoplayTimer);
+        swiperRef.current.moving = false;
         swiperRef.current.autoplayTimer = null;
     };
     // 定时轮播
@@ -266,22 +271,25 @@ var NoticeBar = function NoticeBar(props) {
         // 父级容器偏移量
         var targetOffset = getOffset(targetActive, offset);
         // 循环滚动，调整开头结尾图片位置
-        if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
-            var rightBound = targetOffset < minOffset;
-            childOffset[0] = rightBound ? trackSize : 0;
-        }
-        if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
-            var leftBound = targetOffset > 0;
-            childOffset[childCount - 1] = leftBound ? -trackSize : 0;
-        }
-        setChildOffset(childOffset);
-        active = targetActive;
+        setChildOffset(function(prevChildOffset) {
+            var newChildOffset = (0, _to_consumable_array._)(prevChildOffset);
+            if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
+                var rightBound = targetOffset < minOffset;
+                newChildOffset[0] = rightBound ? trackSize : 0;
+            }
+            if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
+                var leftBound = targetOffset > 0;
+                newChildOffset[childCount - 1] = leftBound ? -trackSize : 0;
+            }
+            return newChildOffset;
+        });
+        activeRef.current = targetActive;
         setOffset(targetOffset);
-        getStyle(targetOffset);
+        setStyle(targetOffset);
     };
     // 下一页
     var next = function next() {
-        resettPosition();
+        resetPosition();
         requestFrame(function() {
             requestFrame(function() {
                 swiperRef.current.moving = false;
@@ -294,18 +302,19 @@ var NoticeBar = function NoticeBar(props) {
     var handleItemClick = function handleItemClick(event, value) {
         onItemClick && onItemClick(event, value);
     };
-    var getStyle = function getStyle() {
-        var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset;
+    var setStyle = function setStyle() {
+        var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset, currentRect = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : rect;
         var target = innerRef.current;
         if (!target) {
             return;
         }
         var _offset = 0;
-        // 容器高度-元素高度
-        var val = rect.height - height;
-        _offset = moveOffset + Number(active === childCount - 1 && val / 2);
+        // 使用传入的 currentRect 或状态中的 rect
+        var containerHeight = (currentRect === null || currentRect === void 0 ? void 0 : currentRect.height) || height;
+        var val = containerHeight - Number(height);
+        _offset = moveOffset + Number(activeRef.current === childCount - 1 && val / 2);
         target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
-        target.style.height = "".concat(Number(height) * childCount, "px");
+        target.style.height = "".concat(Number(height) * (childCount + 1), "px");
         target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
     };
     // 无缝滚动第一个元素位移控制
@@ -323,11 +332,12 @@ var NoticeBar = function NoticeBar(props) {
     };
     // 确定当前active 元素
     var getActive = function getActive(pace) {
+        var currentActive = activeRef.current;
         if (pace) {
-            var _active = active + pace;
+            var _active = currentActive + pace;
             return range(_active, -1, childCount);
         }
-        return active;
+        return currentActive;
     };
     // 计算位移
     var getOffset = function getOffset(active) {
@@ -345,14 +355,15 @@ var NoticeBar = function NoticeBar(props) {
         return Math.min(Math.max(num, min), max);
     };
     // 重置首尾位置信息
-    var resettPosition = function resettPosition() {
+    var resetPosition = function resetPosition() {
+        var currentActive = activeRef.current;
         swiperRef.current.moving = true;
-        if (active <= -1) {
+        if (currentActive <= -1) {
             move({
                 pace: childCount
             });
         }
-        if (active >= childCount) {
+        if (currentActive >= childCount) {
             move({
                 pace: -childCount
             });
@@ -366,6 +377,20 @@ var NoticeBar = function NoticeBar(props) {
             stopAutoPlay();
         };
     }, []);
+    var hasVerticalContent = (0, _react.useMemo)(function() {
+        if (!isVertical) return false;
+        if (children) return (childs === null || childs === void 0 ? void 0 : childs.length) > 0;
+        return (list === null || list === void 0 ? void 0 : list.length) > 0;
+    }, [
+        isVertical,
+        childs,
+        list,
+        children
+    ]);
+    var containerRefCallback = (0, _react.useCallback)(function(ref) {
+        container.current = ref;
+        setIsContainerReady(true);
+    }, []);
     return /*#__PURE__*/ _react.default.createElement("div", {
         className: cls,
         style: style
@@ -391,10 +416,10 @@ var NoticeBar = function NoticeBar(props) {
     }, rightIcon || /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, {
         width: 12,
         height: 12
-    })) : null) : null, showNoticeBar && scrollList.current.length > 0 && isVertical ? /*#__PURE__*/ _react.default.createElement("div", {
+    })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ _react.default.createElement("div", {
         className: "nut-noticebar-vertical",
         style: barStyle,
-        ref: container,
+        ref: containerRefCallback,
         onClick: handleClick
     }, leftIcon ? /*#__PURE__*/ _react.default.createElement("div", {
         className: "nut-noticebar-box-left-icon"

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

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

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

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

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

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

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

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

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

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

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

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

package/dist/cjs/types/spec/calendar/base.d.ts

@@ -4,6 +4,8 @@ import { BaseProps } from '../../base/props';
 export interface CalendarDay {
     day: SimpleValue;
     type: string;
+    month?: SimpleValue;
+    year?: SimpleValue;
 }
 export interface CalendarMonthInfo {
     curData: string[] | string;
@@ -43,7 +45,7 @@ export interface BaseCalendar {
     renderDayBottom?: (date: CalendarDay) => string | JSX.Element;
     onClose: () => void;
     onConfirm: (param: string) => void;
-    onDayClick: (data: string) => void;
+    onDayClick: (data: string[]) => void;
     onPageChange: (param: string) => void;
 }
 export interface BaseCalendarItem extends BaseProps {

package/dist/cjs/types/spec/calendarcard/base.d.ts

@@ -17,6 +17,7 @@ export type CalendarCardRef = {
 };
 export interface BaseCalendarCard extends BaseProps {
     type: 'single' | 'multiple' | 'range' | 'week';
+    title: ReactNode;
     value: CalendarCardValue;
     defaultValue: CalendarCardValue;
     firstDayOfWeek: number;

package/dist/cjs/types/spec/datepicker/base.d.ts

@@ -5,7 +5,7 @@ export interface BaseDatePicker extends BaseProps {
     defaultValue?: Date;
     visible: boolean;
     title: string;
-    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes';
+    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes' | '';
     showChinese: boolean;
     minuteStep: number;
     startDate: Date;

package/dist/cjs/types/spec/imagepreview/h5.d.ts

@@ -1,3 +1,6 @@
 import { BaseImagePreview } from './base';
-export interface WebImagePreviewProps extends BaseImagePreview {
+import { WebSwiperProps } from "../../../types";
+type props = BaseImagePreview & Omit<WebSwiperProps, 'autoPlay' | 'indicator'>;
+export interface WebImagePreviewProps extends Omit<props, 'autoplay'> {
 }
+export {};

package/dist/cjs/types/spec/imagepreview/taro.d.ts

@@ -1,5 +1,8 @@
 import { BaseImagePreview } from './base';
-export interface TaroImagePreviewProps extends Omit<BaseImagePreview, 'autoPlay'> {
+import { TaroSwiperProps } from "../../../types";
+type props = Omit<BaseImagePreview, 'autoPlay'> & Omit<TaroSwiperProps, 'autoPlay' | 'autoplay' | 'indicator'>;
+export interface TaroImagePreviewProps extends props {
     autoPlay: boolean;
     showMenuByLongpress: boolean;
 }
+export {};

package/dist/cjs/utils/date.d.ts

@@ -60,6 +60,6 @@ export declare const getDaysStatus: (type: string, year: number, month: number)
 export declare const getPreMonthDates: (type: string, year: number, month: number, firstDayOfWeek: number) => {
     day: number;
     type: string;
-    preYear: number;
-    preMonth: number;
+    year: number;
+    month: number;
 }[];

package/dist/cjs/utils/date.js

@@ -250,8 +250,8 @@ var getPreMonthDates = function getPreMonthDates(type, year, month, firstDayOfWe
         return {
             day: k + 1,
             type: type,
-            preYear: preYear,
-            preMonth: preMonth
+            year: preYear,
+            month: preMonth
         };
     });
     return months.slice(preDates - days);

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

@@ -286,6 +286,7 @@
       color: $button-success-color;
     }
 
+    &-disabled,
     &-solid-disabled {
       background: $button-success-disabled;
       border-color: $button-success-disabled;
@@ -320,6 +321,7 @@
       color: $button-info-color;
     }
 
+    &-disabled,
     &-solid-disabled {
       background: $button-info-disabled;
       border-color: $button-info-disabled;
@@ -354,6 +356,7 @@
       color: $button-danger-color;
     }
 
+    &-disabled,
     &-solid-disabled {
       background: $button-danger-disabled;
       border-color: $button-danger-disabled;

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

@@ -239,7 +239,7 @@
 .nut-button-success-children {
   color: var(--nutui-button-success-color, #ffffff);
 }
-.nut-button-success-solid-disabled {
+.nut-button-success-disabled, .nut-button-success-solid-disabled {
   background: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
   border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
 }
@@ -266,7 +266,7 @@
 .nut-button-info-children {
   color: var(--nutui-button-info-color, #ffffff);
 }
-.nut-button-info-solid-disabled {
+.nut-button-info-disabled, .nut-button-info-solid-disabled {
   background: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
   border-color: var(--nutui-button-info-disabled, var(--nutui-color-info-disabled, #89a6f8));
 }
@@ -293,7 +293,7 @@
 .nut-button-danger-children {
   color: var(--nutui-button-danger-color, #ffffff);
 }
-.nut-button-danger-solid-disabled {
+.nut-button-danger-disabled, .nut-button-danger-solid-disabled {
   background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
   border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }