@nutui/nutui-react-taro 2.7.6 → 2.7.8

package/dist/nutui.react.umd.js

@@ -2,7 +2,7 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@tarojs/taro"), require("@tarojs/components"), require("react-dom")) : typeof define === "function" && define.amd ? define(["exports", "react", "@tarojs/taro", "@tarojs/components", "react-dom"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory((global2.nutui = global2.nutui || {}, global2.nutui.react = {}), global2.React, global2.Taro, global2.components, global2.ReactDOM));
 })(this, function(exports2, React, Taro, components, ReactDOM) {
   "use strict";/*!
-* @nutui/nutui-react-taro v2.7.6 Fri Jan 10 2025 10:43:35 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.7.8 Fri Feb 14 2025 16:17:59 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -1365,7 +1365,7 @@
       return value != null && isLength(value.length) && !isFunction2(value);
     }
     var isBuffer = nativeIsBuffer || stubFalse;
-    function isEqual(value, other) {
+    function isEqual2(value, other) {
       return baseIsEqual(value, other);
     }
     function isFunction2(value) {
@@ -1395,7 +1395,7 @@
     function stubFalse() {
       return false;
     }
-    module2.exports = isEqual;
+    module2.exports = isEqual2;
   })(lodash_isequal, lodash_isequal.exports);
   var lodash_isequalExports = lodash_isequal.exports;
   const isequal = /* @__PURE__ */ getDefaultExportFromCjs(lodash_isequalExports);
@@ -3938,7 +3938,7 @@
     }));
   };
   Space.displayName = "NutSpace";
