@nutui/nutui-react 3.0.14 → 3.0.15

package/dist/es/packages/datepicker/utils.js

@@ -1,5 +1,4 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { padZero } from "../../utils/pad-zero";
 import { isDate } from "../../utils/is-date";
 /**
@@ -207,42 +206,28 @@ import { isDate } from "../../utils/is-date";
  * @param index 当前列的索引
  */ export var handlePickerValueChange = function(selectedOptions, selectedValue, index, type, defaultDate, handleDateComparison) {
     var rangeType = type.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 date = null;
-        if (rangeType === 'date' || rangeType === 'month-day' || rangeType === 'year-month') {
-            date = new Date(year, month, day);
-        } else if (rangeType === 'datetime') {
-            date = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
-        } else if (rangeType === 'datehour') {
-            date = new Date(year, month, day, Number(formattedDate[3]));
-        }
-        handleDateComparison(date, selectedOptions, index);
+    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 date = null;
+    if (rangeType === 'date' || rangeType === 'month-day' || rangeType === 'year-month') {
+        date = new Date(year, month, day);
+    } else if (rangeType === 'datetime') {
+        date = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]));
+    } else if (rangeType === 'datehour') {
+        date = 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, index);
+        date = new Date(year, month, day, Number(formattedDate[3]), Number(formattedDate[4]), Number(formattedDate[5]));
     }
+    handleDateComparison(date, selectedOptions, index);
 };

package/dist/es/packages/dialog/dialog.js

@@ -56,8 +56,6 @@ var BaseDialog = function(props, ref) {
         var handleCancel = function(e) {
             e.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() {
@@ -146,24 +144,21 @@ var BaseDialog = function(props, ref) {
     };
     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(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
         var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement("div", {
             className: closeClasses,
-            onClick: handleCancel
+            onClick: handleClose
         }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
-            closed && onClose();
             closed && onCancel();
         }
     };

package/dist/es/packages/formitem/formitem.js

@@ -123,12 +123,12 @@ export var FormItem = /*#__PURE__*/ function(_superClass) {
             });
             var item = name ? _this.context.formInstance.errors[name] : [];
             var starPosition = _this.context.formInstance.starPosition;
-            var renderStar = (required || requiredInRules) && /*#__PURE__*/ React.createElement("div", {
-                className: "nut-form-item-label-required required"
+            var renderStar = (required || 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: style,

package/dist/es/packages/formitem/style/formitem.scss

@@ -18,19 +18,25 @@
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
     line-height: unset;
-  }
 
-  &-label-required {
-    color: $form-item-required-color;
-    margin-right: $form-item-required-margin-right;
-    display: block;
-    position: absolute;
-    left: -10px;
+    &-left-required {
+      color: $form-item-required-color;
+      margin-right: $form-item-required-margin-right;
+      position: absolute;
+      left: -10px;
+    }
+
+    &-right-required {
+      color: $form-item-required-color;
+      margin-left: $form-item-required-margin-right;
+      position: absolute;
+      right: -10px;
+    }
   }
 
   .nut-form-item-labeltxt {
     position: relative;
-    font-size: 12px;
+    font-size: $form-item-label-font-size;
   }
 
   &-body {
@@ -136,13 +142,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/es/packages/formitem/style/style.css

@@ -13,7 +13,7 @@
 .nut-form-item-label {
   display: flex;
   flex-direction: row;
-  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, 12px));
   font-weight: normal;
   width: var(--nutui-form-item-label-width, 90px);
   margin-right: var(--nutui-form-item-label-margin-right, 10px);
@@ -22,16 +22,21 @@
   text-align: var(--nutui-form-item-label-text-align, left);
   line-height: unset;
 }
-.nut-form-item-label-required {
+.nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
-  display: block;
   position: absolute;
   left: -10px;
 }
+.nut-form-item-label-right-required {
+  color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
+  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  position: absolute;
+  right: -10px;
+}
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: 12px;
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-s, 12px));
 }
 .nut-form-item-body {
   flex: 1;
@@ -121,13 +126,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/es/packages/formitem/style-jmapp/formitem.scss

@@ -18,19 +18,25 @@
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
     line-height: unset;
-  }
 
