@nutui/nutui-react 3.0.15 → 3.0.16

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,16 +290,17 @@ 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 + 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/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/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);

package/dist/nutui.react.umd.js

@@ -2077,8 +2077,8 @@ Check the top-level render call using <` + t + ">.");
       return {
         day: k + 1,
         type: type2,
-        preYear,
-        preMonth
+        year: preYear,
+        month: preMonth
       };
     });
     return months.slice(preDates - days);
@@ -12730,13 +12730,13 @@ Please add \`${key2}Action\` when creating your handler.`);
     renderDay: void 0,
     renderDayTop: void 0,
     renderDayBottom: void 0,
-    onConfirm: function(data2) {
+    onConfirm: function() {
     },
     onUpdate: function() {
     },
-    onDayClick: function(data2) {
+    onDayClick: function() {
     },
-    onPageChange: function(data2) {
+    onPageChange: function() {
     }
   });
   var CalendarItem = /* @__PURE__ */ React.forwardRef(function(props, ref) {
@@ -20884,9 +20884,10 @@ Please add \`${key2}Action\` when creating your handler.`);
     var _useState8 = _sliced_to_array(React.useState(null), 2), isCanScroll = _useState8[0], SetIsCanScroll = _useState8[1];
     var isVertical = direction === "vertical";
     var _useState9 = _sliced_to_array(React.useState(null), 2), rect = _useState9[0], setRect = _useState9[1];
-    var active2 = 0;
+    var activeRef = React.useRef(0);
     var _useState10 = _sliced_to_array(React.useState(false), 2), ready = _useState10[0], setReady = _useState10[1];
     var container = React.useRef(null);
+    var _useState11 = _sliced_to_array(React.useState(false), 2), isContainerReady = _useState11[0], setIsContainerReady = _useState11[1];
     var innerRef = React.useRef(null);
     var swiperRef = React.useRef({
       moving: false,
@@ -20896,8 +20897,8 @@ Please add \`${key2}Action\` when creating your handler.`);
       offset: 0,
       size: 0
     });
-    var _useState11 = _sliced_to_array(React.useState([]), 2), childOffset = _useState11[0], setChildOffset = _useState11[1];
-    var _useState12 = _sliced_to_array(React.useState(0), 2), offset = _useState12[0], setOffset = _useState12[1];
+    var _useState12 = _sliced_to_array(React.useState([]), 2), childOffset = _useState12[0], setChildOffset = _useState12[1];
+    var _useState13 = _sliced_to_array(React.useState(0), 2), offset = _useState13[0], setOffset = _useState13[1];
     var _useMemo = React.useMemo(function() {
       var childCount2 = 0;
       var childs2 = React.Children.map(children, function(child) {
@@ -20934,7 +20935,9 @@ Please add \`${key2}Action\` when creating your handler.`);
       return function() {
         clearInterval(timer);
       };
-    }, []);
+    }, [
+      childs
+    ]);
     React.useEffect(function() {
       initScrollWrap();
     }, [
@@ -21027,24 +21030,23 @@ Please add \`${key2}Action\` when creating your handler.`);
       marginTop: animate ? "-".concat(height2, "px") : ""
     };
     var init = function() {
-      var active3 = 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, active3), 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;
-      }
-      active3 = _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);
     };
     React.useEffect(function() {
       if (ready) {
-        stopAutoPlay();
         autoplay();
       }
       return function() {
@@ -21054,17 +21056,18 @@ Please add \`${key2}Action\` when creating your handler.`);
       ready
     ]);
     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() {
       clearTimeout(swiperRef.current.autoplayTimer);
+      swiperRef.current.moving = false;
       swiperRef.current.autoplayTimer = null;
     };
     var autoplay = function() {
@@ -21080,21 +21083,24 @@ Please add \`${key2}Action\` when creating your handler.`);
       if (childCount <= 1) return;
       var targetActive = getActive(pace);
       var targetOffset = getOffset(targetActive, offset2);
