@nutui/nutui-react 3.0.13 → 3.0.15

package/dist/nutui.react.umd.js

@@ -2904,26 +2904,21 @@ Check the top-level render call using <` + t + ">.");
       onClick: function(e2) {
         imageClick(e2);
       }
-    }, lazy ? /* @__PURE__ */ React.createElement("img", {
+    }, /* @__PURE__ */ React.createElement("img", _object_spread_props(_object_spread({
       ref: imgRef,
-      className: "".concat(classPrefix$s, "-default lazyload"),
-      style: imgStyle,
+      className: classNames("".concat(classPrefix$s, "-default"), lazy && "lazyload", _define_property({}, "".concat(classPrefix$s, "-error"), isError)),
+      style: imgStyle
+    }, lazy ? {
       "data-src": src,
-      alt,
-      loading: "lazy",
-      onLoad: handleLoad,
-      onError: handleError,
-      draggable
-    }) : /* @__PURE__ */ React.createElement("img", {
-      ref: imgRef,
-      className: "".concat(classPrefix$s, "-default"),
-      style: imgStyle,
-      src,
+      loading: "lazy"
+    } : {
+      src
+    }), {
       alt,
       onLoad: handleLoad,
       onError: handleError,
       draggable
-    }), renderLoading(), renderErrorImg());
+    })), renderLoading(), renderErrorImg());
   };
   Image$1.displayName = "NutImage";
   function _extends$4() {
@@ -10414,26 +10409,225 @@ Please add \`${key2}Action\` when creating your handler.`);
     }
   });
   const animated = host.animated;
