@nutui/nutui-react 3.0.14 → 3.0.16

package/dist/es/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/es/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/es/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/es/packages/imagepreview/imagepreview.js

@@ -1,5 +1,6 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import React, { useEffect, useRef, useState } from "react";
@@ -12,6 +13,7 @@ import Swiper from "../swiper";
 import SwiperItem from "../swiperitem";
 import { ComponentDefaults } from "../../utils/typings";
 import { usePropsValue } from "../../hooks/use-props-value";
+import { mergeProps } from "../../utils";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     images: [],
     videos: [],
@@ -28,7 +30,24 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     onClose: function() {}
 });
 export var ImagePreview = function(props) {
-    var _$_object_spread = _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 = 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 = _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 = useRef(null);
     var _usePropsValue = _sliced_to_array(usePropsValue({
@@ -167,21 +186,18 @@ export var ImagePreview = function(props) {
         style: style,
         ref: ref,
         onTouchStart: onTouchStart
-    }, showPop && /*#__PURE__*/ React.createElement(Swiper, {
-        autoPlay: !!duration,
-        duration: duration,
+    }, showPop && /*#__PURE__*/ React.createElement(Swiper, _object_spread({
+        autoplay: !!duration,
         className: "".concat(classPrefix, "-swiper"),
-        loop: true,
         style: {
             '--nutui-indicator-color': indicatorColor
         },
-        direction: "horizontal",
         onChange: function(page) {
             return slideChangeEnd(page);
         },
         defaultValue: innerNo > maxNo ? maxNo - 1 : innerNo - 1,
         indicator: indicator
-    }, _to_consumable_array(videos.map(function(item) {
+    }, rest), _to_consumable_array(videos.map(function(item) {
         return {
             type: 'video',
             data: item

package/dist/es/packages/noticebar/noticebar.js

@@ -2,7 +2,8 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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 React, { useEffect, useMemo, useRef, useState } from "react";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import React, { useEffect, useMemo, useRef, useState, useCallback } from "react";
 import { Close, Notice } from "@nutui/icons-react";
 import classNames from "classnames";
 import { getRect } from "../../utils/get-rect";
@@ -45,9 +46,10 @@ export var NoticeBar = function(props) {
     var _useState8 = _sliced_to_array(useState(null), 2), isCanScroll = _useState8[0], SetIsCanScroll = _useState8[1];
     var isVertical = direction === 'vertical';
     var _useState9 = _sliced_to_array(useState(null), 2), rect = _useState9[0], setRect = _useState9[1];
-    var active = 0;
+    var activeRef = useRef(0);
     var _useState10 = _sliced_to_array(useState(false), 2), ready = _useState10[0], setReady = _useState10[1];
     var container = useRef(null);
+    var _useState11 = _sliced_to_array(useState(false), 2), isContainerReady = _useState11[0], setIsContainerReady = _useState11[1];
     var innerRef = useRef(null);
     var swiperRef = useRef({
         moving: false,
@@ -57,8 +59,8 @@ export var NoticeBar = function(props) {
         offset: 0,
         size: 0
     });
-    var _useState11 = _sliced_to_array(useState([]), 2), childOffset = _useState11[0], setChildOffset = _useState11[1];
-    var _useState12 = _sliced_to_array(useState(0), 2), offset = _useState12[0], setOffset = _useState12[1];
+    var _useState12 = _sliced_to_array(useState([]), 2), childOffset = _useState12[0], setChildOffset = _useState12[1];
+    var _useState13 = _sliced_to_array(useState(0), 2), offset = _useState13[0], setOffset = _useState13[1];
     var _useMemo = useMemo(function() {
         var childCount = 0;
         var childs = React.Children.map(children, function(child) {
@@ -98,7 +100,9 @@ export var NoticeBar = function(props) {
             // 销毁事件
             clearInterval(timer);
         };
-    }, []);
+    }, [
+        childs
+    ]);
     useEffect(function() {
         initScrollWrap(content);
     }, [
@@ -196,24 +200,24 @@ export var NoticeBar = function(props) {
     };
     // 垂直自定义滚动方式
     var init = function() {
-        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 = 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);
     };
     useEffect(function() {
         if (ready) {
-            stopAutoPlay();
             autoplay();
         }
         return function() {
@@ -223,18 +227,19 @@ export var NoticeBar = function(props) {
         ready
     ]);
     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() {
         clearTimeout(swiperRef.current.autoplayTimer);
+        swiperRef.current.moving = false;
         swiperRef.current.autoplayTimer = null;
     };
     // 定时轮播
@@ -254,22 +259,25 @@ export var NoticeBar = function(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 = _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() {
-        resettPosition();
+        resetPosition();
         requestFrame(function() {
             requestFrame(function() {
                 swiperRef.current.moving = false;
@@ -282,18 +290,19 @@ export var NoticeBar = function(props) {
     var handleItemClick = function(event, value) {
         onItemClick && onItemClick(event, value);
     };
-    var getStyle = function() {
-        var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset;
+    var setStyle = function() {
+        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)");
     };
     // 无缝滚动第一个元素位移控制
@@ -311,11 +320,12 @@ export var NoticeBar = function(props) {
     };
     // 确定当前active 元素
     var getActive = function(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(active) {
@@ -333,14 +343,15 @@ export var NoticeBar = function(props) {
         return Math.min(Math.max(num, min), max);
     };
     // 重置首尾位置信息
-    var resettPosition = function() {
+    var resetPosition = function() {
+        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
             });
@@ -354,6 +365,20 @@ export var NoticeBar = function(props) {
             stopAutoPlay();
         };
     }, []);
+    var hasVerticalContent = 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 = useCallback(function(ref) {
+        container.current = ref;
+        setIsContainerReady(true);
+    }, []);
     return /*#__PURE__*/ React.createElement("div", {
         className: cls,
         style: style
@@ -379,10 +404,10 @@ export var NoticeBar = function(props) {
     }, rightIcon || /*#__PURE__*/ React.createElement(Close, {
         width: 12,
         height: 12
-    })) : null) : null, showNoticeBar && scrollList.current.length > 0 && isVertical ? /*#__PURE__*/ React.createElement("div", {
+    })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement("div", {
         className: "nut-noticebar-vertical",
         style: barStyle,
-        ref: container,
+        ref: containerRefCallback,
         onClick: handleClick
     }, leftIcon ? /*#__PURE__*/ React.createElement("div", {
         className: "nut-noticebar-box-left-icon"

package/dist/es/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/es/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/es/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/es/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/es/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/es/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/es/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;
@@ -121,7 +123,7 @@ export interface BaseCalendar {
     /**
     * 点击/选择后触发
     */
-    onDayClick: (data: string) => void
+    onDayClick: (data: string[]) => void
     /**
     * 年月子标题到达顶部时触发
     */

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

@@ -21,6 +21,10 @@ export interface BaseCalendarCard extends BaseProps {
     */
     type: 'single' | 'multiple' | 'range' | 'week'
     /**
+    * 自定义标题
+    */
+    title: ReactNode
+    /**
     * 受控模式下的值，与 onChange 搭配使用
     */
     value: CalendarCardValue

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

@@ -20,7 +20,7 @@ export interface BaseDatePicker extends BaseProps {
     /**
     * 类时间类型，可选值 date time year-month month-day datehour datetime hour-minutes
     */
-    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes'
+    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes' | ''
     /**
     * 每列是否展示中文
     */

package/dist/es/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/es/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/es/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/es/utils/date.js

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