-  function useWatch(dep, callback, config2 = { immediate: false }) {
+  function useWatch$1(dep, callback, config2 = { immediate: false }) {
     const { immediate } = config2;
     const prev = React.useRef();
     const inited = React.useRef(false);
@@ -4074,7 +4074,7 @@
     const [rootRect, setRootRect] = React.useState({});
     const [fixed, setFixed] = React.useState(false);
     const [transform, setTransform] = React.useState(0);
-    useWatch(fixed, () => {
+    useWatch$1(fixed, () => {
       onChange && onChange(fixed);
     });
     const rootStyle = React.useMemo(() => {
@@ -5269,7 +5269,7 @@
       autoHeightClassName,
       className
     );
-    return children ? /* @__PURE__ */ React.createElement("div", { className: classes }, !disabled && children) : null;
+    return children && /* @__PURE__ */ React.createElement(components.View, { className: classes }, !disabled && children);
   };
   const inBrowser = typeof window !== "undefined";
   function requestAniFrame() {
@@ -5313,24 +5313,19 @@
       value: outerValue,
       defaultValue: outerDefaultValue,
       ...rest
-    } = {
-      ...defaultProps$18,
-      ...props
-    };
+    } = { ...defaultProps$18, ...props };
     const uuid = useUuid();
     const [value, setValue] = usePropsValue({
       value: outerValue,
       defaultValue: outerDefaultValue,
-      finalValue: 0,
       onChange
     });
     const titleItemsRef = React.useRef([]);
-    const navRef = React.useRef(null);
     const getTitles = () => {
       const titles2 = [];
       React.Children.forEach(children, (child, idx) => {
         if (React.isValidElement(child)) {
-          const props2 = child == null ? void 0 : child.props;
+          const { props: props2 } = child;
           if ((props2 == null ? void 0 : props2.title) || (props2 == null ? void 0 : props2.value)) {
             titles2.push({
               title: props2.title,
@@ -5365,13 +5360,8 @@
     );
     const classesTitle = classNames(`${classPrefix$k}-titles`, {
       [`${classPrefix$k}-titles-${activeType}`]: activeType,
-      [`${classPrefix$k}-titles-scrollable`]: true,
       [`${classPrefix$k}-titles-${align}`]: align
     });
-    const tabsActiveStyle = {
-      color: activeType === "smile" ? activeColor : "",
-      background: activeType === "line" ? activeColor : ""
-    };
     const getRect2 = (selector) => {
       return new Promise((resolve) => {
         Taro.createSelectorQuery().select(selector).boundingClientRect().exec((rect = []) => {
@@ -5387,22 +5377,15 @@
       });
     };
     const scrollWithAnimation = React.useRef(false);
-    const navRectRef = React.useRef();
-    const titleRectRef = React.useRef([]);
     const [scrollLeft, setScrollLeft] = React.useState(0);
     const [scrollTop, setScrollTop] = React.useState(0);
     const scrollDirection = (to, direction2) => {
       let count = 0;
       const frames = 1;
       function animate() {
-        if (direction2 === "horizontal") {
-          setScrollLeft(to);
-        } else {
-          setScrollTop(to);
-        }
-        if (++count < frames) {
-          requestAniFrame$1(animate);
-        }
+        if (direction2 === "horizontal") setScrollLeft(to);
+        else setScrollTop(to);
+        if (++count < frames) requestAniFrame$1(animate);
       }
       animate();
     };
@@ -5412,17 +5395,17 @@
           getRect2(`#nut-tabs-titles-${name || uuid} .nut-tabs-list`),
           getAllRect(`#nut-tabs-titles-${name || uuid} .nut-tabs-titles-item`)
         ]).then(([navRect, titleRects]) => {
-          navRectRef.current = navRect;
-          titleRectRef.current = titleRects;
-          const titleRect = titleRectRef.current[index];
+          const titleRect = titleRects[index];
           if (!titleRect) return;
           let to = 0;
           if (direction === "vertical") {
             const top = titleRects.slice(0, index).reduce((prev, curr) => prev + curr.height, 0);
-            to = top - (navRectRef.current.height - titleRect.height) / 2;
+            to = top - (navRect.height - titleRect.height) / 2;
           } else {
             const left2 = titleRects.slice(0, index).reduce((prev, curr) => prev + curr.width, 0);
-            to = rtl ? -left2 : left2;
+            to = left2 - (navRect.width - titleRect.width) / 2;
+            if (to < 0) return;
+            to = rtl ? -to : to;
           }
           Taro.nextTick(() => {
             scrollWithAnimation.current = true;
@@ -5437,7 +5420,7 @@
       );
       index = index < 0 ? 0 : index;
       return {
-        transform: direction === "horizontal" ? `translate3d(${rtl ? "" : "-"}${index * 100}%, 0, 0)` : `translate3d( 0,-${index * 100}%, 0)`,
+        transform: direction === "horizontal" ? `translate3d(${rtl ? "" : "-"}${index * 100}%, 0, 0)` : `translate3d( 0, -${index * 100}%, 0)`,
         transitionDuration: `${duration}ms`
       };
     };
@@ -5448,12 +5431,11 @@
       index = index < 0 ? 0 : index;
       scrollIntoView(index);
     }, [value]);
-    const tabChange = (item, index) => {
+    const tabChange = (item) => {
       onClick && onClick(item.value);
-      if (item.disabled) {
-        return;
+      if (!item.disabled) {
+        setValue(item.value);
       }
-      setValue(item.value);
     };
     return /* @__PURE__ */ React.createElement(components.View, { className: classes, ...rest }, /* @__PURE__ */ React.createElement(
       components.ScrollView,
@@ -5468,71 +5450,55 @@
         scrollWithAnimation: rtl && Taro.getEnv() !== "WEB" ? false : scrollWithAnimation.current,
         id: `nut-tabs-titles-${name || uuid}`,
         className: classesTitle,
-        style: { ...tabStyle }
+        style: tabStyle
       },
-      /* @__PURE__ */ React.createElement(components.View, { className: "nut-tabs-list", ref: navRef }, !!title && typeof title === "function" ? title() : titles.current.map((item, index) => {
+      /* @__PURE__ */ React.createElement(components.View, { className: "nut-tabs-list" }, !!title && typeof title === "function" ? title() : titles.current.map((item, index) => {
         return /* @__PURE__ */ React.createElement(
           components.View,
           {
+            key: item.value,
             ref: (ref) => titleItemsRef.current.push(ref),
             id: `scrollIntoView${index}`,
-            onClick: (e2) => {
-              tabChange(item);
-            },
+            onClick: () => tabChange(item),
             className: classNames(`${classPrefix$k}-titles-item`, {
               [`nut-tabs-titles-item-active`]: !item.disabled && String(item.value) === String(value),
               [`nut-tabs-titles-item-disabled`]: item.disabled,
               [`nut-tabs-titles-item-${align}`]: align
-            }),
-            key: item.value
+            })
           },
           activeType === "line" && /* @__PURE__ */ React.createElement(
             components.View,
             {
               className: classNames(
                 `${classPrefix$k}-titles-item-line`,
-                {
-                  [`${classPrefix$k}-titles-item-line-${direction}`]: true
-                }
+                `${classPrefix$k}-titles-item-line-${direction}`
               ),
-              style: tabsActiveStyle
+              style: { background: activeColor }
             }
           ),
-          activeType === "smile" && /* @__PURE__ */ React.createElement(
-            components.View,
-            {
-              className: `${classPrefix$k}-titles-item-smile`,
-              style: tabsActiveStyle
-            },
-            /* @__PURE__ */ React.createElement(L$1, { color: activeColor })
-          ),
+          activeType === "smile" && /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$k}-titles-item-smile` }, /* @__PURE__ */ React.createElement(L$1, { color: activeColor })),
           /* @__PURE__ */ React.createElement(
             components.View,
             {
               className: classNames(
-                `${classPrefix$k}-ellipsis`,
+                {
+                  [`${classPrefix$k}-ellipsis`]: direction === "vertical"
+                },
                 `${classPrefix$k}-titles-item-text`
-              )
+              ),
+              style: { color: activeColor }
             },
             item.title
           )
         );
       }))
     ), /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$k}-content-wrap` }, /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$k}-content`, style: getContentStyle() }, React.Children.map(children, (child, idx) => {
-      if (!React.isValidElement(child)) {
-        return null;
-      }
-      let childProps = {
+      if (!React.isValidElement(child)) return null;
+      return React.cloneElement(child, {
         ...child.props,
-        active: value === child.props.value
-      };
-      if (String(value) !== String(child.props.value || idx) && autoHeight) {
-        childProps = {
-          ...childProps,
-          autoHeightClassName: "inactive"
-        };
-      }
-      return React.cloneElement(child, childProps);
+        active: value === child.props.value,
+        autoHeightClassName: autoHeight && String(value) !== String(child.props.value || idx) ? "inactive" : void 0
+      });
     }))));
   };
   Tabs.displayName = "NutTabs";
@@ -6262,189 +6228,106 @@
   };
   const Address = React.forwardRef(InternalAddress);
   Address.displayName = "NutAddress";
-  const Utils = {
-    /**
-     * 是否为闫年
-     * @return {Boolse} true|false
-     */
-    isLeapYear(y2) {
-      return y2 % 4 === 0 && y2 % 100 !== 0 || y2 % 400 === 0;
-    },
-    /**
-     * 返回星期数
-     * @return {String}
-     */
-    getWhatDay(year, month, day) {
-      const date2 = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
-      const index = date2.getDay();
-      const dayNames = [
-        "星期日",
-        "星期一",
-        "星期二",
-        "星期三",
-        "星期四",
-        "星期五",
-        "星期六"
-      ];
-      return dayNames[index];
-    },
-    /**
-     * 返回上一个月在当前面板中的天数
-     * @return {Number}
-     */
-    getMonthPreDay(year, month) {
-      const date2 = /* @__PURE__ */ new Date(`${year}/${month}/01`);
-      let day = date2.getDay();
-      if (day === 0) {
-        day = 7;
-      }
-      return day;
-    },
-    /**
-     * 返回月份天数
-     * @return {Number}
-     */
-    getMonthDays(year, month) {
-      if (/^0/.test(month)) {
-        month = month.split("")[1];
-      }
-      return [
-        0,
-        31,
-        this.isLeapYear(Number(year)) ? 29 : 28,
-        31,
-        30,
-        31,
-        30,
-        31,
-        31,
-        30,
-        31,
-        30,
-        31
-      ][month];
-    },
-    /**
-     * 补齐数字位数
-     * @return {string}
-     */
-    getNumTwoBit(n2) {
-      n2 = Number(n2);
-      return (n2 > 9 ? "" : "0") + n2;
-    },
-    /**
-     * 日期对象转成字符串
-     * @return {string}
-     */
-    date2Str(date2, split) {
-      split = split || "-";
-      const y2 = date2.getFullYear();
-      const m2 = this.getNumTwoBit(date2.getMonth() + 1);
-      const d = this.getNumTwoBit(date2.getDate());
-      return [y2, m2, d].join(split);
-    },
-    /**
-     * 返回日期格式字符串
-     * @param {Number} 0返回今天的日期、1返回明天的日期，2返回后天得日期，依次类推
-     * @return {string} '2014-12-31'
-     */
-    getDay(i2) {
-      i2 = i2 || 0;
-      let date2 = /* @__PURE__ */ new Date();
-      const diff = i2 * (1e3 * 60 * 60 * 24);
-      date2 = new Date(date2.getTime() + diff);
-      return this.date2Str(date2);
-    },
-    /**
-     * 时间比较
-     * @return {Boolean}
-     */
-    compareDate(date1, date2) {
-      const startTime = new Date(date1.replace("-", "/").replace("-", "/"));
-      const endTime = new Date(date2.replace("-", "/").replace("-", "/"));
-      if (startTime >= endTime) {
-        return false;
-      }
-      return true;
-    },
-    /**
-     * 时间是否相等
-     * @return {Boolean}
-     */
-    isEqual(date1, date2) {
-      const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
-      const endTime = new Date(date2.replace(/-/g, "/")).getTime();
-      if (startTime === endTime) {
-        return true;
-      }
-      return false;
-    },
-    getMonthWeek(year, month, date2, firstDayOfWeek = 0) {
-      const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date2));
-      let w = dateNow.getDay();
-      const d = dateNow.getDate();
-      let remainder = 6 - w;
-      if (firstDayOfWeek !== 0) {
-        w = w === 0 ? 7 : w;
-        remainder = 7 - w;
-      }
-      return Math.ceil((d + remainder) / 7);
-    },
-    getYearWeek(year, month, date2, firstDayOfWeek = 0) {
-      const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date2));
-      const dateFirst = new Date(Number(year), 0, 1);
-      const dataNumber = Math.round(
-        (dateNow.valueOf() - dateFirst.valueOf()) / 864e5
-      );
-      return Math.ceil((dataNumber + (dateFirst.getDay() + 1 - 1)) / 7);
-    },
-    getWeekDate(year, month, date2, firstDayOfWeek = 0) {
-      const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date2));
-      const nowTime = dateNow.getTime();
-      let day = dateNow.getDay();
-      if (firstDayOfWeek === 0) {
-        const oneDayTime2 = 24 * 60 * 60 * 1e3;
-        const SundayTime2 = nowTime - day * oneDayTime2;
-        const SaturdayTime = nowTime + (6 - day) * oneDayTime2;
-        const sunday2 = this.date2Str(new Date(SundayTime2));
-        const saturday = this.date2Str(new Date(SaturdayTime));
-        return [sunday2, saturday];
-      }
-      day = day === 0 ? 7 : day;
-      const oneDayTime = 24 * 60 * 60 * 1e3;
-      const MondayTime = nowTime - (day - 1) * oneDayTime;
-      const SundayTime = nowTime + (7 - day) * oneDayTime;
-      const monday = this.date2Str(new Date(MondayTime));
-      const sunday = this.date2Str(new Date(SundayTime));
-      return [monday, sunday];
-    },
-    formatResultDate(date2) {
-      const days = [...date2.split("-")];
-      days[2] = Utils.getNumTwoBit(Number(days[2]));
-      days[3] = `${days[0]}-${days[1]}-${days[2]}`;
-      days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
-      return days;
+  const isLeapYear = (y2) => {
+    return y2 % 4 === 0 && y2 % 100 !== 0 || y2 % 400 === 0;
+  };
+  const getWhatDay = (year, month, day) => {
+    const date2 = new Date(year, month - 1, day);
+    const dayNames = [
+      "星期日",
+      "星期一",
+      "星期二",
+      "星期三",
+      "星期四",
+      "星期五",
+      "星期六"
+    ];
+    return dayNames[date2.getDay()];
+  };
+  const getMonthPreDay = (year, month) => {
+    const day = new Date(year, month - 1, 1).getDay();
+    return day === 0 ? 7 : day;
+  };
+  const getMonthDays = (year, month) => {
+    if (/^0/.test(month)) {
+      month = month.split("")[1];
+    }
+    return [
+      0,
+      31,
+      isLeapYear(Number(year)) ? 29 : 28,
+      31,
+      30,
+      31,
+      30,
+      31,
+      31,
+      30,
+      31,
+      30,
+      31
+    ][month];
+  };
+  const getNumTwoBit = (n2) => {
+    return n2 > 9 ? `${n2}` : `0${n2}`;
+  };
+  const date2Str = (date2, split = "-") => {
+    const y2 = date2.getFullYear();
+    const m2 = getNumTwoBit(date2.getMonth() + 1);
+    const d = getNumTwoBit(date2.getDate());
+    return [y2, m2, d].join(split);
+  };
+  const getDateString = (offset = 0) => {
+    const date2 = /* @__PURE__ */ new Date();
+    date2.setDate(date2.getDate() + offset);
+    return date2Str(date2, "-");
+  };
+  const compareDate = (date1, date2) => {
+    const startTime = new Date(date1.replace("-", "/").replace("-", "/"));
+    const endTime = new Date(date2.replace("-", "/").replace("-", "/"));
+    return startTime < endTime;
+  };
+  const isEqual = (date1, date2) => {
+    const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
+    const endTime = new Date(date2.replace(/-/g, "/")).getTime();
+    return startTime === endTime;
+  };
+  const getWeekDate = (year, month, date2, firstDayOfWeek = 0) => {
+    const dateNow = new Date(Number(year), parseInt(month) - 1, Number(date2));
+    const nowTime = dateNow.getTime();
+    let day = dateNow.getDay();
+    if (firstDayOfWeek === 0) {
+      const oneDayTime2 = 24 * 60 * 60 * 1e3;
+      const SundayTime2 = nowTime - day * oneDayTime2;
+      const SaturdayTime = nowTime + (6 - day) * oneDayTime2;
+      const sunday2 = date2Str(new Date(SundayTime2));
+      const saturday = date2Str(new Date(SaturdayTime));
+      return [sunday2, saturday];
     }
+    day = day === 0 ? 7 : day;
+    const oneDayTime = 24 * 60 * 60 * 1e3;
+    const MondayTime = nowTime - (day - 1) * oneDayTime;
+    const SundayTime = nowTime + (7 - day) * oneDayTime;
+    const monday = date2Str(new Date(MondayTime));
+    const sunday = date2Str(new Date(SundayTime));
+    return [monday, sunday];
+  };
+  const formatResultDate = (date2) => {
+    const [year, month, day] = [...date2.split("-")];
+    const formatterDay = getNumTwoBit(Number(day));
+    const formatterDate = `${year}-${month}-${day}`;
+    const dayOfWeek = getWhatDay(Number(year), Number(month), Number(day));
+    return [year, month, formatterDay, formatterDate, dayOfWeek];
   };
   const getCurrMonthData = (type2, year, month) => {
-    switch (type2) {
-      case "prev":
-        month === 1 && (year -= 1);
-        month = month === 1 ? 12 : --month;
-        break;
-      case "next":
-        month === 12 && (year += 1);
-        month = month === 12 ? 1 : ++month;
-        break;
+    {
+      month === 12 && (year += 1);
+      month = month === 12 ? 1 : ++month;
     }
-    return [
-      year,
-      Utils.getNumTwoBit(month),
-      Utils.getMonthDays(String(year), String(month))
-    ];
+    return [year, getNumTwoBit(month), getMonthDays(String(year), String(month))];
   };
   const getDaysStatus = (type2, year, month) => {
-    let days = Utils.getMonthDays(`${year}`, `${month}`);
+    let days = getMonthDays(`${year}`, `${month}`);
     return Array.from(Array(days), (v, k) => {
       return {
         day: k + 1,
@@ -6461,12 +6344,12 @@
       preMonth = 12;
       preYear += 1;
     }
-    let days = Utils.getMonthPreDay(+year, +month);
+    let days = getMonthPreDay(+year, +month);
     days -= firstDayOfWeek;
     if (days >= 7) {
       days -= 7;
     }
-    const preDates = Utils.getMonthDays(`${preYear}`, `${preMonth}`);
+    const preDates = getMonthDays(`${preYear}`, `${preMonth}`);
     const months = Array.from(Array(preDates), (v, k) => {
       return {
         day: k + 1,
@@ -6484,28 +6367,26 @@
   const isMultiple = (day, days) => {
     if (days.length > 0) {
       return days.some((item) => {
-        return Utils.isEqual(item, day);
+        return isEqual(item, day);
       });
     }
     return false;
   };
   const isCurrDay = (month, day) => {
     const date2 = `${month.curData[0]}/${month.curData[1]}/${day}`;
-    return Utils.isEqual(date2, Utils.date2Str(/* @__PURE__ */ new Date(), "/"));
+    return isEqual(date2, date2Str(/* @__PURE__ */ new Date(), "/"));
   };
   const getCurrDate = (day, month) => {
-    return `${month.curData[0]}/${month.curData[1]}/${Utils.getNumTwoBit(
-      +day.day
-    )}`;
+    return `${month.curData[0]}/${month.curData[1]}/${getNumTwoBit(+day.day)}`;
   };
   const isStart = (day, days) => {
-    return Utils.isEqual(days[0], day);
+    return isEqual(days[0], day);
   };
   const isEnd = (day, days) => {
-    return Utils.isEqual(days[1], day);
+    return isEqual(days[1], day);
   };
   const isStartAndEnd = (days) => {
-    return days.length >= 2 && Utils.isEqual(days[0], days[1]);
+    return days.length >= 2 && isEqual(days[0], days[1]);
   };
   const defaultProps$13 = {
     ...ComponentDefaults,
@@ -6513,8 +6394,8 @@
     autoBackfill: false,
     popup: true,
     title: "",
-    startDate: Utils.getDay(0),
-    endDate: Utils.getDay(365),
+    startDate: getDateString(0),
+    endDate: getDateString(365),
     showToday: true,
     startText: "",
     endText: "",
@@ -6547,6 +6428,7 @@
       type: type2,
       autoBackfill,
       title,
+      value,
       defaultValue,
       startDate,
       endDate,
@@ -6564,12 +6446,13 @@
       renderDayTop,
       renderDayBottom,
       renderBottomButton,
-      value,
       onConfirm,
       onUpdate,
       onDayClick,
       onPageChange
     } = { ...defaultProps$13, ...props };
+    const classPrefix2 = "nut-calendar";
+    const dayPrefix = "nut-calendar-day";
     const weekdays = locale.calendaritem.weekdays;
     const weeks = [
       ...weekdays.slice(firstDayOfWeek, 7),
@@ -6583,19 +6466,13 @@
     const [monthDefaultRange, setMonthDefaultRange] = React.useState([]);
     const [scrollTop, setScrollTop] = React.useState(0);
     const [scrollWithAnimation, setScrollWithAnimation] = React.useState(false);
-    const propStartDate = startDate || Utils.getDay(0);
-    const propEndDate = endDate || Utils.getDay(365);
+    const propStartDate = startDate || getDateString(0);
+    const propEndDate = endDate || getDateString(365);
     const startDates = splitDate(propStartDate);
     const endDates = splitDate(propEndDate);
     const [state] = React.useState({
       currDateArray: []
     });
-    const getMonthsPanel = () => {
-      return monthsPanel.current;
-    };
-    const getMonthsRef = () => {
-      return monthsRef.current;
-    };
     const resetDefaultValue = () => {
       if (defaultValue || Array.isArray(defaultValue) && defaultValue.length > 0) {
         return type2 !== "single" ? [...defaultValue] : defaultValue;
@@ -6615,9 +6492,7 @@
     const viewAreaRef = React.useRef(null);
     const [avgHeight, setAvgHeight] = React.useState(0);
     let viewHeight = 0;
-    const classPrefix2 = "nut-calendar";
-    const dayPrefix = "nut-calendar-day";
-    const getMonthData = (curData, monthNum, type22) => {
+    const getMonthData = (curData, monthNum) => {
       let i2 = 0;
       let date2 = curData;
       const monthData = monthsData;
@@ -6628,12 +6503,12 @@
           ...getPreMonthDates("prev", y2, m2, firstDayOfWeek),
           ...getDaysStatus("active", y2, m2)
         ];
-        const cssHeight = 39 + (days.length > 35 ? 384 : 320);
         let scrollTop2 = 0;
         if (monthData.length > 0) {
           const monthEle = monthData[monthData.length - 1];
           scrollTop2 = monthEle.scrollTop + monthEle.cssHeight;
         }
+        const cssHeight = 39 + (days.length > 35 ? 384 : 320);
         const monthInfo = {
           curData: date2,
           title: monthTitle(y2, m2),
@@ -6641,16 +6516,14 @@
           cssHeight,
           scrollTop: scrollTop2
         };
-        {
-          if (!endDates || !Utils.compareDate(
-            `${endDates[0]}/${endDates[1]}/${Utils.getMonthDays(
-              endDates[0],
-              endDates[1]
-            )}`,
-            `${curData[0]}/${curData[1]}/${curData[2]}`
-          )) {
-            monthData.push(monthInfo);
-          }
+        if (!endDates || !compareDate(
+          `${endDates[0]}/${endDates[1]}/${getMonthDays(
+            endDates[0],
+            endDates[1]
+          )}`,
+          `${curData[0]}/${curData[1]}/${curData[2]}`
+        )) {
+          monthData.push(monthInfo);
         }
         date2 = getCurrMonthData("next", y2, m2);
       } while (i2++ < monthNum);
@@ -6658,8 +6531,8 @@
     };
     const setReachedYearMonthInfo = (current) => {
       const currentMonthsData = monthsData[current];
-      const [year, month] = currentMonthsData.curData;
       if (currentMonthsData.title === yearMonthTitle) return;
+      const [year, month] = currentMonthsData.curData;
       onPageChange && onPageChange([year, month, `${year}-${month}`]);
       setYearMonthTitle(currentMonthsData.title);
     };
@@ -6685,75 +6558,67 @@
       setTranslateY(monthsData[start].scrollTop);
       setReachedYearMonthInfo(current);
     };
-    const getMonthNum = () => {
-      let monthNum = Number(endDates[1]) - Number(startDates[1]);
-      const yearNum = Number(endDates[0]) - Number(startDates[0]);
-      if (yearNum > 0) {
-        monthNum += 12 * yearNum;
-      }
-      if (monthNum <= 0) {
-        monthNum = 1;
-      }
-      setMonthsNum(monthNum);
-      return monthNum;
-    };
     const setDefaultDate = () => {
       let defaultData = [];
-      if (type2 === "range" && Array.isArray(currentDate)) {
-        if (currentDate.length > 0) {
-          if (propStartDate && Utils.compareDate(currentDate[0], propStartDate)) {
-            currentDate.splice(0, 1, propStartDate);
-          }
-          if (propEndDate && Utils.compareDate(propEndDate, currentDate[1])) {
-            currentDate.splice(1, 1, propEndDate);
-          }
-          defaultData = [
-            ...splitDate(currentDate[0]),
-            ...splitDate(currentDate[1])
-          ];
+      if (type2 === "single" && typeof currentDate === "string") {
+        if (!currentDate.length) {
+          return defaultData;
+        }
+        if (compareDate(currentDate, propStartDate)) {
+          defaultData = [...splitDate(propStartDate)];
+        } else if (!compareDate(currentDate, propEndDate)) {
+          defaultData = [...splitDate(propEndDate)];
+        } else {
+          defaultData = [...splitDate(currentDate)];
         }
-      } else if (type2 === "multiple" && Array.isArray(currentDate)) {
-        if (currentDate.length > 0) {
-          const defaultArr = [];
-          const obj = {};
-          currentDate.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;
-              }
+        return defaultData;
+      }
+      if (Array.isArray(currentDate) && currentDate.length) {
+        switch (type2) {
+          case "range": {
+            if (compareDate(currentDate[0], propStartDate)) {
+              currentDate[0] = propStartDate;
             }
-          });
-          currentDate.splice(0) && currentDate.push(...defaultArr);
-          defaultData = [...splitDate(defaultArr[0])];
-        }
-      } else if (type2 === "week" && Array.isArray(currentDate)) {
-        if (currentDate.length > 0) {
-          const [y2, m2, d] = splitDate(currentDate[0]);
-          const weekArr = Utils.getWeekDate(y2, m2, d, firstDayOfWeek);
-          currentDate.splice(0) && currentDate.push(...weekArr);
-          if (propStartDate && Utils.compareDate(currentDate[0], propStartDate)) {
-            currentDate.splice(0, 1, propStartDate);
+            if (compareDate(propEndDate, currentDate[1])) {
+              currentDate[1] = propEndDate;
+            }
+            defaultData = [
+              ...splitDate(currentDate[0]),
+              ...splitDate(currentDate[1])
+            ];
+            break;
           }
-          if (propEndDate && Utils.compareDate(propEndDate, currentDate[1])) {
-            currentDate.splice(1, 1, propEndDate);
+          case "multiple": {
+            const defaultArr = [];
+            const obj = {};
+            currentDate.forEach((item) => {
+              if (!compareDate(item, propStartDate) && !compareDate(propEndDate, item)) {
+                if (!Object.hasOwnProperty.call(obj, item)) {
+                  defaultArr.push(item);
+                  obj[item] = item;
+                }
+              }
+            });
+            currentDate.splice(0, currentDate.length, ...defaultArr);
+            defaultData = [...splitDate(defaultArr[0])];
+            break;
           }
-          defaultData = [
-            ...splitDate(currentDate[0]),
-            ...splitDate(currentDate[1])
-          ];
-        }
-      } else if (currentDate) {
-        if (currentDate.length > 0) {
-          if (propStartDate && Utils.compareDate(currentDate, propStartDate)) {
-            defaultData = [...splitDate(propStartDate)];
-          } else if (propEndDate && !Utils.compareDate(currentDate, propEndDate)) {
-            defaultData = [...splitDate(propEndDate)];
-          } else {
-            defaultData = [...splitDate(currentDate)];
+          case "week": {
+            const [y2, m2, d] = splitDate(currentDate[0]);
+            const weekArr = getWeekDate(y2, m2, d, firstDayOfWeek);
+            currentDate.splice(0, currentDate.length, ...weekArr);
+            if (compareDate(currentDate[0], propStartDate)) {
+              currentDate.splice(0, 1, propStartDate);
+            }
+            if (compareDate(propEndDate, currentDate[1])) {
+              currentDate.splice(1, 1, propEndDate);
+            }
+            defaultData = [
+              ...splitDate(currentDate[0]),
+              ...splitDate(currentDate[1])
+            ];
+            break;
           }
-        } else {
-          defaultData = [];
         }
       }
       return defaultData;
@@ -6776,63 +6641,57 @@
         const date2 = /* @__PURE__ */ new Date();
         const year = date2.getFullYear();
         const month = date2.getMonth() + 1;
-        const index = monthsData.findIndex((item) => {
-          return +item.curData[0] === year && +item.curData[1] === month;
-        });
-        if (index > -1) {
-          current = index;
-        }
+        const index = monthsData.findIndex(
+          (item) => +item.curData[0] === year && +item.curData[1] === month
+        );
+        if (index > -1) current = index;
       }
       return {
         current,
         lastCurrent
       };
     };
-    const renderCurrentDate = () => {
-      const defaultData = setDefaultDate();
-      const current = getCurrentIndex(defaultData);
-      if (defaultData.length > 0) {
-        if (type2 === "range") {
-          chooseDay(
-            { day: defaultData[2], type: "active" },
-            monthsData[current.current],
-            true
-          );
-          chooseDay(
+    const renderCurrentDate = (defaultData, current) => {
+      if (!defaultData.length) return;
+      const date2 = monthsData[current.current];
+      switch (type2) {
+        case "range": {
+          handleDayClick({ day: defaultData[2], type: "active" }, date2);
+          handleDayClick(
             { day: defaultData[5], type: "active" },
-            monthsData[current.lastCurrent],
-            true
-          );
-        } else if (type2 === "week") {
-          chooseDay(
-            { day: defaultData[2], type: "curr" },
-            monthsData[current.current],
-            true
+            monthsData[current.lastCurrent]
           );
-        } else if (type2 === "multiple") {
+          break;
+        }
+        case "week": {
+          handleDayClick({ day: defaultData[2], type: "curr" }, date2);
+          break;
+        }
+        case "multiple": {
           [...currentDate].forEach((item) => {
             const dateArr = splitDate(item);
             let currentIndex = current.current;
-            monthsData.forEach((item2, index) => {
-              if (item2.title === monthTitle(dateArr[0], dateArr[1])) {
-                currentIndex = index;
-              }
-            });
-            chooseDay(
+            currentIndex = monthsData.findIndex(
+              (item2) => item2.title === monthTitle(dateArr[0], dateArr[1])
+            );
+            handleDayClick(
               { day: dateArr[2], type: "active" },
-              monthsData[currentIndex],
-              true
+              monthsData[currentIndex]
             );
           });
-        } else {
-          chooseDay(
-            { day: defaultData[2], type: "active" },
-            monthsData[current.current],
-            true
-          );
+          break;
+        }
+        default: {
+          handleDayClick({ day: defaultData[2], type: "active" }, date2);
+          break;
         }
       }
-      return current.current;
+    };
+    const getMonthsPanel = () => {
+      return monthsPanel.current;
+    };
+    const getMonthsRef = () => {
+      return monthsRef.current;
     };
     const requestAniFrameFunc = (current, monthNum) => {
       const lastItem = monthsData[monthsData.length - 1];
@@ -6841,19 +6700,31 @@
         if (monthsRef && monthsPanel && viewAreaRef) {
           viewHeight = getMonthsRef().clientHeight;
           getMonthsPanel().style.height = `${containerHeight}px`;
-          getMonthsRef().scrollTop = monthsData[current].scrollTop;
-          setScrollTop(monthsData[current].scrollTop);
+          const currTop = monthsData[current].scrollTop;
+          getMonthsRef().scrollTop = currTop;
+          setScrollTop(currTop);
           Taro.nextTick(() => setScrollWithAnimation(true));
         }
       });
       setAvgHeight(Math.floor(containerHeight / (monthNum + 1)));
     };
+    const getMonthNum = () => {
+      let monthNum = Number(endDates[1]) - Number(startDates[1]);
+      const yearNum = Number(endDates[0]) - Number(startDates[0]);
+      if (yearNum > 0) monthNum += 12 * yearNum;
+      if (monthNum <= 0) monthNum = 1;
+      setMonthsNum(monthNum);
+      return monthNum;
+    };
     const initData = () => {
       const monthNum = getMonthNum();
       getMonthData(startDates, monthNum);
-      const current = renderCurrentDate();
-      setDefaultRange(monthNum, current);
-      requestAniFrameFunc(current, monthNum);
+      const defaultData = setDefaultDate();
+      const current = getCurrentIndex(defaultData);
+      const currentIndex = current.current;
+      renderCurrentDate(defaultData, current);
+      setDefaultRange(monthNum, currentIndex);
+      requestAniFrameFunc(currentIndex, monthNum);
     };
     React.useEffect(() => {
       initData();
@@ -6870,9 +6741,9 @@
       popup && resetRender();
     }, [currentDate]);
     const scrollToDate = (date2) => {
-      if (Utils.compareDate(date2, propStartDate)) {
+      if (compareDate(date2, propStartDate)) {
         date2 = propStartDate;
-      } else if (!Utils.compareDate(date2, propEndDate)) {
+      } else if (!compareDate(date2, propEndDate)) {
         date2 = propEndDate;
       }
       const dateArr = splitDate(date2);
@@ -6893,22 +6764,20 @@
                   clearInterval(interval);
                   if (monthsRef.current) {
                     monthsRef.current.scrollTop = currTop;
-                    setScrollTop(monthsRef.current.scrollTop);
+                    setScrollTop(currTop);
                   }
                 }
               }, 40);
             } else {
               monthsRef.current.scrollTop = currTop;
-              setScrollTop(monthsRef.current.scrollTop);
+              setScrollTop(currTop);
             }
           }
         }
       });
     };
     const monthsViewScroll = (e2) => {
-      if (monthsData.length <= 1) {
-        return;
-      }
+      if (monthsData.length <= 1) return;
       const scrollTop2 = e2.target.scrollTop;
       Taro.getEnv() === "WEB" && setScrollTop(scrollTop2);
       let current = Math.floor(scrollTop2 / avgHeight);
@@ -6917,16 +6786,10 @@
       const nextTop = monthsData[current + 1].scrollTop;
       const nextHeight = monthsData[current + 1].cssHeight;
       if (current === 0) {
-        if (scrollTop2 >= nextTop) {
-          current += 1;
-        }
+        if (scrollTop2 >= nextTop) current += 1;
       } else if (current > 0 && current < monthsNum - 1) {
-        if (scrollTop2 >= nextTop) {
-          current += 1;
-        }
-        if (scrollTop2 < monthsData[current].scrollTop) {
-          current -= 1;
-        }
+        if (scrollTop2 >= nextTop) current += 1;
+        if (scrollTop2 < monthsData[current].scrollTop) current -= 1;
       } else {
         const viewPosition = Math.round(scrollTop2 + viewHeight);
         if (current + 1 <= monthsNum && viewPosition >= nextTop + nextHeight) {
@@ -6941,90 +6804,96 @@
     React.useImperativeHandle(ref, () => ({
       scrollToDate
     }));
+    const isDisable = (day, month) => {
+      if (day.type !== "active") return true;
+      const dateStr = getCurrDate(day, month);
+      if (compareDate(dateStr, propStartDate)) return true;
+      if (compareDate(propEndDate, dateStr)) return true;
+      return false;
+    };
     const getClasses = (day, month) => {
       const dateStr = getCurrDate(day, month);
-      if (day.type === "active") {
-        if (propStartDate && Utils.compareDate(dateStr, propStartDate) || propEndDate && Utils.compareDate(propEndDate, dateStr)) {
-          return `${dayPrefix}-disabled`;
-        }
-        if (type2 === "range" || type2 === "week") {
-          if (isStart(dateStr, currentDate) || isEnd(dateStr, currentDate)) {
-            return `${dayPrefix}-active ${isStart(dateStr, currentDate) ? "active-start" : ""} ${isEnd(dateStr, currentDate) ? "active-end" : ""}`;
-          }
-          if (Array.isArray(currentDate) && Object.values(currentDate).length === 2 && Utils.compareDate(currentDate[0], dateStr) && Utils.compareDate(dateStr, currentDate[1])) {
-            if (disableDate(day)) {
-              return `${dayPrefix}-choose-disabled`;
-            }
-            return `${dayPrefix}-choose`;
-          }
-        } else if (type2 === "multiple" && isMultiple(dateStr, currentDate) || !Array.isArray(currentDate) && Utils.isEqual(currentDate, dateStr)) {
-          return `${dayPrefix}-active`;
+      if (isDisable(day, month)) return `${dayPrefix}-disabled`;
+      const activeCls = `${dayPrefix}-active`;
+      if (type2 === "range" || type2 === "week") {
+        if (isStart(dateStr, currentDate))
+          return `${activeCls} active-start`;
+        if (isEnd(dateStr, currentDate)) {
+          return `${activeCls} active-end`;
         }
-        if (disableDate(day)) {
-          return `${dayPrefix}-disabled`;
+        if (currentDate.length === 2 && compareDate(currentDate[0], dateStr) && compareDate(dateStr, currentDate[1])) {
+          return disableDate(day) ? `${dayPrefix}-choose-disabled` : `${dayPrefix}-choose`;
         }
-        return null;
+      } else if (type2 === "multiple" && isMultiple(dateStr, currentDate) || !Array.isArray(currentDate) && isEqual(currentDate, dateStr)) {
+        return activeCls;
       }
-      return `${dayPrefix}-disabled`;
+      if (disableDate(day)) return `${dayPrefix}-disabled`;
+      return null;
     };
-    const chooseDay = (day, month, isFirst) => {
-      if (getClasses(day, month) === `${dayPrefix}-disabled`) {
-        return;
-      }
+    const handleDayClick = (day, month, isFirst = true) => {
+      if (isDisable(day, month) || disableDate(day)) return;
       const days = [...month.curData];
       const [y2, m2] = month.curData;
-      days[2] = typeof day.day === "number" ? Utils.getNumTwoBit(day.day) : day.day;
+      days[2] = typeof day.day === "number" ? getNumTwoBit(day.day) : day.day;
       days[3] = `${days[0]}/${days[1]}/${days[2]}`;
-      days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
-      if (type2 === "multiple") {
-        if (currentDate.length > 0) {
-          let hasIndex = "";
-          currentDate.forEach((item, index) => {
-            if (item === days[3]) {
-              hasIndex = index;
+      days[4] = getWhatDay(+days[0], +days[1], +days[2]);
+      const newDate = days[3];
+      switch (type2) {
+        case "multiple": {
+          if (Array.isArray(currentDate)) {
+            if (currentDate.length > 0) {
+              const hasIndex = currentDate.findIndex((item) => item === newDate);
+              if (isFirst) {
+                state.currDateArray.push([...days]);
+              } else if (hasIndex > -1) {
+                currentDate.splice(hasIndex, 1);
+                state.currDateArray.splice(hasIndex, 1);
+              } else {
+                currentDate.push(newDate);
+                state.currDateArray.push([...days]);
+              }
+            } else {
+              currentDate.push(newDate);
+              state.currDateArray = [[...days]];
             }
-          });
-          if (isFirst) {
-            state.currDateArray.push([...days]);
-          } else if (hasIndex !== "") {
-            currentDate.splice(hasIndex, 1);
-            state.currDateArray.splice(hasIndex, 1);
-          } else {
-            currentDate.push(days[3]);
-            state.currDateArray.push([...days]);
           }
-        } else {
-          currentDate.push(days[3]);
-          state.currDateArray = [[...days]];
-        }
-      } else if (type2 === "range") {
-        const curDataLength = Object.values(currentDate).length;
-        if (curDataLength === 2 || curDataLength === 0) {
-          Array.isArray(currentDate) && currentDate.splice(0) && currentDate.push(days[3]);
-          state.currDateArray = [[...days]];
-        } else if (Utils.compareDate(currentDate[0], days[3])) {
-          Array.isArray(currentDate) && currentDate.push(days[3]);
-          state.currDateArray = [...state.currDateArray, [...days]];
-        } else {
-          Array.isArray(currentDate) && currentDate.unshift(days[3]);
-          state.currDateArray = [[...days], ...state.currDateArray];
+          break;
         }
-      } else if (type2 === "week") {
-        const weekArr = Utils.getWeekDate(y2, m2, `${day.day}`, firstDayOfWeek);
-        if (propStartDate && Utils.compareDate(weekArr[0], propStartDate)) {
-          weekArr.splice(0, 1, propStartDate);
+        case "range": {
+          if (Array.isArray(currentDate)) {
+            if (currentDate.length === 2 || currentDate.length === 0) {
+              currentDate.splice(0, currentDate.length, newDate);
+              state.currDateArray = [[...days]];
+            } else if (compareDate(currentDate[0], newDate)) {
+              currentDate.push(newDate);
+              state.currDateArray = [...state.currDateArray, [...days]];
+            } else {
+              currentDate.unshift(newDate);
+              state.currDateArray = [[...days], ...state.currDateArray];
+            }
+          }
+          break;
+        }
+        case "week": {
+          const weekArr = getWeekDate(y2, m2, `${day.day}`, firstDayOfWeek);
+          if (compareDate(weekArr[0], propStartDate)) {
+            weekArr[0] = propStartDate;
+          }
+          if (compareDate(propEndDate, weekArr[1])) {
+            weekArr[1] = propEndDate;
+          }
+          currentDate.splice(0, currentDate.length, ...weekArr);
+          state.currDateArray = [
+            formatResultDate(weekArr[0]),
+            formatResultDate(weekArr[1])
+          ];
+          break;
         }
-        if (propEndDate && Utils.compareDate(propEndDate, weekArr[1])) {
-          weekArr.splice(1, 1, propEndDate);
+        default: {
+          setCurrentDate(newDate);
+          state.currDateArray = [...days];
+          break;
         }
-        Array.isArray(currentDate) && currentDate.splice(0) && currentDate.push(...weekArr);
-        state.currDateArray = [
-          Utils.formatResultDate(weekArr[0]),
-          Utils.formatResultDate(weekArr[1])
-        ];
-      } else {
-        setCurrentDate(days[3]);
-        state.currDateArray = [...days];
       }
       if (!isFirst) {
         onDayClick && onDayClick(state.currDateArray);
@@ -7044,11 +6913,11 @@
       }
     };
     const classes = classNames(
+      classPrefix2,
       {
         [`${classPrefix2}-title`]: !popup,
         [`${classPrefix2}-nofooter`]: !!autoBackfill
       },
-      classPrefix2,
       className
     );
     const headerClasses = classNames({
@@ -7064,6 +6933,40 @@
     const renderHeader = () => {
       return /* @__PURE__ */ React.createElement("div", { className: headerClasses }, showTitle && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-title` }, title || locale.calendaritem.title), renderHeaderButtons && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-header-buttons` }, renderHeaderButtons()), showSubTitle && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-sub-title` }, yearMonthTitle), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-weeks`, ref: weeksPanel }, weeks.map((item) => /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-week-item`, key: item }, item))));
     };
+    const renderItem = (month, day, index) => {
+      const startTip = isStartTip(day, month);
+      const endTip = isEndTip(day, month);
+      const noStartNorEnd = !startTip && !endTip;
+      return /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: classNames("nut-calendar-day", getClasses(day, month)),
+          onClick: () => handleDayClick(day, month, false),
+          key: index
+        },
+        /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-day` }, renderDay ? renderDay(day) : day.day),
+        !startTip && renderDayTop && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-top` }, renderDayTop(day)),
+        noStartNorEnd && renderDayBottom && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-bottom` }, renderDayBottom(day)),
+        noStartNorEnd && isCurrDay(month, day.day) && !renderDayBottom && showToday && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-curr` }, locale.calendaritem.today),
+        startTip && /* @__PURE__ */ React.createElement(
+          "div",
+          {
+            className: classNames("nut-calendar-day-info", {
+              "nut-calendar-day-info-top": isStartAndEnd(
+                currentDate
+              )
+            })
+          },
+          startText || locale.calendaritem.start
+        ),
+        endTip && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info` }, endText || locale.calendaritem.end)
+      );
+    };
+    const renderPanel = (month, key) => {
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-month`, key }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-month-title` }, month.title), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-days` }, month.monthData.map(
+        (day, i2) => renderItem(month, day, i2)
+      )));
+    };
     const renderContent = () => {
       return /* @__PURE__ */ React.createElement(
         components.ScrollView,
@@ -7084,31 +6987,7 @@
             style: { transform: `translateY(${translateY}px)` }
           },
           monthsData.slice(monthDefaultRange[0], monthDefaultRange[1]).map((month, key) => {
-            return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-month`, key }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-month-title` }, month.title), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-days` }, month.monthData.map((day, i2) => /* @__PURE__ */ React.createElement(
-              "div",
-              {
-                className: [
-                  `${classPrefix2}-day`,
-                  getClasses(day, month)
-                ].join(" "),
-                onClick: () => {
-                  chooseDay(day, month);
-                },
-                key: i2
-              },
-              /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-day` }, renderDay ? renderDay(day) : day.day),
-              !isStartTip(day, month) && renderDayTop && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-top` }, renderDayTop(day)),
-              !isStartTip(day, month) && !isEndTip(day, month) && renderDayBottom && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-bottom` }, renderDayBottom(day)),
-              !isStartTip(day, month) && !isEndTip(day, month) && !renderDayBottom && showToday && isCurrDay(month, day.day) && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info-curr` }, locale.calendaritem.today),
-              isStartTip(day, month) && /* @__PURE__ */ React.createElement(
-                "div",
-                {
-                  className: `${classPrefix2}-day-info ${isStartAndEnd(currentDate) ? `${classPrefix2}-day-info-top` : ""}`
-                },
-                startText || locale.calendaritem.start
-              ),
-              isEndTip(day, month) && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-day-info` }, endText || locale.calendaritem.end)
-            ))));
+            return renderPanel(month, key);
           })
         ))
       );