+  var getTargetElement = function(target) {
+    var targetElement;
+    if (isFunction(target)) {
+      targetElement = target();
+    } else if ("current" in target) {
+      targetElement = target.current;
+    } else {
+      targetElement = target;
+    }
+    return targetElement;
+  };
+  function useClickAway(onClickAway, target) {
+    var eventName = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "click", useCapture = arguments.length > 3 ? arguments[3] : void 0, isListener = arguments.length > 4 ? arguments[4] : void 0, outerVar = arguments.length > 5 ? arguments[5] : void 0;
+    var handler = function(event) {
+      var targets = Array.isArray(target) ? target : [
+        target
+      ];
+      if (targets.some(function(item) {
+        var targetElement = getTargetElement(item);
+        return !targetElement || targetElement.contains(event.target);
+      })) {
+        return;
+      }
+      if (outerVar) {
+        onClickAway();
+      }
+    };
+    React.useEffect(function() {
+      if (isListener) {
+        window.addEventListener(eventName, handler, useCapture);
+      } else {
+        window.removeEventListener(eventName, handler, useCapture);
+      }
+      return function() {
+        window.removeEventListener(eventName, handler, useCapture);
+      };
+    }, [
+      target
+    ]);
+  }
+  function useForceUpdate() {
+    var _React_useState = _sliced_to_array(React.useState(), 2), updateState = _React_useState[1];
+    return React.useCallback(function() {
+      return updateState({});
+    }, []);
+  }
+  var useIsomorphicLayoutEffect = canUseDom ? React.useLayoutEffect : React.useEffect;
+  var defaultPaginationOptions = {
+    current: 0,
+    itemsPerPage: 10,
+    displayCount: 5,
+    ellipse: false
+  };
+  function human2Machine(number2) {
+    return --number2;
+  }
+  function calculateNodes(options2, nodesCount) {
+    var halfIndex = Math.floor(options2.displayCount / 2);
+    var buttonsCountIndex = human2Machine(nodesCount);
+    var displayCountIndex = human2Machine(options2.displayCount);
+    var currentIndex = human2Machine(options2.current);
+    var start2;
+    var end;
+    if (buttonsCountIndex <= displayCountIndex) {
+      start2 = 0;
+      end = buttonsCountIndex;
+    } else {
+      start2 = Math.max(0, currentIndex - halfIndex);
+      end = Math.min(buttonsCountIndex, currentIndex + halfIndex);
+      if (end - start2 < displayCountIndex) {
+        if (start2 === 0) {
+          end = Math.min(start2 + displayCountIndex, buttonsCountIndex);
+        } else if (end === buttonsCountIndex) {
+          start2 = Math.max(end - displayCountIndex, 1);
+        }
+      } else if (end - start2 > displayCountIndex) {
+        end = start2 + displayCountIndex;
+      }
+    }
+    var buttons = [];
+    for (var i2 = start2; i2 <= end; i2++) {
+      var humanPageNumber = i2 + 1;
+      buttons.push({
+        number: humanPageNumber,
+        text: humanPageNumber.toString(),
+        selected: options2.current === humanPageNumber
+      });
+    }
+    return addEllipses(buttons, {
+      nodesCount,
+      ellipse: options2.ellipse,
+      displayCount: options2.displayCount
+    });
+  }
+  function addEllipses(nodes, param) {
+    var displayCount = param.displayCount, nodesCount = param.nodesCount, ellipse = param.ellipse;
+    if (nodesCount <= displayCount || !ellipse) return nodes;
+    var start2 = nodes[0];
+    var end = nodes[nodes.length - 1];
+    var leftEllipse = start2.number > 1;
+    var rightEllipse = end.number < nodesCount;
+    if (leftEllipse) {
+      nodes.unshift({
+        number: start2.number - 1,
+        text: "..."
+      });
+    }
+    if (rightEllipse) {
+      nodes.push({
+        number: end.number + 1,
+        text: "..."
+      });
+    }
+    return nodes;
+  }
+  var usePagination = function(options2) {
+    var mergedOptions = _object_spread({}, defaultPaginationOptions, options2);
+    var total = mergedOptions.total, itemsPerPage = mergedOptions.itemsPerPage;
+    var nodesCount = Math.ceil((total || 0) / itemsPerPage) || 1;
+    return [
+      calculateNodes(mergedOptions, nodesCount),
+      nodesCount
+    ];
+  };
+  function usePropsValue(param) {
+    var value2 = param.value, defaultValue = param.defaultValue, finalValue = param.finalValue, _param_onChange = param.onChange, onChange = _param_onChange === void 0 ? function(value3) {
+    } : _param_onChange;
+    var forceUpdate = useForceUpdate();
+    var dfValue = defaultValue !== void 0 ? defaultValue : finalValue;
+    var stateRef = React.useRef(value2 !== void 0 ? value2 : dfValue);
+    if (value2 !== void 0) {
+      stateRef.current = value2;
+    }
+    var setState = React.useCallback(function(v) {
+      var forceTrigger = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
+      var prevState = stateRef.current;
+      stateRef.current = v;
+      if (prevState !== stateRef.current || forceTrigger) {
+        forceUpdate();
+        onChange === null || onChange === void 0 ? void 0 : onChange(v);
+      }
+    }, [
+      value2,
+      onChange
+    ]);
+    return [
+      stateRef.current,
+      setState
+    ];
+  }
+  var getRefValue = function(ref) {
+    return ref.current;
+  };
+  var useRefState = function(param) {
+    var ref = React.useRef(param);
+    var _useState = _sliced_to_array(React.useState(param), 2), setState = _useState[1];
+    var updateState = function(p2) {
+      ref.current = p2;
+      setState(p2);
+    };
+    return [
+      ref,
+      updateState
+    ];
+  };
+  function useRefs() {
+    var refs = React.useRef([]);
+    var setRefs = React.useCallback(function(index2) {
+      return function(el) {
+        if (el) refs.current[index2] = el;
+      };
+    }, []);
+    var reset = React.useCallback(function() {
+      refs.current = [];
+    }, []);
+    return [
+      refs.current,
+      setRefs,
+      reset
+    ];
+  }
+  var idCounter = {};
+  function uniqueId() {
+    var prefix2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$nut$";
+    if (!idCounter[prefix2]) {
+      idCounter[prefix2] = 0;
+    }
+    var id = ++idCounter[prefix2];
+    if (prefix2 === "$nut$") {
+      return "".concat(id);
+    }
+    return "".concat(prefix2).concat(id);
+  }
+  function useUuid() {
+    var idRef = React.useRef(uniqueId());
+    return idRef.current;
+  }
   var elevatorContext = /* @__PURE__ */ React.createContext({});
   var defaultProps$1n = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    mode: "horizontal",
     height: "200px",
     floorKey: "title",
     list: [],
     sticky: false,