-  &-label-required {
-    color: $form-item-required-color;
-    margin-right: $form-item-required-margin-right;
-    display: block;
-    position: absolute;
-    left: -10px;
+    &-left-required {
+      color: $form-item-required-color;
+      margin-right: $form-item-required-margin-right;
+      position: absolute;
+      left: -10px;
+    }
+
+    &-right-required {
+      color: $form-item-required-color;
+      margin-left: $form-item-required-margin-right;
+      position: absolute;
+      right: -10px;
+    }
   }
 
   .nut-form-item-labeltxt {
     position: relative;
-    font-size: 12px;
+    font-size: $form-item-label-font-size;
   }
 
   &-body {
@@ -136,13 +142,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/es/packages/formitem/style-jmapp/style.css

@@ -22,16 +22,21 @@
   text-align: var(--nutui-form-item-label-text-align, left);
   line-height: unset;
 }
-.nut-form-item-label-required {
+.nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
-  display: block;
   position: absolute;
   left: -10px;
 }
+.nut-form-item-label-right-required {
+  color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
+  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  position: absolute;
+  right: -10px;
+}
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: 12px;
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
 }
 .nut-form-item-body {
   flex: 1;
@@ -121,13 +126,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/es/packages/formitem/style-jrkf/formitem.scss

@@ -18,19 +18,25 @@
     word-wrap: break-word;
     text-align: $form-item-label-text-align;
     line-height: unset;
-  }
 
-  &-label-required {
-    color: $form-item-required-color;
-    margin-right: $form-item-required-margin-right;
-    display: block;
-    position: absolute;
-    left: -10px;
+    &-left-required {
+      color: $form-item-required-color;
+      margin-right: $form-item-required-margin-right;
+      position: absolute;
+      left: -10px;
+    }
+
+    &-right-required {
+      color: $form-item-required-color;
+      margin-left: $form-item-required-margin-right;
+      position: absolute;
+      right: -10px;
+    }
   }
 
   .nut-form-item-labeltxt {
     position: relative;
-    font-size: 12px;
+    font-size: $form-item-label-font-size;
   }
 
   &-body {
@@ -136,13 +142,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

package/dist/es/packages/formitem/style-jrkf/style.css

@@ -22,16 +22,21 @@
   text-align: var(--nutui-form-item-label-text-align, left);
   line-height: unset;
 }
-.nut-form-item-label-required {
+.nut-form-item-label-left-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
-  display: block;
   position: absolute;
   left: -10px;
 }
+.nut-form-item-label-right-required {
+  color: var(--nutui-form-item-required-color, var(--nutui-color-danger));
+  margin-left: var(--nutui-form-item-required-margin-right, 4px);
+  position: absolute;
+  right: -10px;
+}
 .nut-form-item .nut-form-item-labeltxt {
   position: relative;
-  font-size: 12px;
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-text));
 }
 .nut-form-item-body {
   flex: 1;
@@ -121,13 +126,6 @@
   white-space: nowrap;
 }
 
-.nut-form-item-label-left-required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
 .nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;

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

@@ -293,7 +293,7 @@ export var NoticeBar = function(props) {
         var val = rect.height - height;
         _offset = moveOffset + Number(active === childCount - 1 && val / 2);
         target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
-        target.style.height = "".concat(Number(height) * childCount, "px");
+        target.style.height = "".concat(Number(height) * (childCount + 1), "px");
         target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
     };
     // 无缝滚动第一个元素位移控制

package/dist/es/packages/overlay/style/overlay.scss

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style/style.css

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jmapp/overlay.scss

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jmapp/style.css

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jrkf/overlay.scss

@@ -7,7 +7,6 @@
   width: 100%;
   height: 100%;
   background-color: $overlay-bg-color;
-  z-index: $overlay-zIndex;
 }
 
 .nut-overflow-hidden {

package/dist/es/packages/overlay/style-jrkf/style.css

@@ -11,7 +11,6 @@
   width: 100%;
   height: 100%;
   background-color: var(--nutui-overlay-bg-color, var(--nutui-color-surface-overlay));
-  z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
 .nut-overflow-hidden {

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

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

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

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

package/dist/nutui.react.umd.js

@@ -13510,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;
@@ -13582,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) {
@@ -13884,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);
@@ -14838,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), {
@@ -16761,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,
@@ -20243,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() {
@@ -20332,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();
       }
     };
@@ -21130,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) {