-      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);
-      active2 = 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;
@@ -21107,15 +21113,16 @@ Please add \`${key2}Action\` when creating your handler.`);
     var handleItemClick = function(event, value2) {
       onItemClick && onItemClick(event, value2);
     };
-    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 val2 = rect.height - height2;
-      _offset = moveOffset + Number(active2 === childCount - 1 && val2 / 2);
+      var containerHeight = (currentRect === null || currentRect === void 0 ? void 0 : currentRect.height) || height2;
+      var val2 = containerHeight - Number(height2);
+      _offset = moveOffset + Number(activeRef.current === childCount - 1 && val2 / 2);
       target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
       target.style.height = "".concat(Number(height2) * (childCount + 1), "px");
       target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
@@ -21133,15 +21140,16 @@ Please add \`${key2}Action\` when creating your handler.`);
       return style2;
     };
     var getActive = function(pace) {
+      var currentActive = activeRef.current;
       if (pace) {
-        var _active = active2 + pace;
+        var _active = currentActive + pace;
         return range2(_active, -1, childCount);
       }
-      return active2;
+      return currentActive;
     };
-    var getOffset = function(active3) {
+    var getOffset = function(active2) {
       var offset2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-      var currentPosition = active3 * Number(height2);
+      var currentPosition = active2 * Number(height2);
       var targetOffset = offset2 - currentPosition;
       return targetOffset;
     };
@@ -21151,14 +21159,15 @@ Please add \`${key2}Action\` when creating your handler.`);
     var range2 = function(num, min, max) {
       return Math.min(Math.max(num, min), max);
     };
-    var resettPosition = function() {
+    var resetPosition = function() {
+      var currentActive = activeRef.current;
       swiperRef.current.moving = true;
-      if (active2 <= -1) {
+      if (currentActive <= -1) {
         move({
           pace: childCount
         });
       }
-      if (active2 >= childCount) {
+      if (currentActive >= childCount) {
         move({
           pace: -childCount
         });
@@ -21172,6 +21181,20 @@ Please add \`${key2}Action\` when creating your handler.`);
         stopAutoPlay();
       };
     }, []);
+    var hasVerticalContent = 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 = React.useCallback(function(ref) {
+      container.current = ref;
+      setIsContainerReady(true);
+    }, []);
     return /* @__PURE__ */ React.createElement("div", {
       className: cls,
       style
@@ -21197,10 +21220,10 @@ Please add \`${key2}Action\` when creating your handler.`);
     }, rightIcon || /* @__PURE__ */ React.createElement(n$6, {
       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"
@@ -24307,7 +24330,24 @@ Please add \`${key2}Action\` when creating your handler.`);
     }
   });
   var ImagePreview = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$g, props), value2 = _$_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$g, props), value2 = _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 classPrefix2 = "nut-imagepreview";
     var ref = React.useRef(null);
     var _usePropsValue = _sliced_to_array(usePropsValue({
@@ -24435,21 +24475,18 @@ Please add \`${key2}Action\` when creating your handler.`);
       style,
       ref,
       onTouchStart
-    }, showPop && /* @__PURE__ */ React.createElement(InnerSwiper, {
-      autoPlay: !!duration,
-      duration,
+    }, showPop && /* @__PURE__ */ React.createElement(InnerSwiper, _object_spread({
+      autoplay: !!duration,
       className: "".concat(classPrefix2, "-swiper"),
-      loop: true,
       style: {
         "--nutui-indicator-color": indicatorColor
       },
-      direction: "horizontal",
       onChange: function(page) {
         return slideChangeEnd(page);
       },
       defaultValue: innerNo > maxNo ? maxNo - 1 : innerNo - 1,
       indicator
-    }, _to_consumable_array(videos.map(function(item) {
+    }, rest), _to_consumable_array(videos.map(function(item) {
       return {
         type: "video",
         data: item