-    spaceHeight: 23,
-    titleHeight: 35,
-    showKeys: true
+    spaceHeight: 18,
+    showKeys: true,
+    defaultValue: void 0,
+    value: void 0
   });
   var Elevator = function(props) {
-    var _ref = _object_spread({}, defaultProps$1n, props), height2 = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight;
-    _ref.titleHeight;
-    var showKeys = _ref.showKeys, className = _ref.className, style = _ref.style, onItemClick = _ref.onItemClick, onIndexClick = _ref.onIndexClick, children = _ref.children, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$1n, props), value2 = _ref.value, defaultValue = _ref.defaultValue, mode = _ref.mode, height2 = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight, showKeys = _ref.showKeys, className = _ref.className, style = _ref.style, onItemClick = _ref.onItemClick, onIndexClick = _ref.onIndexClick, children = _ref.children, rest = _object_without_properties(_ref, [
+      "value",
+      "defaultValue",
+      "mode",
       "height",
       "floorKey",
       "list",
       "sticky",
       "spaceHeight",
-      "titleHeight",
       "showKeys",
       "className",
       "style",
@@ -10454,18 +10648,23 @@ Please add \`${key2}Action\` when creating your handler.`);
       y2: 0
     });
     var _useState = _sliced_to_array(React.useState(0), 2), scrollY = _useState[0], setScrollY = _useState[1];
-    var _useState1 = _sliced_to_array(React.useState({}), 2), currentData = _useState1[0], setCurrentData = _useState1[1];
-    var _useState2 = _sliced_to_array(React.useState(""), 2), currentKey = _useState2[0], setCurrentKey = _useState2[1];
-    var _useState3 = _sliced_to_array(React.useState(0), 2), currentIndex = _useState3[0], setCurrentIndex = _useState3[1];
-    var _useState4 = _sliced_to_array(React.useState(0), 2), codeIndex = _useState4[0], setCodeIndex = _useState4[1];
-    var _useState5 = _sliced_to_array(React.useState(false), 2), scrollStart = _useState5[0], setScrollStart = _useState5[1];
+    var _usePropsValue = _sliced_to_array(usePropsValue({
+      value: value2,
+      defaultValue: defaultValue || {}
+    }), 2), currentData = _usePropsValue[0], setCurrentData = _usePropsValue[1];
+    var _useState1 = _sliced_to_array(React.useState(0), 2), currentIndex = _useState1[0], setCurrentIndex = _useState1[1];
+    var _useState2 = _sliced_to_array(React.useState(0), 2), codeIndex = _useState2[0], setCodeIndex = _useState2[1];
+    var _useState3 = _sliced_to_array(React.useState(false), 2), scrollStart = _useState3[0], setScrollStart = _useState3[1];
     var state = React.useRef(initData);
     var resetScrollState = function() {
       setScrollStart(false);
     };
     var getData = function(el, name2) {
       var prefix2 = "data-";
-      return el.getAttribute(prefix2 + name2);
+      if (el.hasAttribute("data-index")) {
+        return el.getAttribute(prefix2 + name2);
+      }
+      return "-1";
     };
     var calculateHeight = function() {
       var height3 = 0;
@@ -10500,6 +10699,10 @@ Please add \`${key2}Action\` when creating your handler.`);
         var target = param.target, offset = param.offset;
         setScrollStart(true);
         var index2 = Number(getData(target, "index"));