@@ -7127,8 +7006,8 @@
     visible: false,
     title: "",
     defaultValue: "",
-    startDate: Utils.getDay(0),
-    endDate: Utils.getDay(365),
+    startDate: getDateString(0),
+    endDate: getDateString(365),
     showToday: true,
     startText: "",
     endText: "",
@@ -7296,12 +7175,12 @@
       prevMonth = 12;
       prevYear -= 1;
     }
-    let days = Utils.getMonthPreDay(year, month);
+    let days = getMonthPreDay(year, month);
     days -= firstDayOfWeek;
     if (days >= 7) {
       days -= 7;
     }
-    const preDates = Utils.getMonthDays(`${prevYear}`, `${prevMonth}`);
+    const preDates = getMonthDays(`${prevYear}`, `${prevMonth}`);
     const months = Array.from(Array(preDates), (_, k) => {
       return {
         type: "prev",
@@ -7313,7 +7192,7 @@
     return months.slice(preDates - days);
   };
   const getCurrentMonthDays = (year, month) => {
-    const days = Utils.getMonthDays(`${year}`, `${month}`);
+    const days = getMonthDays(`${year}`, `${month}`);
     return Array.from(Array(days), (_, k) => {
       return {
         type: "current",
@@ -8676,9 +8555,9 @@
     };
     const compareDateChange = (currentDate, newDate, selectedOptions, index) => {
       var _a;
-      const isEqual = ((_a = new Date(currentDate)) == null ? void 0 : _a.getTime()) === (newDate == null ? void 0 : newDate.getTime());
+      const isEqual2 = ((_a = new Date(currentDate)) == null ? void 0 : _a.getTime()) === (newDate == null ? void 0 : newDate.getTime());
       if (newDate && isDate(newDate)) {
-        if (!isEqual) {
+        if (!isEqual2) {
           setSelectedDate(formatValue(newDate));
         }
         onChange == null ? void 0 : onChange(
@@ -8717,6 +8596,14 @@
           Number(formatDate[2]),
           getMonthEndDay(Number(formatDate[0]), Number(formatDate[1]))
         );
+        if (selectedOptions.length >= 2 && ["date", "datehour", "datetime", "month-day"].includes(rangeType)) {
+          const dayOption = formatOption("day", day);
+          if (rangeType === "month-day") {
+            selectedOptions[1] = dayOption;
+          } else {
+            selectedOptions[2] = dayOption;
+          }
+        }
         let date2 = null;
         if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
           date2 = new Date(year, month, day);
@@ -9630,7 +9517,7 @@
       pattern: {
         mismatch: "%s value %s does not match pattern %s"
       },
-      clone: function clone() {
+      clone: function clone2() {
         var cloned = JSON.parse(JSON.stringify(this));
         cloned.clone = this.clone;
         return cloned;
@@ -9894,23 +9781,55 @@
   Schema.warning = warning;
   Schema.messages = messages;
   Schema.validators = validators;
-  function merge(...objects) {
-    const result = Array.isArray(objects[0]) ? [] : {};
-    function mergeHelper(obj, path = []) {
-      for (const [key, value] of Object.entries(obj)) {
-        const newPath = [...path, key];
-        if (Array.isArray(value)) {
-          result[key] = [...value];
-        } else if (typeof value === "object" && value !== null) {
-          if (path.some((p) => p === value)) continue;
-          if (!result[key]) result[key] = {};
-          mergeHelper(value, newPath);
-        } else {
-          result[key] = value;
-        }
+  function merge(...items) {
+    return _merge(items[0] === true, false, items);
+  }
+  function recursive(...items) {
+    return _merge(items[0] === true, true, items);
+  }
+  function clone(input) {
+    if (Array.isArray(input)) {
+      const output = [];
+      for (let index = 0; index < input.length; ++index)
+        output.push(clone(input[index]));
+      return output;
+    }
+    if (isPlainObject(input)) {
+      const output = {};
+      for (const index in input) output[index] = clone(input[index]);
+      return output;
+    }
+    return input;
+  }
+  function isPlainObject(input) {
+    if (input === null || typeof input !== "object") return false;
+    if (Object.getPrototypeOf(input) === null) return true;
+    let ref = input;
+    while (Object.getPrototypeOf(ref) !== null) ref = Object.getPrototypeOf(ref);
+    return Object.getPrototypeOf(input) === ref;
+  }
+  function _recursiveMerge(base, extend) {
+    if (!isPlainObject(base) || !isPlainObject(extend)) return extend;
+    for (const key in extend) {
+      if (key === "__proto__" || key === "constructor" || key === "prototype")
+        continue;
+      base[key] = isPlainObject(base[key]) && isPlainObject(extend[key]) ? _recursiveMerge(base[key], extend[key]) : extend[key];
+    }
+    return base;
+  }
+  function _merge(isClone, isRecursive, items) {
+    let result;
+    if (isClone || !isPlainObject(result = items.shift())) result = {};
+    for (let index = 0; index < items.length; ++index) {
+      const item = items[index];
+      if (!isPlainObject(item)) continue;
+      for (const key in item) {
+        if (key === "__proto__" || key === "constructor" || key === "prototype")
+          continue;
+        const value = isClone ? clone(item[key]) : item[key];
+        result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
       }
     }
-    objects.filter((obj) => !!obj).forEach((obj) => mergeHelper(obj));
     return result;
   }
   const SECRET = "NUT_FORM_INTERNAL";
@@ -9926,9 +9845,6 @@
         this.fieldEntities.push(field);
         return () => {
           this.fieldEntities = this.fieldEntities.filter((item) => item !== field);
-          if (this.store) {
-            delete this.store[field.props.name];
-          }
         };
       };
       this.getFieldValue = (name) => {
@@ -9950,10 +9866,11 @@
         if (init) {
           const nextStore = merge(initialValues, this.store);
           this.updateStore(nextStore);
+          this.notifyWatch();
         }
       };
       this.setFieldsValue = (newStore) => {
-        const nextStore = merge(this.store, newStore);
+        const nextStore = recursive(true, this.store, newStore);
         this.updateStore(nextStore);
         this.fieldEntities.forEach((entity) => {
           const { name } = entity.props;
@@ -9972,12 +9889,14 @@
             item.entity.onStoreChange("update");
           }
         });
+        this.notifyWatch();
       };
       this.setFieldValue = (name, value) => {
         const store = {
           [name]: value
         };
         this.setFieldsValue(store);
+        this.notifyWatch([name]);
       };
       this.setCallback = (callback) => {
         this.callbacks = {
@@ -10020,7 +9939,6 @@
       };
       this.validateFields = async (nameList) => {
         let filterEntities = [];
-        this.errors.length = 0;
         if (!nameList || nameList.length === 0) {
           filterEntities = this.fieldEntities;
         } else {
@@ -10045,13 +9963,29 @@
           (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, this.store, errors);
         }
       };
-      this.resetFields = () => {
-        this.errors.length = 0;
-        const nextStore = merge({}, this.initialValues);
-        this.updateStore(nextStore);
-        this.fieldEntities.forEach((entity) => {
-          entity.onStoreChange("reset");
-        });
+      this.resetFields = (namePaths) => {
+        if (namePaths && namePaths.length) {
+          namePaths.forEach((path) => {
+            this.errors[path] = null;
+            this.fieldEntities.forEach((entity) => {
+              const name = entity.props.name;
+              if (name === path) {
+                if (path in this.initialValues) {
+                  this.updateStore({ [path]: this.initialValues[path] });
+                } else {
+                  delete this.store[path];
+                }
+                entity.onStoreChange("reset");
+              }
+            });
+          });
+        } else {
+          const nextStore = merge({}, this.initialValues);
+          this.updateStore(nextStore);
+          this.fieldEntities.forEach((entity) => {
+            entity.onStoreChange("reset");
+          });
+        }
       };
       this.registerUpdate = (field, shouldUpdate) => {
         this.updateList.push({
@@ -10074,7 +10008,8 @@
             dispatch: this.dispatch,
             store: this.store,
             fieldEntities: this.fieldEntities,
-            registerUpdate: this.registerUpdate
+            registerUpdate: this.registerUpdate,
+            registerWatch: this.registerWatch
           };
         }
       };
@@ -10091,6 +10026,26 @@
           getInternal: this.getInternal
         };
       };
+      this.watchList = [];
+      this.registerWatch = (callback) => {
+        this.watchList.push(callback);
+        return () => {
+          this.watchList = this.watchList.filter((fn) => fn !== callback);
+        };
+      };
+      this.notifyWatch = (namePath = []) => {
+        if (this.watchList.length) {
+          let allValues;
+          if (!namePath || namePath.length === 0) {
+            allValues = this.getFieldsValue(true);
+          } else {
+            allValues = this.getFieldsValue(namePath);
+          }
+          this.watchList.forEach((callback) => {
+            callback(allValues, namePath);
+          });
+        }
+      };
       this.callbacks = {
         onFinish: () => {
         },
@@ -10114,6 +10069,24 @@
     }
     return [formRef.current];
   };
+  const useWatch = (path, form) => {
+    const formInstance = form.getInternal(SECRET);
+    const [value, setValue] = React.useState();
+    React.useEffect(() => {
+      const unsubscribe = formInstance.registerWatch(
+        (data, namePath) => {
+          const value2 = data[path];
+          setValue(value2);
+        }
+      );
+      const initialValue = form.getFieldsValue(true);
+      if (value !== initialValue[path]) {
+        setValue(initialValue[path]);
+      }
+      return () => unsubscribe();
+    }, [form]);
+    return value;
+  };
   const defaultProps$Y = {
     ...ComponentDefaults,
     labelPosition: "right",
@@ -10419,6 +10392,7 @@
   const InnerForm = Form;
   InnerForm.Item = FormItem;
   InnerForm.useForm = useForm;
+  InnerForm.useWatch = useWatch;
   function trimExtraChar(value, char, regExp) {
     const index = value.indexOf(char);
     if (index === -1) {
@@ -13969,7 +13943,7 @@
     const imageNode = typeof imageUrl === "string" ? /* @__PURE__ */ React.createElement("img", { className: "img", src: imageUrl, alt: "empty" }) : imageUrl;
     React.useEffect(() => {
       setImgStyle(() => {
-        if (!imageSize) {
+        if (typeof imageSize !== "number" && typeof imageSize !== "string") {
           return {};
         }
         if (typeof imageSize === "number") {
@@ -15701,29 +15675,29 @@
     onClick: (event) => {
     }
   };
-  const classPrefix$8 = `nut-animate`;
+  const classPrefix$8 = "nut-animate";
   const Animate = (props) => {
-    const { className, type: type2, action, loop, onClick, children, ...rest } = {
+    const { className, type: type2, action, loop, onClick, children, style } = {
       ...defaultProps$r,
       ...props
     };
     const [clicked, setClicked] = React.useState(false);
-    const classes = classNames({
-      "nut-ani-container": true,
-      [`${classPrefix$8}-${type2}`]: action === "initial" || clicked ? type2 : false,
-      loop
-    });
-    const cls = classNames(classes, className);
+    const classes = classNames(
+      {
+        "nut-ani-container": true,
+        [`${classPrefix$8}-${type2}`]: action === "initial" || clicked,
+        loop
+      },
+      className
+    );
     const handleClick = (event) => {
       setClicked(true);
       if (!loop) {
-        setTimeout(() => {
-          setClicked(false);
-        }, 1e3);
+        setTimeout(() => setClicked(false), 1e3);
       }
-      onClick && onClick(event);
+      onClick(event);
     };
-    return /* @__PURE__ */ React.createElement("div", { className: "nut-animate" }, /* @__PURE__ */ React.createElement("div", { className: cls, onClick: handleClick, ...rest }, children));
+    return /* @__PURE__ */ React.createElement(components.View, { className: "nut-animate" }, /* @__PURE__ */ React.createElement(components.View, { className: classes, onClick: handleClick, style }, children));
   };
   Animate.displayName = "NutAnimate";
   const defaultProps$q = {