@nutui/nutui-react-taro 1.4.7 → 1.4.8

package/dist/nutui.react.es.js

@@ -1,11 +1,11 @@
 /*!
-* @nutui/nutui-react-taro v1.4.7 Wed Feb 15 2023 16:34:56 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.4.8 Wed Feb 22 2023 17:16:25 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
 import * as React from "react";
 import React__default, { useCallback, useState, useEffect, createContext, useContext, useMemo, useRef, forwardRef, useImperativeHandle, useLayoutEffect, Component, memo } from "react";
-import Taro, { redirectTo, navigateTo, getEnv, usePageScroll, getSystemInfoSync, nextTick, createSelectorQuery, uploadFile, chooseImage, pageScrollTo, createInnerAudioContext, useReady, getSystemInfo, createOffscreenCanvas, canvasToTempFilePath } from "@tarojs/taro";
+import Taro, { redirectTo, navigateTo, getEnv, usePageScroll, getSystemInfoSync, nextTick, createSelectorQuery, uploadFile, chooseImage, pageScrollTo, useReady, createInnerAudioContext, getSystemInfo, createOffscreenCanvas, canvasToTempFilePath } from "@tarojs/taro";
 import ReactDOM, { createPortal, unstable_batchedUpdates } from "react-dom";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getAugmentedNamespace(n) {
@@ -1745,7 +1745,7 @@ const Col = (props) => {
     setColStyle(getStyle);
   }, [span, offset, gutter]);
   return /* @__PURE__ */ React__default.createElement("div", {
-    className: `${colName} ${className}`,
+    className: classNames(colName, className),
     style: { ...style, ...colStyle },
     onClick: (e2) => {
       onClick && onClick(e2, "col");
@@ -2040,7 +2040,7 @@ const Row = (props) => {
   }, React__default.createElement(
     "div",
     {
-      className: `${getClasses()} ${className}`,
+      className: classNames(getClasses(), className),
       style,
       onClick: (e2) => {
         onClick && onClick(e2, "row");
@@ -3245,15 +3245,14 @@ const defaultProps$18 = {
   safeAreaInsetBottom: false,
   className: "",
   style: {},
-  tabSwitch: () => {
-  },
-  onSwitch: () => {
+  onSwitch: (child, activeVisible) => {
   }
 };
 const Tabbar = (props) => {
   const {
     children,
     visible,
+    activeVisible,
     bottom,
     size,
     activeColor,
@@ -3261,17 +3260,23 @@ const Tabbar = (props) => {
     safeAreaInsetBottom,
     className,
     style,
-    tabSwitch,
     onSwitch
   } = {
     ...defaultProps$18,
     ...props
   };
   const b2 = cn("tabbar");
-  const [selectIndex, setSelectIndex] = useState(visible);
+  const [selectIndex, setSelectIndex] = useState(activeVisible || visible);
   const handleClick = (idx) => {
-    setSelectIndex(idx);
+    if (!("activeVisible" in props)) {
+      setSelectIndex(idx);
+    }
   };
+  useEffect(() => {
+    if (activeVisible !== void 0) {
+      setSelectIndex(activeVisible);
+    }
+  }, [activeVisible]);
   return /* @__PURE__ */ React__default.createElement("div", {
     className: [
       `${b2()}`,
@@ -3293,7 +3298,6 @@ const Tabbar = (props) => {
       size,
       handleClick: () => {
         handleClick(idx);
-        tabSwitch(child, idx);
         onSwitch(child, idx);
       }
     };
@@ -3391,14 +3395,21 @@ const defaultProps$16 = {
   disabled: false
 };
 const TabPane = (props) => {
-  const { children, paneKey, activeKey, autoHeightClassName, className } = {
+  const {
+    children,
+    paneKey,
+    activeKey,
+    autoHeightClassName,
+    className,
+    disabled
+  } = {
     ...defaultProps$16,
     ...props
   };
   const b2 = cn("tabpane");
   const classes = classNames(
     {
-      active: paneKey === activeKey
+      active: !disabled && paneKey === activeKey
     },
     b2(""),
     autoHeightClassName,
@@ -3406,7 +3417,7 @@ const TabPane = (props) => {
   );
   return /* @__PURE__ */ React__default.createElement("div", {
     className: classes
-  }, children);
+  }, !disabled && children);
 };
 class Title {
   constructor() {
@@ -3429,6 +3440,7 @@ const defaultProps$15 = {
   animatedTime: 300,
   titleGutter: 0,
   size: "normal",
+  leftAlign: false,
   autoHeight: false
 };
 const pxCheck$2 = (value) => {
@@ -3447,6 +3459,7 @@ const Tabs = (props) => {
     animatedTime,
     titleGutter,
     size,
+    leftAlign,
     titleNode,
     children,
     onClick,
@@ -3527,8 +3540,9 @@ const Tabs = (props) => {
       onClick: (e2) => tabChange(item),
       className: classNames(
         {
-          active: String(item.paneKey) === String(value),
-          disabled: item.disabled
+          active: !item.disabled && String(item.paneKey) === String(value),
+          disabled: item.disabled,
+          "nut-tabs__titles-item-left-align": leftAlign
         },
         `${b2("")}__titles-item`
       ),
@@ -3678,14 +3692,25 @@ const defaultProps$14 = {
   defaultValue: "",
   startDate: Utils.getDay(0),
   endDate: Utils.getDay(365),
+  showToday: true,
+  startText: "\u5F00\u59CB",
+  endText: "\u7ED3\u675F",
+  confirmText: "\u786E\u8BA4",
+  showTitle: true,
+  showSubTitle: true,
+  toDateAnimation: true,
+  onBtn: void 0,
+  onDay: void 0,
+  onTopInfo: void 0,
+  onBottomInfo: void 0,
   onChoose: (data) => {
   },
   onUpdate: () => {
   },
-  onClose: () => {
+  onSelected: (data) => {
   }
 };
-const CalendarItem = (props) => {
+const CalendarItem = React__default.forwardRef((props, ref) => {
   const { locale } = useConfig$1();
   const {
     type,
@@ -3693,18 +3718,31 @@ const CalendarItem = (props) => {
     poppable,
     title,
     defaultValue,
-    startDate,
-    endDate,
+    showToday,
+    startText,
+    endText,
+    confirmText,
+    showTitle,
+    showSubTitle,
+    toDateAnimation,
+    onBtn,
+    onDay,
+    onTopInfo,
+    onBottomInfo,
     onChoose,
     onUpdate,
-    onClose
+    onSelected
   } = { ...defaultProps$14, ...props };
   const weeks = locale.calendaritem.weekdays;
   const [yearMonthTitle, setYearMonthTitle] = useState("");
-  const [unLoadPrev, setUnLoadPrev] = useState(false);
   const [monthsData, setMonthsData] = useState([]);
+  const [translateY, setTranslateY] = useState(0);
+  const [monthDefaultRange, setMonthDefaultRange] = useState([]);
   const [state] = useState({
     currDate: "",
+    propStartDate: "",
+    propEndDate: "",
+    unLoadPrev: false,
     touchParams: {
       startY: 0,
       endY: 0,
@@ -3714,7 +3752,6 @@ const CalendarItem = (props) => {
       lastTime: 0
     },
     transformY: 0,
-    translateY: 0,
     scrollDistance: 0,
     defaultData: [],
     chooseData: [],
@@ -3722,12 +3759,17 @@ const CalendarItem = (props) => {
     dayPrefix: "calendar-month-day",
     startData: "",
     endData: "",
-    isRange: type === "range",
-    timer: 0
+    isRange: props.type === "range",
+    timer: 0,
+    currentIndex: 0,
+    avgHeight: 0,
+    monthsNum: 0
   });
   const weeksPanel = useRef(null);
   const months = useRef(null);
   const monthsPanel = useRef(null);
+  const viewArea = useRef(null);
+  let viewHeight = 0;
   const b2 = cn("calendar");
   const classes = classNames(
     {
@@ -3753,23 +3795,29 @@ const CalendarItem = (props) => {
   const isEnd = (currDate) => {
     return Utils.isEqual(state.currDate[1], currDate);
   };
-  const getCurrDate = (day, month, isRange) => {
-    return isRange ? `${month.curData[3]}-${month.curData[4]}-${Utils.getNumTwoBit(
-      +day.day
-    )}` : `${month.curData[0]}-${month.curData[1]}-${Utils.getNumTwoBit(
+  const isMultiple = (currDate) => {
+    if (state.currDate.length > 0) {
+      return state.currDate.some((item) => {
+        return Utils.isEqual(item, currDate);
+      });
+    }
+    return false;
+  };
+  const getCurrDate = (day, month) => {
+    return `${month.curData[0]}-${month.curData[1]}-${Utils.getNumTwoBit(
       +day.day
     )}`;
   };
-  const getClass = (day, month, isRange) => {
-    const currDate = getCurrDate(day, month, isRange);
+  const getClass = (day, month) => {
+    const currDate = getCurrDate(day, month);
     if (day.type === "curr") {
-      if (!state.isRange && Utils.isEqual(state.currDate, currDate) || state.isRange && (isStart(currDate) || isEnd(currDate))) {
+      if (Utils.isEqual(state.currDate, currDate) || type === "range" && (isStart(currDate) || isEnd(currDate)) || type === "multiple" && isMultiple(currDate)) {
         return `${state.dayPrefix}-active`;
       }
-      if (startDate && Utils.compareDate(currDate, startDate) || endDate && Utils.compareDate(endDate, currDate)) {
+      if (state.propStartDate && Utils.compareDate(currDate, state.propStartDate) || state.propEndDate && Utils.compareDate(state.propEndDate, currDate)) {
         return `${state.dayPrefix}-disabled`;
       }
-      if (state.isRange && Array.isArray(state.currDate) && Object.values(state.currDate).length === 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
+      if (type === "range" && Array.isArray(state.currDate) && Object.values(state.currDate).length === 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
         return `${state.dayPrefix}-choose`;
       }
       return null;
@@ -3784,25 +3832,46 @@ const CalendarItem = (props) => {
     return Utils.isEqual(date, Utils.date2Str(new Date()));
   };
   const confirm = () => {
-    if (state.isRange && state.chooseData.length === 2 || !state.isRange) {
-      onChoose && onChoose(state.chooseData);
+    const { type: type2 } = props;
+    if (type2 === "range" && state.chooseData.length === 2 || type2 !== "range") {
+      const chooseData = state.chooseData.slice(0);
+      onChoose && onChoose(chooseData);
       if (poppable) {
         onUpdate && onUpdate();
       }
     }
   };
-  const chooseDay = (day, month, isFirst, isRange) => {
-    if (getClass(day, month, isRange) !== `${state.dayPrefix}-disabled`) {
-      let days = [...month.curData];
-      days = isRange ? days.splice(3) : days.splice(0, 3);
+  const chooseDay = (day, month, isFirst) => {
+    if (getClass(day, month) !== `${state.dayPrefix}-disabled`) {
+      const { type: type2 } = props;
+      const days = [...month.curData];
       days[2] = typeof day.day === "number" ? Utils.getNumTwoBit(day.day) : day.day;
       days[3] = `${days[0]}-${days[1]}-${days[2]}`;
       days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
-      if (!state.isRange) {
-        state.currDate = days[3];
-        state.chooseData = [...days];
-      } else {
-        if (Object.values(state.currDate).length === 2) {
+      if (type2 === "multiple") {
+        if (state.currDate.length > 0) {
+          let hasIndex = "";
+          state.currDate.forEach((item, index) => {
+            if (item === days[3]) {
+              hasIndex = index;
+            }
+          });
+          if (isFirst) {
+            state.chooseData.push([...days]);
+          } else if (hasIndex !== "") {
+            state.currDate.splice(hasIndex, 1);
+            state.chooseData.splice(hasIndex, 1);
+          } else {
+            state.currDate.push(days[3]);
+            state.chooseData.push([...days]);
+          }
+        } else {
+          state.currDate = [days[3]];
+          state.chooseData = [[...days]];
+        }
+      } else if (type2 === "range") {
+        const curDataLength = Object.values(state.currDate).length;
+        if (curDataLength === 2 || curDataLength === 0) {
           state.currDate = [days[3]];
         } else if (Utils.compareDate(state.currDate[0], days[3])) {
           Array.isArray(state.currDate) && state.currDate.push(days[3]);
@@ -3810,30 +3879,39 @@ const CalendarItem = (props) => {
           Array.isArray(state.currDate) && state.currDate.unshift(days[3]);
         }
         if (state.chooseData.length === 2 || !state.chooseData.length) {
-          state.chooseData = [...days];
-        } else if (Utils.compareDate(state.chooseData[3], days[3])) {
-          state.chooseData = [[...state.chooseData], [...days]];
+          state.chooseData = [[...days]];
+        } else if (Utils.compareDate(state.chooseData[0][3], days[3])) {
+          state.chooseData = [...state.chooseData, [...days]];
         } else {
-          state.chooseData = [[...days], [...state.chooseData]];
+          state.chooseData = [[...days], ...state.chooseData];
         }
+      } else {
+        state.currDate = days[3];
+        state.chooseData = [...days];
       }
-      if (isAutoBackFill && !isFirst) {
-        confirm();
+      if (!isFirst) {
+        onSelected && onSelected(state.chooseData);
+        if (isAutoBackFill || !poppable) {
+          confirm();
+        }
       }
       setMonthsData(state.monthsData.slice());
     }
   };
   const isStartTip = (day, month) => {
-    if (isActive(day, month)) {
-      return isStart(getCurrDate(day, month));
+    return isActive(day, month) && isStart(getCurrDate(day, month));
+  };
+  const isEndTip = (day, month) => {
+    if (state.currDate.length >= 2 && isEnd(getCurrDate(day, month))) {
+      return isActive(day, month);
     }
     return false;
   };
-  const isEndTip = (day, month) => {
-    if (isStartTip(day, month)) {
-      return false;
+  const rangeTip = () => {
+    if (state.currDate.length >= 2) {
+      return Utils.isEqual(state.currDate[0], state.currDate[1]);
     }
-    return isActive(day, month);
+    return false;
   };
   const getCurrData = (type2) => {
     const monthData = type2 === "prev" ? state.monthsData[0] : state.monthsData[state.monthsData.length - 1];
@@ -3855,20 +3933,45 @@ const CalendarItem = (props) => {
       Utils.getMonthDays(String(year), String(month))
     ];
   };
-  const getDaysStatus = (days, type2) => {
+  const getDaysStatus = (days, type2, dateInfo) => {
+    const { year, month } = dateInfo;
     if (type2 === "prev" && days >= 7) {
       days -= 7;
     }
     return Array.from(Array(days), (v, k) => {
       return {
         day: k + 1,
-        type: type2
+        type: type2,
+        year,
+        month
       };
     });
   };
+  const getPreDaysStatus = (days, type2, dateInfo, preCurrMonthDays) => {
+    const { year, month } = dateInfo;
+    if (type2 === "prev" && days >= 7) {
+      days -= 7;
+    }
+    const months2 = Array.from(Array(preCurrMonthDays), (v, k) => {
+      return {
+        day: k + 1,
+        type: type2,
+        year,
+        month
+      };
+    });
+    return months2.slice(preCurrMonthDays - days);
+  };
   const getMonth = (curData, type2) => {
     const preMonthDays = Utils.getMonthPreDay(+curData[0], +curData[1]);
+    let preMonth = +curData[1] - 1;
+    let preYear = curData[0];
+    if (preMonth <= 0) {
+      preMonth = 12;
+      preYear += 1;
+    }
     const currMonthDays = Utils.getMonthDays(curData[0], curData[1]);
+    const preCurrMonthDays = Utils.getMonthDays(`${preYear}`, `${preMonth}`);
     const title2 = {
       year: curData[0],
       month: curData[1]
@@ -3877,10 +3980,21 @@ const CalendarItem = (props) => {
       curData,
       title: locale.calendaritem.monthTitle(title2.year, title2.month),
       monthData: [
-        ...getDaysStatus(preMonthDays, "prev"),
-        ...getDaysStatus(currMonthDays, "curr")
+        ...getPreDaysStatus(
+          preMonthDays,
+          "prev",
+          { month: preMonth, year: preYear },
+          preCurrMonthDays
+        ),
+        ...getDaysStatus(currMonthDays, "curr", title2)
       ]
     };
+    monthInfo.cssHeight = 39 + (monthInfo.monthData.length > 35 ? 384 : 320);
+    let cssScrollHeight = 0;
+    if (state.monthsData.length > 0) {
+      cssScrollHeight = state.monthsData[state.monthsData.length - 1].cssScrollHeight + state.monthsData[state.monthsData.length - 1].cssHeight;
+    }
+    monthInfo.cssScrollHeight = cssScrollHeight;
     if (type2 === "next") {
       if (!state.endData || !Utils.compareDate(
         `${state.endData[0]}-${state.endData[1]}-${Utils.getMonthDays(
@@ -3896,183 +4010,260 @@ const CalendarItem = (props) => {
       `${state.startData[0]}-${state.startData[1]}-01`
     )) {
       state.monthsData.unshift(monthInfo);
-    } else {
-      setUnLoadPrev(true);
     }
     setMonthsData(state.monthsData);
   };
-  const loadScroll = () => {
-    if (!props.poppable) {
-      return false;
-    }
-    requestAniFrame$1(async () => {
-      if ((weeksPanel == null ? void 0 : weeksPanel.current) && (monthsPanel == null ? void 0 : monthsPanel.current)) {
-        const weeksPanelRes = await getRectByTaro(weeksPanel == null ? void 0 : weeksPanel.current);
-        weeksPanelRes == null ? void 0 : weeksPanelRes.bottom;
-        const monthsDoms = monthsPanel.current.getElementsByClassName("calendar-month");
-        for (let i = 0; i < monthsDoms.length; i++) {
-        }
+  const setDefaultRange = (monthsNum, current) => {
+    let start2 = 0;
+    let end = 0;
+    if (monthsNum >= 3) {
+      if (current > 0 && current < monthsNum) {
+        start2 = current - 1;
+        end = current + 3;
+      } else if (current === 0) {
+        start2 = current;
+        end = current + 4;
+      } else if (current === monthsNum) {
+        start2 = current - 2;
+        end = current + 2;
       }
-    });
-  };
-  const setTransform = (translateY = 0, type2, time = 1e3) => {
-    if (monthsPanel == null ? void 0 : monthsPanel.current) {
-      if (type2 === "end") {
-        monthsPanel.current.style.webkitTransition = `transform ${time}ms cubic-bezier(0.19, 1, 0.22, 1)`;
-        clearTimeout(state.timer);
-        state.timer = window.setTimeout(() => {
-          loadScroll();
-        }, time);
-      } else {
-        monthsPanel.current.style.webkitTransition = "";
-        loadScroll();
-      }
-      monthsPanel.current.style.webkitTransform = `translateY(${translateY}px)`;
-      state.scrollDistance = translateY;
+    } else {
+      start2 = 0;
+      end = monthsNum + 2;
     }
+    setMonthDefaultRange([start2, end]);
+    setTranslateY(state.monthsData[start2].cssScrollHeight);
   };
-  const setMove = (move, type2, time) => {
-    var _a, _b;
-    let updateMove = move + state.transformY;
-    const h = ((_a = months.current) == null ? void 0 : _a.offsetHeight) || 0;
-    const offsetHeight = ((_b = monthsPanel.current) == null ? void 0 : _b.offsetHeight) || 0;
-    if (type2 === "end") {
-      if (updateMove > 0) {
-        updateMove = 0;
+  const mothsViewScroll = (e2) => {
+    if (state.monthsData.length <= 1) {
+      return;
+    }
+    const target = e2.target;
+    const currentScrollTop = target.scrollTop;
+    let current = Math.floor(currentScrollTop / state.avgHeight);
+    if (current === 0) {
+      if (currentScrollTop >= state.monthsData[current + 1].cssScrollHeight) {
+        current += 1;
       }
-      if (updateMove < 0 && updateMove < -offsetHeight + h) {
-        updateMove = -offsetHeight + h;
+    } else if (current > 0 && current < state.monthsNum - 1) {
+      if (currentScrollTop >= state.monthsData[current + 1].cssScrollHeight) {
+        current += 1;
       }
-      if (offsetHeight <= h && state.monthsData.length === 1) {
-        updateMove = 0;
+      if (currentScrollTop < state.monthsData[current].cssScrollHeight) {
+        current -= 1;
       }
-      setTransform(updateMove, type2, time);
     } else {
-      if (updateMove > 0 && updateMove > 100) {
-        updateMove = 100;
-      }
-      if (updateMove < -offsetHeight + h - 100 && state.monthsData.length > 1) {
-        updateMove = -offsetHeight + h - 100;
+      const viewPosition = Math.round(currentScrollTop + viewHeight);
+      if (viewPosition < state.monthsData[current].cssScrollHeight + state.monthsData[current].cssHeight && currentScrollTop > state.monthsData[current - 1].cssScrollHeight) {
+        current -= 1;
       }
-      if (updateMove < 0 && updateMove < -100 && state.monthsData.length === 1) {
-        updateMove = -100;
+      if (current + 1 <= state.monthsNum && viewPosition >= state.monthsData[current + 1].cssScrollHeight + state.monthsData[current + 1].cssHeight) {
+        current += 1;
       }
-      setTransform(updateMove);
-    }
-  };
-  const onTouchStart = (event) => {
-    event.stopPropagation();
-    const changedTouches = event.changedTouches[0];
-    state.touchParams.startY = changedTouches.pageY;
-    state.touchParams.startTime = event.timeStamp || Date.now();
-    state.transformY = state.scrollDistance;
-  };
-  const onTouchMove = (event) => {
-    event.stopPropagation();
-    const changedTouches = event.changedTouches[0];
-    state.touchParams.lastY = changedTouches.pageY;
-    state.touchParams.lastTime = event.timeStamp || Date.now();
-    const move = state.touchParams.lastY - state.touchParams.startY;
-    if (Math.abs(move) < 5) {
-      return false;
-    }
-    setMove(move);
-  };
-  const onTouchEnd = (event) => {
-    var _a, _b;
-    event.stopPropagation();
-    const changedTouches = event.changedTouches[0];
-    state.touchParams.lastY = changedTouches.pageY;
-    state.touchParams.lastTime = event.timeStamp || Date.now();
-    let move = state.touchParams.lastY - state.touchParams.startY;
-    if (Math.abs(move) < 5) {
-      return false;
-    }
-    const updateMove = move + state.transformY;
-    const h = ((_a = months.current) == null ? void 0 : _a.offsetHeight) || 0;
-    const offsetHeight = ((_b = monthsPanel.current) == null ? void 0 : _b.offsetHeight) || 0;
-    if (updateMove > 0) {
-      getMonth(getCurrData("prev"), "prev");
-    } else if (updateMove < 0 && updateMove < -offsetHeight + (Math.abs(move) > h ? Math.abs(move) : h) * 5) {
-      getMonth(getCurrData("next"), "next");
-      if (Math.abs(move) >= 300) {
-        getMonth(getCurrData("next"), "next");
+      if (current >= 1 && currentScrollTop < state.monthsData[current - 1].cssScrollHeight) {
+        current -= 1;
       }
     }
-    let moveTime = state.touchParams.lastTime - state.touchParams.startTime;
-    if (moveTime <= 300) {
-      move *= 2;
-      moveTime += 1e3;
-      setMove(move, "end", moveTime);
-    } else {
-      setMove(move, "end");
+    if (state.currentIndex !== current) {
+      state.currentIndex = current;
+      setDefaultRange(state.monthsNum, current);
     }
+    setYearMonthTitle(state.monthsData[current].title);
   };
   const initData = () => {
-    state.startData = startDate ? splitDate(startDate) : "";
-    state.endData = endDate ? splitDate(endDate) : "";
-    if (!defaultValue) {
-      state.currDate = state.isRange ? [Utils.date2Str(new Date()), Utils.getDay(1)] : Utils.date2Str(new Date());
-    } else {
-      state.currDate = state.isRange ? [...defaultValue] : defaultValue;
+    const propStartDate = props.startDate ? props.startDate : Utils.getDay(0);
+    const propEndDate = props.endDate ? props.endDate : Utils.getDay(365);
+    state.propStartDate = propStartDate;
+    state.propEndDate = propEndDate;
+    state.startData = splitDate(propStartDate);
+    state.endData = splitDate(propEndDate);
+    if (defaultValue || Array.isArray(defaultValue) && defaultValue.length > 0) {
+      state.currDate = props.type !== "one" ? [...props.defaultValue] : props.defaultValue;
+    }
+    const startDate = {
+      year: Number(state.startData[0]),
+      month: Number(state.startData[1])
+    };
+    const endDate = {
+      year: Number(state.endData[0]),
+      month: Number(state.endData[1])
+    };
+    let monthsNum = endDate.month - startDate.month;
+    if (endDate.year - startDate.year > 0) {
+      monthsNum += 12 * (endDate.year - startDate.year);
+    }
+    if (monthsNum <= 0) {
+      monthsNum = 1;
     }
-    if (state.isRange && Array.isArray(state.currDate)) {
-      if (startDate && Utils.compareDate(state.currDate[0], startDate)) {
-        state.currDate.splice(0, 1, startDate);
+    getMonth(state.startData, "next");
+    let i = 1;
+    do {
+      getMonth(getCurrData("next"), "next");
+    } while (i++ < monthsNum);
+    state.monthsNum = monthsNum;
+    if (type === "range" && Array.isArray(state.currDate)) {
+      if (state.currDate.length > 0) {
+        if (propStartDate && Utils.compareDate(state.currDate[0], propStartDate)) {
+          state.currDate.splice(0, 1, propStartDate);
+        }
+        if (propEndDate && Utils.compareDate(propEndDate, state.currDate[1])) {
+          state.currDate.splice(1, 1, propEndDate);
+        }
+        state.defaultData = [
+          ...splitDate(state.currDate[0]),
+          ...splitDate(state.currDate[1])
+        ];
       }
-      if (endDate && Utils.compareDate(endDate, state.currDate[1])) {
-        state.currDate.splice(1, 1, endDate);
+    } else if (props.type === "multiple" && Array.isArray(state.currDate)) {
+      if (state.currDate.length > 0) {
+        const defaultArr = [];
+        const obj = {};
+        state.currDate.forEach((item) => {
+          if (propStartDate && !Utils.compareDate(item, propStartDate) && propEndDate && !Utils.compareDate(propEndDate, item)) {
+            if (!Object.hasOwnProperty.call(obj, item)) {
+              defaultArr.push(item);
+              obj[item] = item;
+            }
+          }
+        });
+        state.currDate = [...defaultArr];
+        state.defaultData = [...splitDate(defaultArr[0])];
       }
-      state.defaultData = [
-        ...splitDate(state.currDate[0]),
-        ...splitDate(state.currDate[1])
-      ];
-    } else {
-      if (startDate && Utils.compareDate(state.currDate, startDate)) {
-        state.currDate = startDate;
-      } else if (endDate && !Utils.compareDate(state.currDate, endDate)) {
-        state.currDate = endDate;
+    } else if (state.currDate) {
+      if (propStartDate && Utils.compareDate(state.currDate, propStartDate)) {
+        state.currDate = propStartDate;
+      } else if (propEndDate && !Utils.compareDate(state.currDate, propEndDate)) {
+        state.currDate = propEndDate;
       }
       state.defaultData = [...splitDate(state.currDate)];
     }
-    getMonth(state.defaultData, "next");
-    setYearMonthTitle(state.monthsData[0].title);
-    let i = 1;
-    do {
-      getMonth(getCurrData("next"), "next");
-    } while (i++ < 4);
-    if (state.isRange) {
-      chooseDay(
-        { day: state.defaultData[2], type: "curr" },
-        state.monthsData[0],
-        true
-      );
-      chooseDay(
-        { day: state.defaultData[5], type: "curr" },
-        state.monthsData[0],
-        true,
-        true
-      );
-    } else {
-      chooseDay(
-        { day: state.defaultData[2], type: "curr" },
-        state.monthsData[0],
-        true
-      );
+    let current = 0;
+    let lastCurrent = 0;
+    if (state.defaultData.length > 0) {
+      state.monthsData.forEach((item, index) => {
+        if (item.title === locale.calendaritem.monthTitle(
+          state.defaultData[0],
+          state.defaultData[1]
+        )) {
+          current = index;
+        }
+        if (props.type === "range") {
+          if (item.title === locale.calendaritem.monthTitle(
+            state.defaultData[3],
+            state.defaultData[4]
+          )) {
+            lastCurrent = index;
+          }
+        }
+      });
     }
+    setDefaultRange(monthsNum, current);
+    state.currentIndex = current;
+    setYearMonthTitle(state.monthsData[state.currentIndex].title);
+    if (state.defaultData.length > 0) {
+      if (type === "range") {
+        chooseDay(
+          { day: state.defaultData[2], type: "curr" },
+          state.monthsData[state.currentIndex],
+          true
+        );
+        chooseDay(
+          { day: state.defaultData[5], type: "curr" },
+          state.monthsData[lastCurrent],
+          true
+        );
+      } else if (type === "multiple") {
+        [...state.currDate].forEach((item) => {
+          const dateArr = splitDate(item);
+          let current2 = state.currentIndex;
+          state.monthsData.forEach((item2, index) => {
+            if (item2.title === locale.calendaritem.monthTitle(dateArr[0], dateArr[1])) {
+              current2 = index;
+            }
+          });
+          chooseDay(
+            { day: dateArr[2], type: "curr" },
+            state.monthsData[current2],
+            true
+          );
+        });
+      } else {
+        chooseDay(
+          { day: state.defaultData[2], type: "curr" },
+          state.monthsData[state.currentIndex],
+          true
+        );
+      }
+    }
+    const lastItem = state.monthsData[state.monthsData.length - 1];
+    const containerHeight = lastItem.cssHeight + lastItem.cssScrollHeight;
+    requestAniFrame$1(() => {
+      if (months && monthsPanel && viewArea) {
+        viewHeight = months.current.clientHeight;
+        monthsPanel.current.style.height = `${containerHeight}px`;
+        months.current.scrollTop = state.monthsData[state.currentIndex].cssScrollHeight;
+      }
+    });
+    state.avgHeight = Math.floor(containerHeight / (monthsNum + 1));
+  };
+  const resetRender = () => {
+    state.chooseData.splice(0);
+    state.monthsData.splice(0);
+    initData();
+  };
+  const scrollToDate = (date) => {
+    if (Utils.compareDate(date, state.propStartDate)) {
+      date = state.propStartDate;
+    } else if (!Utils.compareDate(date, state.propEndDate)) {
+      date = state.propEndDate;
+    }
+    const dateArr = splitDate(date);
+    state.monthsData.forEach((item, index) => {
+      if (item.title === locale.calendaritem.monthTitle(dateArr[0], dateArr[1])) {
+        if (months.current) {
+          const distance = state.monthsData[index].cssScrollHeight - months.current.scrollTop;
+          if (toDateAnimation) {
+            let flag = 0;
+            const interval = setInterval(() => {
+              flag++;
+              if (months.current) {
+                const offset = distance / 10;
+                months.current.scrollTop += offset;
+              }
+              if (flag >= 10) {
+                clearInterval(interval);
+                if (months.current) {
+                  months.current.scrollTop = state.monthsData[index].cssScrollHeight;
+                }
+              }
+            }, 40);
+          } else {
+            months.current.scrollTop = state.monthsData[index].cssScrollHeight;
+          }
+        }
+      }
+    });
   };
   useEffect(() => {
     initData();
   }, []);
+  useEffect(() => {
+    poppable && resetRender();
+  }, [defaultValue]);
+  React__default.useImperativeHandle(ref, () => ({
+    scrollToDate
+  }));
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", {
     className: classes
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: headerClasses
-  }, poppable ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", {
+  }, showTitle && /* @__PURE__ */ React__default.createElement("div", {
     className: "calendar-title"
-  }, locale.calendaritem.title), /* @__PURE__ */ React__default.createElement("div", {
+  }, title || locale.calendaritem.title), onBtn && /* @__PURE__ */ React__default.createElement("div", {
+    className: "calendar-top-slot"
+  }, onBtn()), showSubTitle && /* @__PURE__ */ React__default.createElement("div", {
     className: "calendar-curr-month"
-  }, yearMonthTitle)) : "", /* @__PURE__ */ React__default.createElement("div", {
+  }, yearMonthTitle), /* @__PURE__ */ React__default.createElement("div", {
     className: "calendar-weeks",
     ref: weeksPanel
   }, weeks.map((item) => /* @__PURE__ */ React__default.createElement("div", {
@@ -4080,48 +4271,54 @@ const CalendarItem = (props) => {
     key: item
   }, item)))), /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-calendar-content",
-    onTouchStart,
-    onTouchMove,
-    onTouchEnd,
+    onScroll: mothsViewScroll,
     ref: months
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "calendar-months-panel",
     ref: monthsPanel
   }, /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-loading-tip"
-  }, !unLoadPrev ? locale.calendaritem.loadPreviousMonth : locale.calendaritem.noEarlierMonth), monthsData.map((month, key) => /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-month",
-    key
-  }, /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-month-title"
-  }, month.title), /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-month-con"
-  }, /* @__PURE__ */ React__default.createElement("div", {
-    className: monthitemclasses
-  }, month.monthData && month.monthData.map((day, index) => /* @__PURE__ */ React__default.createElement("div", {
-    className: [
-      "calendar-month-day",
-      getClass(day, month)
-    ].join(" "),
-    key: index,
-    onClick: () => {
-      chooseDay(day, month);
-    }
-  }, /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-day"
-  }, day.type === "curr" ? day.day : ""), isCurrDay(month, day.day) ? /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-curr-tip-curr"
-  }, locale.calendaritem.today) : "", isStartTip(day, month) ? /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-day-tip"
-  }, locale.calendaritem.start) : "", isEndTip(day, month) ? /* @__PURE__ */ React__default.createElement("div", {
-    className: "calendar-day-tip"
-  }, locale.calendaritem.end) : "")))))))), poppable && !isAutoBackFill ? /* @__PURE__ */ React__default.createElement("div", {
+    className: "viewArea",
+    ref: viewArea,
+    style: { transform: `translateY(${translateY}px)` }
+  }, state.monthsData.slice(monthDefaultRange[0], monthDefaultRange[1]).map((month, key) => {
+    return /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-month",
+      key
+    }, /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-month-title"
+    }, month.title), /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-month-con"
+    }, /* @__PURE__ */ React__default.createElement("div", {
+      className: monthitemclasses
+    }, month.monthData.map((day, i) => /* @__PURE__ */ React__default.createElement("div", {
+      className: [
+        "calendar-month-day",
+        getClass(day, month)
+      ].join(" "),
+      onClick: () => {
+        chooseDay(day, month);
+      },
+      key: i
+    }, /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-day"
+    }, onDay ? onDay(day) : day.day), onTopInfo && /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-curr-tips calendar-curr-tips-top"
+    }, onTopInfo(day)), onBottomInfo && /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-curr-tips calendar-curr-tips-bottom"
+    }, onBottomInfo(day)), !onBottomInfo && showToday && isCurrDay(month, day.day) && /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-curr-tip-curr"
+    }, locale.calendaritem.today), isStartTip(day, month) && /* @__PURE__ */ React__default.createElement("div", {
+      className: `calendar-day-tip ${rangeTip() ? "calendar-curr-tips-top" : ""}`
+    }, startText || locale.calendaritem.start), isEndTip(day, month) && /* @__PURE__ */ React__default.createElement("div", {
+      className: "calendar-day-tip"
+    }, endText || locale.calendaritem.end))))));
+  })))), poppable && !isAutoBackFill ? /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-calendar-footer"
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "calendar-confirm-btn",
     onClick: confirm
-  }, locale.confirm)) : ""));
-};
+  }, confirmText || locale.confirm)) : ""));
+});
 CalendarItem.defaultProps = defaultProps$14;
 CalendarItem.displayName = "NutCalendarItem";
 const defaultProps$13 = {
@@ -4133,12 +4330,25 @@ const defaultProps$13 = {
   defaultValue: "",
   startDate: Utils.getDay(0),
   endDate: Utils.getDay(365),
+  showToday: true,
+  startText: "\u5F00\u59CB",
+  endText: "\u7ED3\u675F",
+  confirmText: "\u786E\u8BA4",
+  showTitle: true,
+  showSubTitle: true,
+  toDateAnimation: true,
+  onBtn: void 0,
+  onDay: void 0,
+  onTopInfo: void 0,
+  onBottomInfo: void 0,
   onClose: () => {
   },
   onChoose: (param) => {
+  },
+  onSelected: (data) => {
   }
 };
-const Calendar = (props) => {
+const Calendar = React__default.forwardRef((props, ref) => {
   const { locale } = useConfig$1();
   const {
     children,
@@ -4150,14 +4360,25 @@ const Calendar = (props) => {
     defaultValue,
     startDate,
     endDate,
+    showToday,
+    startText,
+    endText,
+    confirmText,
+    showTitle,
+    showSubTitle,
+    toDateAnimation,
+    onBtn,
+    onDay,
+    onTopInfo,
+    onBottomInfo,
     onClose,
-    onChoose
+    onChoose,
+    onSelected
   } = { ...defaultProps$13, ...props };
+  const calendarRef = useRef(null);
   const close = () => {
     onClose && onClose();
   };
-  const update2 = () => {
-  };
   const choose = (param) => {
     close();
     onChoose && onChoose(param);
@@ -4165,6 +4386,41 @@ const Calendar = (props) => {
   const closePopup = () => {
     close();
   };
+  const select = (param) => {
+    onSelected && onSelected(param);
+  };
+  const scrollToDate = (date) => {
+    var _a;
+    (_a = calendarRef.current) == null ? void 0 : _a.scrollToDate(date);
+  };
+  React__default.useImperativeHandle(ref, () => ({
+    scrollToDate
+  }));
+  const renderItem = () => {
+    return /* @__PURE__ */ React__default.createElement(CalendarItem, {
+      ref: calendarRef,
+      type,
+      isAutoBackFill,
+      poppable,
+      title: locale.calendaritem.title || title,
+      defaultValue,
+      startDate,
+      endDate,
+      showToday,
+      startText,
+      endText,
+      confirmText,
+      showTitle,
+      showSubTitle,
+      toDateAnimation,
+      onBtn,
+      onDay,
+      onTopInfo,
+      onBottomInfo,
+      onChoose: choose,
+      onSelected: select
+    });
+  };
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, poppable ? /* @__PURE__ */ React__default.createElement(Popup, {
     visible,
     position: "bottom",
@@ -4175,29 +4431,8 @@ const Calendar = (props) => {
     onClickOverlay: closePopup,
     onClickCloseIcon: closePopup,
     style: { height: "85vh" }
-  }, /* @__PURE__ */ React__default.createElement(CalendarItem, {
-    type,
-    isAutoBackFill,
-    poppable,
-    title: locale.calendaritem.title || title,
-    defaultValue,
-    startDate,
-    endDate,
-    onUpdate: update2,
-    onClose: close,
-    onChoose: choose
-  })) : /* @__PURE__ */ React__default.createElement(CalendarItem, {
-    type,
-    isAutoBackFill,
-    poppable,
-    title: locale.calendaritem.title,
-    defaultValue,
-    startDate,
-    endDate,
-    onClose: close,
-    onChoose: choose
-  }));
-};
+  }, renderItem()) : renderItem());
+});
 Calendar.defaultProps = defaultProps$13;
 Calendar.displayName = "NutCalendar";
 const defaultProps$12 = {
@@ -4211,11 +4446,12 @@ const defaultProps$12 = {
   },
   activeColor: "#fa2c19",
   checked: false,
+  checkedIcon: "checklist",
   chooseItem: () => {
   }
 };
-const InternalCascaderItem = (props) => {
-  const { data, checked, chooseItem, activeColor } = {
+const InternalCascaderItem = (props, ref) => {
+  const { data, checked, checkedIcon, chooseItem, activeColor } = {
     ...defaultProps$12,
     ...props
   };
@@ -4230,11 +4466,6 @@ const InternalCascaderItem = (props) => {
   const classesTitle = classNames({
     [`${b2("")}__title`]: true
   });
-  useEffect(() => {
-    initData();
-  }, [data]);
-  const initData = () => {
-  };
   return /* @__PURE__ */ React__default.createElement("div", {
     style: { color: checked ? activeColor : "" },
     className: classes,
@@ -4249,7 +4480,7 @@ const InternalCascaderItem = (props) => {
     name: "loading"
   }) : /* @__PURE__ */ React__default.createElement(Icon$1, {
     className: `${checked ? b2("icon-check") : ""}`,
-    name: "checklist"
+    name: checked ? checkedIcon : ""
   }));
 };
 const CascaderItem = React__default.forwardRef(InternalCascaderItem);
@@ -4391,6 +4622,7 @@ const defaultProps$11 = {
   className: "",
   style: {},
   activeColor: "#fa2c19",
+  checkedIcon: "checklist",
   tabsColor: "",
   poppable: true,
   visible: false,
@@ -4415,7 +4647,7 @@ const defaultProps$11 = {
   },
   ...Popup.defaultProps
 };
-const InternalCascader = (props) => {
+const InternalCascader = (props, ref) => {
   const {
     className,
     style,
@@ -4439,7 +4671,7 @@ const InternalCascader = (props) => {
     onPathChange
   } = { ...defaultProps$11, ...props };
   const [tabvalue, setTabvalue] = useState("c1");
-  const [optiosData, setOptiosData] = useState([]);
+  const [optionsData, setOptionsData] = useState([]);
   const isLazy = () => state.configs.lazy && Boolean(state.configs.lazyLoad);
   const [state] = useState({
     optionsData: [],
@@ -4512,7 +4744,7 @@ const InternalCascader = (props) => {
       }
     ];
     syncValue();
-    setOptiosData(state.panes);
+    setOptionsData(state.panes);
   };
   const syncValue = async () => {
     const currentValue2 = state.innerValue;
@@ -4606,7 +4838,7 @@ const InternalCascader = (props) => {
         onChange(optionParams, pathNodes);
         onPathChange(optionParams, pathNodes);
       }
-      setOptiosData(state.panes);
+      setOptionsData(state.panes);
       close();
       return;
     }
@@ -4621,7 +4853,7 @@ const InternalCascader = (props) => {
         paneKey: `c${state.tabsCursor + 1}`
       });
       setTabvalue(`c${state.tabsCursor + 1}`);
-      setOptiosData(state.panes);
+      setOptionsData(state.panes);
       if (!type) {
         const pathNodes = state.panes.map((item) => item.selectedNode);
         const optionParams = pathNodes.map((item) => item == null ? void 0 : item.value);
@@ -4638,7 +4870,7 @@ const InternalCascader = (props) => {
       state.panes[state.tabsCursor].selectedNode = node;
       chooseItem(node, type);
     }
-    setOptiosData(state.panes);
+    setOptionsData(state.panes);
   };
   const renderItem = () => {
     return /* @__PURE__ */ React__default.createElement("div", {
@@ -4649,7 +4881,7 @@ const InternalCascader = (props) => {
     }, title), /* @__PURE__ */ React__default.createElement(Tabs, {
       value: tabvalue,
       titleNode: () => {
-        return optiosData.map((pane, index) => {
+        return optionsData.map((pane, index) => {
           var _a, _b;
           return /* @__PURE__ */ React__default.createElement("div", {
             onClick: () => {
@@ -4666,7 +4898,7 @@ const InternalCascader = (props) => {
           }));
         });
       }
-    }, !state.initLoading && state.panes.length ? optiosData.map((pane) => /* @__PURE__ */ React__default.createElement(TabPane, {
+    }, !state.initLoading && state.panes.length ? optionsData.map((pane) => /* @__PURE__ */ React__default.createElement(TabPane, {
       key: pane.paneKey,
       paneKey: pane.paneKey
     }, /* @__PURE__ */ React__default.createElement("div", {
@@ -4703,6 +4935,8 @@ const defaultProps$10 = {
   disabled: false,
   checkedValue: [],
   max: void 0,
+  textPosition: "right",
+  direction: "vertical",
   onChange: (value) => {
   },
   options: []
@@ -4717,6 +4951,8 @@ const CheckboxGroup = React__default.forwardRef(
       onChange,
       checkedValue,
       max,
+      textPosition,
+      direction,
       options,
       ...rest
     } = props;
@@ -4772,9 +5008,9 @@ const CheckboxGroup = React__default.forwardRef(
       return (innerValue == null ? void 0 : innerValue.indexOf(child.props.label || child.children)) > -1;
     }
     function validateChecked(value) {
-      if (innerValue === null)
+      if (!innerValue)
         return false;
-      return innerValue === value;
+      return (innerValue == null ? void 0 : innerValue.indexOf(value)) > -1;
     }
     function getParentVals() {
       return innerValue;
@@ -4790,7 +5026,8 @@ const CheckboxGroup = React__default.forwardRef(
           checked: childChecked,
           onChange: handleChildChange,
           getParentVals,
-          max
+          max,
+          textPosition
         });
       });
     }
@@ -4805,13 +5042,14 @@ const CheckboxGroup = React__default.forwardRef(
           onChange: handleChildChange,
           ...rest2,
           max,
+          textPosition,
           getParentVals,
           checked: childChecked
         });
       });
-    }, [innerValue, options]);
+    }, [innerValue, options, innerDisabled, max]);
     return /* @__PURE__ */ React__default.createElement("div", {
-      className: `${b2()} ${className || ""}`,
+      className: `${b2()} nut-checkboxgroup--${props.direction} ${className || ""}`,
       ...rest
     }, (options == null ? void 0 : options.length) ? renderOptionsChildren() : cloneChildren());
   }
@@ -6400,13 +6638,7 @@ const InputNumber = (props) => {
     onChangeFuc && onChangeFuc(outputValue, e2);
     change && change(outputValue, e2);
     if (!isAsync) {
-      if (Number(outputValue) < Number(min)) {
-        setInputValue(Number(min));
-      } else if (Number(outputValue) > Number(max)) {
-        setInputValue(Number(max));
-      } else {
-        setInputValue(outputValue);
-      }
+      setInputValue(outputValue);
     }
   };
   const reduceNumber = (e2) => {
@@ -6432,15 +6664,11 @@ const InputNumber = (props) => {
     }
   };
   const changeValue = (e2) => {
-    const value = Number(e2.detail.value);
-    change && change(value, e2);
-    onChangeFuc && onChangeFuc(value, e2);
+    const input = e2.target;
+    change && change(input.value, e2);
+    onChangeFuc && onChangeFuc(input.value, e2);
     if (!isAsync) {
-      if (Number.isNaN(value)) {
-        setInputValue(inputValue);
-      } else {
-        setInputValue(value);
-      }
+      setInputValue(input.value);
     }
   };
   const focusValue = (e2) => {
@@ -6456,7 +6684,8 @@ const InputNumber = (props) => {
       return;
     if (readonly)
       return;
-    let value = Number(e2.detail.value);
+    const input = e2.target;
+    let value = +input.value;
     if (value < Number(min)) {
       value = Number(min);
     } else if (value > Number(max)) {
@@ -6470,6 +6699,8 @@ const InputNumber = (props) => {
     className: classes,
     style: styles,
     ...restProps
+  }, /* @__PURE__ */ React__default.createElement("div", {
+    className: "nut-input-minus"
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
     classPrefix: iconClassPrefix,
     fontClassName: iconFontClassName,
@@ -6477,7 +6708,7 @@ const InputNumber = (props) => {
     size: buttonSize,
     name: "minus",
     onClick: reduceNumber
-  }), /* @__PURE__ */ React__default.createElement("input", {
+  })), /* @__PURE__ */ React__default.createElement("input", {
     className: "nut-number-input",
     type: "number",
     min,
@@ -6489,14 +6720,16 @@ const InputNumber = (props) => {
     onInput: changeValue,
     onBlur: burValue,
     onFocus: focusValue
-  }), /* @__PURE__ */ React__default.createElement(Icon$1, {
+  }), /* @__PURE__ */ React__default.createElement("div", {
+    className: "nut-input-add"
+  }, /* @__PURE__ */ React__default.createElement(Icon$1, {
     classPrefix: iconClassPrefix,
     fontClassName: iconFontClassName,
     className: iconAddClasses,
     size: buttonSize,
     name: "plus",
     onClick: addNumber
-  }));
+  })));
 };
 InputNumber.defaultProps = defaultProps$W;
 InputNumber.displayName = "NutInputNumber";
@@ -7809,6 +8042,7 @@ const defaultProps$N = {
   closeOnClickOverlay: true,
   length: 6,
   className: "",
+  autoFocus: false,
   onChange: (value) => {
   },
   onOk: (value) => {
@@ -7844,6 +8078,7 @@ const ShortPassword = (props) => {
     onComplete,
     iconClassPrefix,
     iconFontClassName,
+    autoFocus,
     ...reset
   } = props;
   const b2 = cn("shortpassword");
@@ -7928,6 +8163,7 @@ const ShortPassword = (props) => {
     style: systemStyle(),
     maxLength: 6,
     value: inputValue,
+    autoFocus,
     onChange: (e2) => changeValue(e2)
   }), /* @__PURE__ */ React__default.createElement("div", {
     className: b2("input-site")
@@ -8006,6 +8242,10 @@ const TextArea = (props) => {
     SetInputValue(initValue);
   }, [defaultValue]);
   const textChange = (event) => {
+    if (disabled)
+      return;
+    if (readonly)
+      return;
     const text = event.detail ? event.detail : event.target;
     if (maxlength && [...text.value].length > Number(maxlength)) {
       text.value = text.value.substring(0, Number(maxlength));
@@ -8038,8 +8278,7 @@ const TextArea = (props) => {
       resize: `${autosize ? "vertical" : "none"}`,
       ...style
     },
-    disabled,
-    readOnly: readonly,
+    readOnly: disabled || readonly,
     value: inputValue,
     onInput: (e2) => {
       textChange(e2);
@@ -8294,6 +8533,7 @@ const defaultProps$K = {
   name: "file",
   disabled: false,
   autoUpload: true,
+  multiple: false,
   maximize: Number.MAX_VALUE,
   data: {},
   headers: {},
@@ -8337,6 +8577,7 @@ const InternalUploader = (props, ref) => {
     isDeletable,
     maximum,
     maximize,
+    multiple,
     className,
     autoUpload,
     sizeType,
@@ -8384,7 +8625,7 @@ const InternalUploader = (props, ref) => {
       return;
     }
     chooseImage({
-      count: maximum * 1 - fileList.length,
+      count: multiple ? maximum * 1 - fileList.length : 1,
       sizeType,
       sourceType,
       success: onChangeFn
@@ -8875,11 +9116,9 @@ const DialogWrap = (props) => {
 DialogWrap.displayName = "NutDialogWrap";
 const DialogWrapper = (props) => {
   const { visible, lockScroll } = props;
-  if (lockScroll && !visible && document.body.classList.value.includes("nut-overflow-hidden")) {
-    document.body.classList.remove("nut-overflow-hidden");
-  }
-  return /* @__PURE__ */ React__default.createElement("div", {
-    style: { display: visible ? "block" : "none" }
+  return /* @__PURE__ */ React__default.createElement(index_cjs.View, {
+    style: { display: visible ? "block" : "none" },
+    catchMove: lockScroll
   }, /* @__PURE__ */ React__default.createElement(DialogWrap, {
     ...props
   }));
@@ -8899,73 +9138,74 @@ const defaultProps$H = {
   footerDirection: "horizontal",
   lockScroll: false
 };
-const BaseDialog = (props, ref) => {
-  const { locale } = useConfig$1();
-  const {
-    visible,
-    footer,
-    noOkBtn,
-    noCancelBtn,
-    lockScroll,
-    okBtnDisabled,
-    cancelAutoClose,
-    okText,
-    cancelText,
-    onClosed,
-    onCancel,
-    onOk,
-    ...restProps
-  } = props;
-  const renderFooter = function() {
-    if (footer === null)
-      return "";
-    const handleCancel = function(e2) {
-      e2.stopPropagation();
-      if (!cancelAutoClose)
-        return;
-      onClosed == null ? void 0 : onClosed();
-      onCancel == null ? void 0 : onCancel();
-      if (lockScroll && visible) {
-        document.body.classList.remove("nut-overflow-hidden");
-      }
-    };
-    const handleOk = function(e2) {
-      e2.stopPropagation();
-      onClosed == null ? void 0 : onClosed();
-      onOk == null ? void 0 : onOk(e2);
-      if (lockScroll && visible) {
-        document.body.classList.remove("nut-overflow-hidden");
-      }
+const BaseDialog = forwardRef(
+  (props, ref) => {
+    const { locale } = useConfig$1();
+    const {
+      visible,
+      footer,
+      noOkBtn,
+      noCancelBtn,
+      lockScroll,
+      okBtnDisabled,
+      cancelAutoClose,
+      okText,
+      cancelText,
+      onClosed,
+      onCancel,
+      onOk,
+      ...restProps
+    } = props;
+    const renderFooter = function() {
+      if (footer === null)
+        return "";
+      const handleCancel = function(e2) {
+        e2.stopPropagation();
+        if (!cancelAutoClose)
+          return;
+        onClosed == null ? void 0 : onClosed();
+        onCancel == null ? void 0 : onCancel();
+        if (lockScroll && visible) {
+          document.body.classList.remove("nut-overflow-hidden");
+        }
+      };
+      const handleOk = function(e2) {
+        e2.stopPropagation();
+        onClosed == null ? void 0 : onClosed();
+        onOk == null ? void 0 : onOk(e2);
+        if (lockScroll && visible) {
+          document.body.classList.remove("nut-overflow-hidden");
+        }
+      };
+      const footerContent = footer || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, !noCancelBtn && /* @__PURE__ */ React__default.createElement(Button, {
+        size: "small",
+        plain: true,
+        type: "primary",
+        className: "nut-dialog__footer-cancel",
+        onClick: (e2) => handleCancel(e2)
+      }, cancelText || locale.cancel), !noOkBtn && /* @__PURE__ */ React__default.createElement(Button, {
+        size: "small",
+        type: "primary",
+        className: classNames("nut-dialog__footer-ok", {
+          disabled: okBtnDisabled
+        }),
+        disabled: okBtnDisabled,
+        onClick: (e2) => handleOk(e2)
+      }, okText || locale.confirm));
+      return footerContent;
     };
-    const footerContent = footer || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, !noCancelBtn && /* @__PURE__ */ React__default.createElement(Button, {
-      size: "small",
-      plain: true,
-      type: "primary",
-      className: "nut-dialog__footer-cancel",
-      onClick: (e2) => handleCancel(e2)
-    }, cancelText || locale.cancel), !noOkBtn && /* @__PURE__ */ React__default.createElement(Button, {
-      size: "small",
-      type: "primary",
-      className: classNames("nut-dialog__footer-ok", {
-        disabled: okBtnDisabled
-      }),
-      disabled: okBtnDisabled,
-      onClick: (e2) => handleOk(e2)
-    }, okText || locale.confirm));
-    return footerContent;
-  };
-  return /* @__PURE__ */ React__default.createElement(DialogWrapper, {
-    ...restProps,
-    visible,
-    lockScroll,
-    footer: renderFooter(),
-    onClosed,
-    onCancel
-  });
-};
-const Dialog = forwardRef(BaseDialog);
-Dialog.defaultProps = defaultProps$H;
-Dialog.displayName = "NutDialog";
+    return /* @__PURE__ */ React__default.createElement(DialogWrapper, {
+      ...restProps,
+      visible,
+      lockScroll,
+      footer: renderFooter(),
+      onClosed,
+      onCancel
+    });
+  }
+);
+BaseDialog.defaultProps = defaultProps$H;
+BaseDialog.displayName = "NutDialog";
 const defaultProps$G = {
   attract: false,
   direction: void 0,
@@ -14035,6 +14275,19 @@ const defaultProps$C = {
 const Swipe = forwardRef((props, instanceRef) => {
   const swipeBem = cn("swipe");
   const touch = useTouch();
+  useReady(() => {
+    const getWidth = async () => {
+      if (leftWrapper.current) {
+        const leftRect = await getRectByTaro(leftWrapper.current);
+        setActionWidth((v) => ({ ...v, left: leftRect.width }));
+      }
+      if (rightWrapper.current) {
+        const rightRect = await getRectByTaro(rightWrapper.current);
+        setActionWidth((v) => ({ ...v, right: rightRect.width }));
+      }
+    };
+    nextTick(() => getWidth());
+  });
   const { children, className, style } = { ...defaultProps$C, ...props };
   const root2 = useRef();
   const opened = useRef(false);
@@ -14144,6 +14397,7 @@ const Swipe = forwardRef((props, instanceRef) => {
   const renderActionContent = (side) => {
     if (props[`${side}Action`]) {
       return /* @__PURE__ */ React__default.createElement("div", {
+        id: "left",
         ref: side === "left" ? leftWrapper : rightWrapper,
         className: `${swipeBem(side)}`,
         onClick: (e2) => handleOperate(e2, side)
@@ -14780,6 +15034,7 @@ AvatarGroup.defaultProps = defaultProps$v;
 AvatarGroup.displayName = "NutAvatarGroup";
 const defaultProps$u = {
   ...ComponentDefaults,
+  className: "",
   value: "",
   dot: false,
   max: 1e4,
@@ -15623,12 +15878,14 @@ const Ellipsis = (props) => {
     className: "nut-ellipsis-wordbreak"
   }, (_a = ellipsis.current) == null ? void 0 : _a.leading, ((_b = ellipsis.current) == null ? void 0 : _b.leading) && symbol, expandText ? /* @__PURE__ */ React__default.createElement("span", {
     className: "nut-ellipsis-text",
-    onClick: () => {
+    onClick: (e2) => {
+      e2.stopPropagation();
       clickHandle(1);
     }
   }, expandText) : null, ((_c = ellipsis.current) == null ? void 0 : _c.tailing) && symbol, (_d = ellipsis.current) == null ? void 0 : _d.tailing)) : null, exceeded && expanded ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, content, expandText ? /* @__PURE__ */ React__default.createElement("span", {
     className: "nut-ellipsis-text",
-    onClick: () => {
+    onClick: (e2) => {
+      e2.stopPropagation();
       clickHandle(2);
     }
   }, collapseText) : null) : null)), /* @__PURE__ */ React__default.createElement("div", {
@@ -16990,7 +17247,7 @@ const Popover = (props) => {
     style: getStyle()
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: `${popoverArrow}`
-  }), Array.isArray(children) ? children[1] : "", list.map((item, i) => {
+  }), Array.isArray(children) ? children[1] : "", /* @__PURE__ */ React__default.createElement("div", null, " ", list.map((item, i) => {
     return /* @__PURE__ */ React__default.createElement("div", {
       key: item.name,
       className: `popover-menu-item ${item.disabled ? "disabled" : ""}`,
@@ -17005,7 +17262,7 @@ const Popover = (props) => {
     }) : "", /* @__PURE__ */ React__default.createElement("div", {
       className: "popover-menu-item-name"
     }, item.name));
-  })) : null))), visible ? /* @__PURE__ */ React__default.createElement(Overlay, {
+  }))) : null))), visible ? /* @__PURE__ */ React__default.createElement(Overlay, {
     visible,
     onClick: (e2) => handleClick(e2),
     style: { background: "transparent" }
@@ -18651,7 +18908,7 @@ const defaultProps$5 = {
   barrageList: [],
   frequency: 500,
   loop: true,
-  speeds: 2e3,
+  speeds: 3e3,
   rows: 3,
   top: 10
 };
@@ -18669,49 +18926,65 @@ const InternalBarrage = (props, ref) => {
     ...defaultProps$5,
     ...props
   };
+  const [styleList, setStyleList] = useState([]);
+  const [baItemList, setBaItemList] = useState(barrageList);
+  const barrageListSet = useRef(barrageList);
   const barrageBody = useRef(null);
   const barrageContainer = useRef(null);
+  const timeId = useRef(new Date().getTime());
   const timer = useRef(0);
-  const index = useRef(0);
+  useRef(0);
   const b2 = cn("barrage");
-  const classes = classNames(className, b2(""));
+  const classes = classNames(className, b2(""), {
+    [`nut-barrage__body${timeId.current}`]: true
+  });
   useImperativeHandle(ref, () => ({
     add: (word) => {
-      const _index = index.current % barrageList.length;
-      barrageList.splice(_index, 0, word);
+      barrageListSet.current = [...barrageListSet.current, word];
+      run();
     }
   }));
   useEffect(() => {
+    barrageListSet.current = [...barrageList];
     run();
     return () => {
       clearInterval(timer.current);
     };
   }, [barrageList]);
   const run = () => {
-    clearInterval(timer.current);
-    timer.current = window.setInterval(() => {
-      play();
-      run();
-    }, frequency);
-  };
-  const play = async () => {
-    const _index = loop2 ? index.current % barrageList.length : index.current;
-    const el = document.createElement(`div`);
-    el.innerHTML = barrageList[_index];
-    el.classList.add("barrage-item");
-    barrageContainer.current.appendChild(el);
-    createSelectorQuery().select(".barrage-item").boundingClientRect((res) => {
-      console.log("res", res);
-      const height = res == null ? void 0 : res.height;
-      el.classList.add("move");
-      el.style.animationDuration = `${speeds}ms`;
-      el.style.top = `${_index % rows * (height + top) + 20}px`;
-      el.dataset.index = `${_index}`;
-      el.addEventListener("animationend", () => {
-        barrageContainer.current.removeChild(el);
+    setBaItemList(barrageListSet.current);
+    barrageListSet.current.forEach((item, index2) => {
+      getNode(index2);
+    });
+  };
+  const getNode = (index2) => {
+    const query = createSelectorQuery();
+    setTimeout(() => {
+      let width = 100;
+      query.select(".nut-barrage__body" + timeId.current).boundingClientRect((rec) => {
+        width = rec.width || 300;
       });
-      index.current++;
-    }).exec();
+      query.select(".nut-barrage__item" + index2).boundingClientRect((recs) => {
+        let height = recs.height;
+        let nodeTop = index2 % rows * (height + top) + 20 + "px";
+        styleInfo(index2, nodeTop, width);
+      }).exec();
+    }, 500);
+  };
+  const styleInfo = (index2, nodeTop, width) => {
+    let timeIndex = index2 - rows > 0 ? index2 - rows : 0;
+    let list = styleList;
+    let time = list[timeIndex] ? Number(list[timeIndex]["--time"]) : 0;
+    let obj = {
+      top: nodeTop,
+      "--time": `${frequency * index2 + time}`,
+      animationDuration: `${speeds}ms`,
+      animationIterationCount: `${loop2 ? "infinite" : 1}`,
+      animationDelay: `${frequency * index2 + time}ms`,
+      "--move-distance": `-${width}px`
+    };
+    list.push(obj);
+    setStyleList([...list]);
   };
   return /* @__PURE__ */ React__default.createElement("div", {
     className: classes,
@@ -18720,7 +18993,12 @@ const InternalBarrage = (props, ref) => {
   }, /* @__PURE__ */ React__default.createElement("div", {
     ref: barrageContainer,
     className: "bContainer"
-  }));
+  }, baItemList.map((item, index2) => {
+    return /* @__PURE__ */ React__default.createElement("div", {
+      className: `barrage-item nut-barrage__item${index2} move`,
+      style: styleList[index2]
+    }, item.length > 8 ? item.substr(0, 8) + "..." : item);
+  })));
 };
 const Barrage = React__default.forwardRef(InternalBarrage);
 Barrage.defaultProps = defaultProps$5;
@@ -19175,4 +19453,4 @@ const TimeSelect = (props) => {
 };
 TimeSelect.defaultProps = defaultProps;
 TimeSelect.displayName = "NutTimeSelect";
-export { ActionSheet, Address, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, BackTop, Badge, Barrage, Button, Calendar, CalendarItem, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, CircleProgress, Col, Collapse, CollapseItem, ConfigProvider, CountDown, DatePicker, Dialog, Divider, Drag, Elevator, Ellipsis, Empty, FixedNav, Form, FormItem, Grid, GridItem, Icon$1 as Icon, Image$1 as Image, ImagePreview, Indicator, Infiniteloading, Input, InputNumber, Layout, Menu, MenuItem, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Picker, Popover, Popup, Price, Progress, PullToRefresh, Radio, RadioGroup, Range, Rate, Row, SearchBar, ShortPassword, SideNavBar, SideNavBarItem, Signature, Skeleton, Step, Steps, Sticky, SubSideNavBar, Swipe, Swiper, SwiperItem, Switch, TabPane, Tabbar, TabbarItem, Table, Tabs, Tag, TextArea, TimeDetail, TimePannel, TimeSelect, Toast, TrendArrow, Uploader, Video, VirtualList, WaterMark };
+export { ActionSheet, Address, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, BackTop, Badge, Barrage, Button, Calendar, CalendarItem, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, CircleProgress, Col, Collapse, CollapseItem, ConfigProvider, CountDown, DatePicker, BaseDialog as Dialog, Divider, Drag, Elevator, Ellipsis, Empty, FixedNav, Form, FormItem, Grid, GridItem, Icon$1 as Icon, Image$1 as Image, ImagePreview, Indicator, Infiniteloading, Input, InputNumber, Layout, Menu, MenuItem, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Picker, Popover, Popup, Price, Progress, PullToRefresh, Radio, RadioGroup, Range, Rate, Row, SearchBar, ShortPassword, SideNavBar, SideNavBarItem, Signature, Skeleton, Step, Steps, Sticky, SubSideNavBar, Swipe, Swiper, SwiperItem, Switch, TabPane, Tabbar, TabbarItem, Table, Tabs, Tag, TextArea, TimeDetail, TimePannel, TimeSelect, Toast, TrendArrow, Uploader, Video, VirtualList, WaterMark };