+        if (index2 < 0) {
+          setScrollStart(false);
+          return;
+        }
         touchState.current.y1 = offset[1];
         state.current.anchorIndex = +index2;
         setCodeIndex(function(codeIndex2) {
@@ -10520,7 +10723,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     var handleClickItem = function(key2, item) {
       onItemClick && onItemClick(key2, item);
       setCurrentData(item);
-      setCurrentKey(key2);
     };
     var handleClickIndex = function(key2) {
       onIndexClick && onIndexClick(key2);
@@ -10565,13 +10767,13 @@ Please add \`${key2}Action\` when creating your handler.`);
     ]);
     var _obj;
     return /* @__PURE__ */ React.createElement("div", _object_spread({
-      className: "".concat(classPrefix2, " ").concat(className),
+      className: "".concat(classPrefix2, " ").concat(classPrefix2, "-").concat(mode, " ").concat(className),
       style
-    }, rest), sticky && scrollY > 0 ? /* @__PURE__ */ React.createElement("div", {
+    }, rest), mode === "vertical" && sticky && scrollY > 0 ? /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-list-fixed")
     }, /* @__PURE__ */ React.createElement("span", {
       className: "".concat(classPrefix2, "-list-fixed-title")
-    }, list[currentIndex][floorKey])) : null, /* @__PURE__ */ React.createElement("div", {
+    }, list[currentIndex] && String(list[currentIndex][floorKey]))) : null, /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-list"),
       style: {
         height: Number.isNaN(+height2) ? height2 : "".concat(height2, "px")
@@ -10585,10 +10787,12 @@ Please add \`${key2}Action\` when creating your handler.`);
         key: idx
       }, /* @__PURE__ */ React.createElement("div", {
         className: "".concat(classPrefix2, "-list-item-code")
-      }, item[floorKey]), /* @__PURE__ */ React.createElement(React.Fragment, null, item.list.map(function(subitem) {
+      }, item[floorKey]), /* @__PURE__ */ React.createElement("div", {
+        className: "".concat(classPrefix2, "-list-item-sublist")
+      }, item.list.map(function(subitem) {
         var _obj2;
         return /* @__PURE__ */ React.createElement("div", {
-          className: classNames((_obj2 = {}, _define_property(_obj2, "".concat(classPrefix2, "-list-item-name"), true), _define_property(_obj2, "".concat(classPrefix2, "-list-item-name-highcolor"), currentData.id === subitem.id && currentKey === item[floorKey]), _obj2)),
+          className: classNames((_obj2 = {}, _define_property(_obj2, "".concat(classPrefix2, "-list-item-name"), true), _define_property(_obj2, "".concat(classPrefix2, "-list-item-name-highcolor"), currentData.id === subitem.id), _obj2)),
           key: subitem.id,
           onClick: function() {
             return handleClickItem(item[floorKey], subitem);
@@ -10599,7 +10803,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       })));
     }))), showKeys ? /* @__PURE__ */ React.createElement(React.Fragment, null, list.length && scrollStart ? /* @__PURE__ */ React.createElement("div", {
       className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-code-current"), true), _define_property(_obj, "".concat(classPrefix2, "-code-current-current"), true), _obj))
-    }, list[codeIndex][floorKey]) : null, /* @__PURE__ */ React.createElement("div", {
+    }, list[codeIndex] && String(list[codeIndex][floorKey])) : null, /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-bars")
     }, /* @__PURE__ */ React.createElement(animated.div, _object_spread_props(_object_spread({
       className: "".concat(classPrefix2, "-bars-inner")
@@ -10617,7 +10821,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         onClick: function() {
           return handleClickIndex(item[floorKey]);
         }
-      }, item[floorKey]);
+      }, String(item[floorKey]));
     })))) : null);
   };
   Elevator.displayName = "NutElevator";
@@ -10833,38 +11037,6 @@ Please add \`${key2}Action\` when creating your handler.`);
       className: classes
     }, !disabled && children) : null;
   };
-  function useForceUpdate() {
-    var _React_useState = _sliced_to_array(React.useState(), 2), updateState = _React_useState[1];
-    return React.useCallback(function() {
-      return updateState({});
-    }, []);
-  }
-  function usePropsValue(param) {
-    var value2 = param.value, defaultValue = param.defaultValue, finalValue = param.finalValue, _param_onChange = param.onChange, onChange = _param_onChange === void 0 ? function(value3) {
-    } : _param_onChange;
-    var forceUpdate = useForceUpdate();
-    var dfValue = defaultValue !== void 0 ? defaultValue : finalValue;
-    var stateRef = React.useRef(value2 !== void 0 ? value2 : dfValue);
-    if (value2 !== void 0) {
-      stateRef.current = value2;
-    }
-    var setState = React.useCallback(function(v) {
-      var forceTrigger = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-      var prevState = stateRef.current;
-      stateRef.current = v;
-      if (prevState !== stateRef.current || forceTrigger) {
-        forceUpdate();
-        onChange === null || onChange === void 0 ? void 0 : onChange(v);
-      }
-    }, [
-      value2,
-      onChange
-    ]);
-    return [
-      stateRef.current,
-      setState
-    ];
-  }
   var defaultProps$1i = _object_spread_props(_object_spread({}, ComponentDefaults), {
     contentDuration: 0,
     sidebarDuration: 0
@@ -11550,21 +11722,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     }
     return map[topId];
   };
-  var getRefValue = function(ref) {
-    return ref.current;
-  };
-  var useRefState = function(param) {
-    var ref = React.useRef(param);
-    var _useState = _sliced_to_array(React.useState(param), 2), setState = _useState[1];
-    var updateState = function(p2) {
-      ref.current = p2;
-      setState(p2);
-    };
-    return [
-      ref,
-      updateState
-    ];
-  };
   var defaultProps$1c = _object_spread_props(_object_spread({}, ComponentDefaults), {
     activeColor: "",
     activeIcon: "checklist",
@@ -13353,7 +13510,8 @@ Please add \`${key2}Action\` when creating your handler.`);
   var prefixCls = "nut-calendarcard";
   var CalendarCard = /* @__PURE__ */ React.forwardRef(function(props, ref) {
     var locale = useConfig().locale;
-    var _$_object_spread = _object_spread({}, defaultProps$15, props), style = _$_object_spread.style, className = _$_object_spread.className, type2 = _$_object_spread.type, value2 = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
+    var _$_object_spread = _object_spread({}, defaultProps$15, props), style = _$_object_spread.style, className = _$_object_spread.className, type2 = _$_object_spread.type, title = _$_object_spread.title, value2 = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, firstDayOfWeek = _$_object_spread.firstDayOfWeek, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, disableDay = _$_object_spread.disableDay, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange, onChange = _$_object_spread.onChange;
+    var onPageChangeRef = React.useRef(onPageChange);
     var _useState = _sliced_to_array(React.useState(function() {
       var date2 = new Date(Date.now());
       var val2 = value2 || defaultValue;
@@ -13425,13 +13583,18 @@ Please add \`${key2}Action\` when creating your handler.`);
       firstDayOfWeek
     ]);
     React.useEffect(function() {
+      onPageChangeRef.current = onPageChange;
+    }, [
+      onPageChange
+    ]);
+    React.useEffect(function() {
+      var _onPageChangeRef_current;
       var newDays = getDays(month);
       setDays(newDays);
-      onPageChange === null || onPageChange === void 0 ? void 0 : onPageChange(month);
+      (_onPageChangeRef_current = onPageChangeRef.current) === null || _onPageChangeRef_current === void 0 ? void 0 : _onPageChangeRef_current.call(onPageChangeRef, month);
     }, [
       month,
       getDays,
-      onPageChange,
       firstDayOfWeek
     ]);
     var isSameDay = function(day1, day2) {
@@ -13727,7 +13890,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     return days.length > 0 ? /* @__PURE__ */ React.createElement("div", {
       className: classNames(prefixCls, className),
       style
-    }, renderHeader(), renderContent()) : null;
+    }, title || renderHeader(), renderContent()) : null;
   });
   CalendarCard.displayName = "NutCalendarCard";
   var CheckboxGroupContext = React.createContext(null);
@@ -14364,22 +14527,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     })) : null);
   };
   var PickerView = /* @__PURE__ */ React.forwardRef(InternalPickerView);
-  function useRefs() {
-    var refs = React.useRef([]);
-    var setRefs = React.useCallback(function(index2) {
-      return function(el) {
-        if (el) refs.current[index2] = el;
-      };
-    }, []);
-    var reset = React.useCallback(function() {
-      refs.current = [];
-    }, []);
-    return [
-      refs.current,
-      setRefs,
-      reset
-    ];
-  }
   var defaultProps$11 = _object_spread_props(_object_spread({}, ComponentDefaults), {
     title: "",
     options: [],
@@ -14570,7 +14717,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     return _obj = {}, _define_property(_obj, "".concat(type2, "Year"), year), _define_property(_obj, "".concat(type2, "Month"), month), _define_property(_obj, "".concat(type2, "Date"), date2), _define_property(_obj, "".concat(type2, "Hour"), hour), _define_property(_obj, "".concat(type2, "Minute"), minute), _define_property(_obj, "".concat(type2, "Seconds"), minute), _obj;
   };
   var generateDatePickerRanges = function(type2, selectedDate, startDate, endDate) {
-    var selected = new Date(selectedDate);
+    var selected = selectedDate ? new Date(selectedDate) : new Date(startDate);
     if (!selected) return [];
     var _calculateDateBoundary = calculateDateBoundary("max", selected, startDate, endDate), maxYear = _calculateDateBoundary.maxYear, maxDate = _calculateDateBoundary.maxDate, maxMonth = _calculateDateBoundary.maxMonth, maxHour = _calculateDateBoundary.maxHour, maxMinute = _calculateDateBoundary.maxMinute, maxSeconds = _calculateDateBoundary.maxSeconds;
     var _calculateDateBoundary1 = calculateDateBoundary("min", selected, startDate, endDate), minYear = _calculateDateBoundary1.minYear, minDate = _calculateDateBoundary1.minDate, minMonth = _calculateDateBoundary1.minMonth, minHour = _calculateDateBoundary1.minHour, minMinute = _calculateDateBoundary1.minMinute, minSeconds = _calculateDateBoundary1.minSeconds;
@@ -14697,44 +14844,30 @@ Please add \`${key2}Action\` when creating your handler.`);
   };
   var handlePickerValueChange = function(selectedOptions, selectedValue, index2, type2, defaultDate, handleDateComparison) {
     var rangeType = type2.toLocaleLowerCase();
-    if ([
-      "date",
-      "datetime",
-      "datehour",
-      "month-day",
-      "year-month"
-    ].includes(rangeType)) {
-      var formattedDate = [];
-      selectedValue.forEach(function(item) {
-        formattedDate.push(item);
-      });
-      if (rangeType === "month-day" && formattedDate.length < 3) {
-        formattedDate.unshift(new Date(defaultDate).getFullYear());
-      }
-      if (rangeType === "year-month" && formattedDate.length < 3) {
-        formattedDate.push(new Date(defaultDate).getDate());
-      }
-      var year = Number(formattedDate[0]);
-      var month = Number(formattedDate[1]) - 1;
-      var day = Math.min(Number(formattedDate[2]), getLastDayOfMonth(year, month + 1));
-      var date2 = null;
-      if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
-        date2 = new Date(year, month, day);
-      } else if (rangeType === "datetime") {
-        date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
-      } else if (rangeType === "datehour") {
-        date2 = new Date(year, month, day, Number(formattedDate[3]));
-      }
-      handleDateComparison(date2, selectedOptions, index2);
+    var formattedDate = [];
+    selectedValue.forEach(function(item) {
+      formattedDate.push(item);
+    });
+    if (rangeType === "month-day" && formattedDate.length < 3) {
+      formattedDate.unshift(new Date(defaultDate).getFullYear());
+    }
+    if (rangeType === "year-month" && formattedDate.length < 3) {
+      formattedDate.push(new Date(defaultDate).getDate());
+    }
+    var year = Number(formattedDate[0]);
+    var month = Number(formattedDate[1]) - 1;
+    var day = Math.min(Number(formattedDate[2]), getLastDayOfMonth(year, month + 1));
+    var date2 = null;
+    if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
+      date2 = new Date(year, month, day);
+    } else if (rangeType === "datetime") {
+      date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
+    } else if (rangeType === "datehour") {
+      date2 = new Date(year, month, day, Number(formattedDate[3]));
     } else {
-      var _selectedValue = _sliced_to_array(selectedValue, 3), hour = _selectedValue[0], minute = _selectedValue[1], seconds = _selectedValue[2];
-      var currentDate = new Date(defaultDate);
-      var year1 = currentDate.getFullYear();
-      var month1 = currentDate.getMonth();
-      var day1 = currentDate.getDate();
-      var date1 = new Date(year1, month1, day1, Number(hour), Number(minute), rangeType === "time" ? Number(seconds) : 0);
-      handleDateComparison(date1, selectedOptions, index2);
+      date2 = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]), Number(formattedDate[5]));
     }
+    handleDateComparison(date2, selectedOptions, index2);
   };
   var currentYear$1 = (/* @__PURE__ */ new Date()).getFullYear();
   var defaultProps$10 = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -16620,12 +16753,12 @@ Please add \`${key2}Action\` when creating your handler.`);
         });
         var item = name2 ? _this.context.formInstance.errors[name2] : [];
         var starPosition = _this.context.formInstance.starPosition;
-        var renderStar = (required2 || requiredInRules) && /* @__PURE__ */ React.createElement("div", {
-          className: "nut-form-item-label-required required"
+        var renderStar = (required2 || requiredInRules) && /* @__PURE__ */ React.createElement("span", {
+          className: "nut-form-item-label-".concat(starPosition, "-required required")
         }, "*");
         var renderLabel = /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("span", {
           className: "nut-form-item-labeltxt"
-        }, starPosition === "left" ? renderStar : null, label), starPosition === "right" ? renderStar : null);
+        }, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null));
         return /* @__PURE__ */ React.createElement(Cell, {
           className: "".concat(_this.getClassNameWithDirection("nut-form-item"), " ").concat(className),
           style,
@@ -17151,46 +17284,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     })));
   };
   InputNumber.displayName = "NutInputNumber";
-  var getTargetElement = function(target) {
-    var targetElement;
-    if (isFunction(target)) {
-      targetElement = target();
-    } else if ("current" in target) {
-      targetElement = target.current;
-    } else {
-      targetElement = target;
-    }
-    return targetElement;
-  };
-  function useClickAway(onClickAway, target) {
-    var eventName = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "click", useCapture = arguments.length > 3 ? arguments[3] : void 0, isListener = arguments.length > 4 ? arguments[4] : void 0, outerVar = arguments.length > 5 ? arguments[5] : void 0;
-    var handler = function(event) {
-      var targets = Array.isArray(target) ? target : [
-        target
-      ];
-      if (targets.some(function(item) {
-        var targetElement = getTargetElement(item);
-        return !targetElement || targetElement.contains(event.target);
-      })) {
-        return;
-      }
-      if (outerVar) {
-        onClickAway();
-      }
-    };
-    React.useEffect(function() {
-      if (isListener) {
-        window.addEventListener(eventName, handler, useCapture);
-      } else {
-        window.removeEventListener(eventName, handler, useCapture);
-      }
-      return function() {
-        window.removeEventListener(eventName, handler, useCapture);
-      };
-    }, [
-      target
-    ]);
-  }
   var defaultProps$W = _object_spread_props(_object_spread({}, ComponentDefaults), {
     titleIcon: null,
     columns: 1,
@@ -20142,8 +20235,6 @@ Please add \`${key2}Action\` when creating your handler.`);
       var handleCancel = function(e2) {
         e2.stopPropagation();
         if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
-        if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-        onClose();
         onCancel();
       };
       var handleOk = /* @__PURE__ */ function() {
@@ -20231,24 +20322,21 @@ Please add \`${key2}Action\` when creating your handler.`);
     };
     var renderCloseIcon = function() {
       if (!closeIcon) return null;
-      var handleCancel = function() {
-        if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
+      var handleClose = function() {
         if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
         onClose();
-        onCancel();
       };
       var _obj;
       var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-close"), true), _define_property(_obj, "".concat(classPrefix2, "-close-").concat(closeIconPosition), true), _obj));
       var systomIcon = closeIconPosition !== "bottom" ? /* @__PURE__ */ React.createElement(n$6, null) : /* @__PURE__ */ React.createElement(n$4, null);
       return /* @__PURE__ */ React.createElement("div", {
         className: closeClasses,
-        onClick: handleCancel
+        onClick: handleClose
       }, /* @__PURE__ */ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e2) {
       if (closeOnOverlayClick && visible && e2.target === e2.currentTarget) {
         var closed = onOverlayClick && onOverlayClick(e2);
-        closed && onClose();
         closed && onCancel();
       }
     };
@@ -21029,7 +21117,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       var val2 = rect.height - height2;
       _offset = moveOffset + Number(active2 === childCount - 1 && val2 / 2);
       target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
-      target.style.height = "".concat(Number(height2) * childCount, "px");
+      target.style.height = "".concat(Number(height2) * (childCount + 1), "px");
       target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
     };
     var itemStyle = function(index2) {
@@ -23509,7 +23597,6 @@ Please add \`${key2}Action\` when creating your handler.`);
   };
   var CountDown = /* @__PURE__ */ React.forwardRef(InternalCountDown);
   CountDown.displayName = "NutCountDown";
-  var useIsomorphicLayoutEffect = canUseDom ? React.useLayoutEffect : React.useEffect;
   var defaultProps$l = _object_spread_props(_object_spread({}, ComponentDefaults), {
     content: "",
     direction: "end",
@@ -41188,83 +41275,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     }));
   });
   Lottie.displayName = "NutLottie";
-  var defaultPaginationOptions = {
-    current: 0,
-    itemsPerPage: 10,
-    displayCount: 5,
-    ellipse: false
-  };
-  function human2Machine(number2) {
-    return --number2;
-  }
-  function calculateNodes(options2, nodesCount) {
-    var halfIndex = Math.floor(options2.displayCount / 2);
-    var buttonsCountIndex = human2Machine(nodesCount);
-    var displayCountIndex = human2Machine(options2.displayCount);
-    var currentIndex = human2Machine(options2.current);
-    var start2;
-    var end;
-    if (buttonsCountIndex <= displayCountIndex) {
-      start2 = 0;
-      end = buttonsCountIndex;
-    } else {
-      start2 = Math.max(0, currentIndex - halfIndex);
-      end = Math.min(buttonsCountIndex, currentIndex + halfIndex);
-      if (end - start2 < displayCountIndex) {
-        if (start2 === 0) {
-          end = Math.min(start2 + displayCountIndex, buttonsCountIndex);
-        } else if (end === buttonsCountIndex) {
-          start2 = Math.max(end - displayCountIndex, 1);
-        }
-      } else if (end - start2 > displayCountIndex) {
-        end = start2 + displayCountIndex;
-      }
-    }
-    var buttons = [];
-    for (var i2 = start2; i2 <= end; i2++) {
-      var humanPageNumber = i2 + 1;
-      buttons.push({
-        number: humanPageNumber,
-        text: humanPageNumber.toString(),
-        selected: options2.current === humanPageNumber
-      });
-    }
-    return addEllipses(buttons, {
-      nodesCount,
-      ellipse: options2.ellipse,
-      displayCount: options2.displayCount
-    });
-  }
-  function addEllipses(nodes, param) {
-    var displayCount = param.displayCount, nodesCount = param.nodesCount, ellipse = param.ellipse;
-    if (nodesCount <= displayCount || !ellipse) return nodes;
-    var start2 = nodes[0];
-    var end = nodes[nodes.length - 1];
-    var leftEllipse = start2.number > 1;
-    var rightEllipse = end.number < nodesCount;
-    if (leftEllipse) {
-      nodes.unshift({
-        number: start2.number - 1,
-        text: "..."
-      });
-    }
-    if (rightEllipse) {
-      nodes.push({
-        number: end.number + 1,
-        text: "..."
-      });
-    }
-    return nodes;
-  }
-  var usePagination = function(options2) {
-    var mergedOptions = _object_spread({}, defaultPaginationOptions, options2);
-    var total = mergedOptions.total, itemsPerPage = mergedOptions.itemsPerPage;
-    var nodesCount = Math.ceil((total || 0) / itemsPerPage) || 1;
-    return [
-      calculateNodes(mergedOptions, nodesCount),
-      nodesCount
-    ];
-  };
   var defaultProps$f = _object_spread_props(_object_spread({}, ComponentDefaults), {
     defaultValue: 1,
     mode: "multi",
@@ -43361,22 +43371,6 @@ Please add \`${key2}Action\` when creating your handler.`);
     });
   };
   WaterMark.displayName = "NutWaterMark";
-  var idCounter = {};
-  function uniqueId() {
-    var prefix2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$nut$";
-    if (!idCounter[prefix2]) {
-      idCounter[prefix2] = 0;
-    }
-    var id = ++idCounter[prefix2];
-    if (prefix2 === "$nut$") {
-      return "".concat(id);
-    }
-    return "".concat(prefix2).concat(id);
-  }
-  function useUuid() {
-    var idRef = React.useRef(uniqueId());
-    return idRef.current;
-  }
   exports.ActionSheet = ActionSheet;
   exports.Address = Address;
   exports.Animate = Animate;