@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

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

@@ -0,0 +1,248 @@
+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";
+/**
+ * 获取指定年份和月份的最后一天
+ * @param year - 年份
+ * @param month - 月份（1 到 12）
+ * @returns 返回该月份的最后一天
+ */ export function getLastDayOfMonth(year, month) {
+    return new Date(year, month, 0).getDate();
+}
+/**
+ * 根据类型和日期值，计算并返回日期边界值（年、月、日、时、分、秒）
+ * @param type 边界类型：'min' 表示最小值，'max' 表示最大值
+ * @param value 传入的日期值
+ * @param startDate 传入的开始时间
+ * @param endDate 传入的结束时间
+ * @returns 返回包含边界值的对象
+ */ export var calculateDateBoundary = function(type, value, startDate, endDate) {
+    var boundary = type === 'min' ? startDate : endDate;
+    var year = boundary.getFullYear();
+    var isMax = type === 'max';
+    var month = isMax ? 12 : 1;
+    var date = isMax ? getLastDayOfMonth(value.getFullYear(), value.getMonth() + 1) : 1;
+    var hour = isMax ? 23 : 0;
+    var minute = isMax ? 59 : 0;
+    if (value.getFullYear() === year) {
+        month = boundary.getMonth() + 1;
+        if (value.getMonth() + 1 === month) {
+            date = boundary.getDate();
+            if (value.getDate() === date) {
+                hour = boundary.getHours();
+                if (value.getHours() === hour) {
+                    minute = boundary.getMinutes();
+                }
+            }
+        }
+    }
+    var _obj;
+    // 返回边界值的对象
+    return _obj = {}, _define_property(_obj, "".concat(type, "Year"), year), _define_property(_obj, "".concat(type, "Month"), month), _define_property(_obj, "".concat(type, "Date"), date), _define_property(_obj, "".concat(type, "Hour"), hour), _define_property(_obj, "".concat(type, "Minute"), minute), _define_property(_obj, "".concat(type, "Seconds"), minute), _obj;
+};
+/**
+ * 根据选中的日期和类型，生成日期选择器的范围配置
+ * @returns {Array} 返回日期选择器的范围配置数组
+ */ export var generateDatePickerRanges = function(type, selectedDate, startDate, endDate) {
+    var selected = new Date(selectedDate);
+    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;
+    var fullRanges = [
+        {
+            type: 'year',
+            range: [
+                minYear,
+                maxYear
+            ]
+        },
+        {
+            type: 'month',
+            range: [
+                minMonth,
+                maxMonth
+            ]
+        },
+        {
+            type: 'day',
+            range: [
+                minDate,
+                maxDate
+            ]
+        },
+        {
+            type: 'hour',
+            range: [
+                minHour,
+                maxHour
+            ]
+        },
+        {
+            type: 'minute',
+            range: [
+                minMinute,
+                maxMinute
+            ]
+        },
+        {
+            type: 'seconds',
+            range: [
+                minSeconds,
+                maxSeconds
+            ]
+        }
+    ];
+    // 根据类型返回对应的范围配置
+    switch(type.toLocaleLowerCase()){
+        case 'date':
+            return fullRanges.slice(0, 3);
+        case 'datetime':
+            return fullRanges.slice(0, 5);
+        case 'time':
+            return fullRanges.slice(3, 6);
+        case 'year-month':
+            return fullRanges.slice(0, 2);
+        case 'hour-minutes':
+            return fullRanges.slice(3, 5);
+        case 'month-day':
+            return fullRanges.slice(1, 3);
+        case 'datehour':
+            return fullRanges.slice(0, 4);
+        default:
+            return fullRanges;
+    }
+};
+/**
+ * 根据类型获取日期对象中对应的值
+ * @param type 需要获取的日期部分（如 'year', 'month', 'day' 等）
+ * @param selectedDate 选中的日期时间戳
+ * @returns 返回日期对象中对应部分的值，如果类型无效或日期无效，返回 0
+ */ export var getDatePartValue = function(type, selectedDate) {
+    var date = new Date(selectedDate);
+    if (!selectedDate) return 0;
+    switch(type){
+        case 'year':
+            return date.getFullYear();
+        case 'month':
+            return date.getMonth() + 1;
+        case 'day':
+            return date.getDate();
+        case 'hour':
+            return date.getHours();
+        case 'minute':
+            return date.getMinutes();
+        case 'seconds':
+            return date.getSeconds();
+        default:
+            return 0;
+    }
+};
+/**
+ * 生成 Picker 的列数据，并触发回调函数返回选中索引
+ * @param min 最小值
+ * @param max 最大值
+ * @param currentValue 当前选中的值
+ * @param type 列的类型（如 'year', 'month', 'minute' 等）
+ * @param minuteStep 分钟步长（仅当类型为 'minute' 时生效）
+ * @param callback 回调函数，用于返回选中索引
+ * @returns 返回生成的 Picker 列数据
+ */ export var generatePickerColumnWithCallback = function(min, max, currentValue, type, minuteStep, callback, showChinese, zhCNType, formatter) {
+    var currentMin = min;
+    var options = [];
+    var selectedIndex = 0;
+    // 遍历从最小值到最大值的范围
+    while(currentMin <= max){
+        // 将当前值格式化为 PickerOption 并添加到数组中
+        options.push(formatPickerOption(type, currentMin, showChinese, zhCNType, formatter));
+        // 根据类型决定步长：如果是分钟，使用 minuteStep，否则步长为 1
+        if (type === 'minute') {
+            currentMin += minuteStep;
+        } else {
+            currentMin++;
+        }
+        // 如果当前值小于等于选中的值，更新选中索引
+        if (currentMin <= Number(currentValue)) {
+            selectedIndex++;
+        }
+    }
+    callback(selectedIndex, options);
+    return options;
+};
+/**
+ * 格式化 Picker 选项
+ * @param type 选项类型（如 'year', 'month', 'minute' 等）
+ * @param value 选项的值
+ * @param showChinese 是否显示中文文本
+ * @param zhCNType 中文文本映射对象
+ * @param formatter 自定义格式化函数
+ * @returns 返回格式化后的 Picker 选项
+ */ export var formatPickerOption = function(type, value, showChinese, zhCNType, formatter) {
+    if (formatter) {
+        return formatter(type, {
+            label: padZero(value, 2),
+            value: padZero(value, 2)
+        });
+    }
+    var paddedValue = padZero(value, 2);
+    var chineseText = showChinese ? zhCNType[type] : '';
+    return {
+        label: paddedValue + chineseText,
+        value: paddedValue
+    };
+};
+/**
+ * 格式化日期值，确保其在 startDate 和 endDate 之间
+ */ export var formatValue = function(value, startDate, endDate) {
+    if (!value || value && !isDate(value)) {
+        value = startDate;
+    }
+    return Math.min(Math.max(value.getTime(), startDate.getTime()), endDate.getTime());
+};
+/**
+ * 处理 Picker 值变化的逻辑
+ * @param selectedOptions 选中的选项数组
+ * @param selectedValue 选中的值数组
+ * @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);
+    } 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);
+    }
+};

package/dist/es/packages/dialog/confirm.d.ts

@@ -1,4 +1,5 @@
-import { DialogConfirmProps, DialogReturnProps } from './config';
-export declare const normalizeConfig: (config: DialogConfirmProps) => DialogConfirmProps;
-declare const confirm: (config: DialogConfirmProps, renderFunc?: (props: DialogConfirmProps) => void) => DialogReturnProps;
+import { DialogConfirmProps, DialogReturnProps } from './types';
+type DialogConfirmNativeProps = Partial<DialogConfirmProps>;
+export declare const normalizeConfig: (config: DialogConfirmNativeProps) => DialogConfirmNativeProps;
+declare const confirm: (config: DialogConfirmNativeProps, renderFunc?: (props: DialogConfirmNativeProps) => void) => DialogReturnProps;
 export default confirm;

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

@@ -2,26 +2,14 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import React from "react";
 import { Dialog } from "./dialog";
-import { destroyList } from "./config";
+import { destroyList } from "./types";
 import { render as reactRender, unmount } from "../../utils/render";
 function ConfirmDialog(props) {
     return /*#__PURE__*/ React.createElement(Dialog, props, props.content);
 }
 // 如果是消息提示型弹出框，那么只有确认按钮
 export var normalizeConfig = function(config) {
-    if (config.isNotice) {
-        var icon = config.icon;
-        if (!icon && icon !== null) {
-            switch(config.noticeType){
-                case 'alert':
-                    icon = '';
-                    break;
-                default:
-                    break;
-            }
-        }
-        config.hideCancelButton = true;
-    }
+    config.hideCancelButton = config.isNotice;
     return config;
 };
 var confirm = function(config, renderFunc) {
@@ -84,9 +72,7 @@ var confirm = function(config, renderFunc) {
         });
     };
     var update = function(newConfig) {
-        dialogConfig = _object_spread(_object_spread_props(_object_spread({}, dialogConfig), {
-            title: config.title
-        }), newConfig);
+        dialogConfig = _object_spread({}, dialogConfig, newConfig);
         dialogConfig = normalizeConfig(dialogConfig);
         renderFunction(dialogConfig);
     };

package/dist/es/packages/dialog/content.d.ts

@@ -1,11 +1,4 @@
-import { FunctionComponent, ReactNode, HTMLAttributes } from 'react';
-interface ContentProps {
-    visible: boolean;
-    title: ReactNode;
-    header: ReactNode;
-    footer: ReactNode;
-    close: ReactNode;
-    footerDirection: string;
-}
-export declare const Content: FunctionComponent<Partial<ContentProps> & HTMLAttributes<HTMLDivElement>>;
-export {};
+import { FunctionComponent, HTMLAttributes } from 'react';
+import { ContentProps } from './types';
+export declare const defaultContentProps: ContentProps;
+export declare const Content: FunctionComponent<Partial<ContentProps> & Omit<HTMLAttributes<HTMLDivElement>, 'title' | 'content'>>;

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

@@ -1,28 +1,36 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import React from "react";
 import classNames from "classnames";
+export var defaultContentProps = {
+    visible: false,
+    title: '',
+    header: '',
+    footer: '',
+    close: '',
+    footerDirection: 'horizontal',
+    onClick: function() {}
+};
 export var Content = function(props) {
-    var visible = props.visible, title = props.title, header = props.header, footer = props.footer, close = props.close, footerDirection = props.footerDirection, onClick = props.onClick, children = props.children;
+    var _$_object_spread = _object_spread({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, style = _$_object_spread.style, className = _$_object_spread.className, onClick = _$_object_spread.onClick;
     var classPrefix = 'nut-dialog';
     var renderHeader = function() {
-        return title ? /*#__PURE__*/ React.createElement("div", {
+        return title && /*#__PURE__*/ React.createElement("div", {
             className: "".concat(classPrefix, "-header")
-        }, title) : null;
+        }, title);
     };
     var renderFooter = function() {
-        return footer ? /*#__PURE__*/ React.createElement("div", {
+        return footer && /*#__PURE__*/ React.createElement("div", {
             className: classNames("".concat(classPrefix, "-footer"), _define_property({}, footerDirection, footerDirection))
-        }, footer) : null;
+        }, footer);
     };
     var handleClick = function(e) {
         onClick && onClick(e);
     };
     return /*#__PURE__*/ React.createElement("div", {
-        className: classNames("".concat(classPrefix, "-outer"), props.className),
-        style: props.style,
-        onClick: function(e) {
-            return handleClick(e);
-        }
+        className: classNames("".concat(classPrefix, "-outer"), className),
+        style: style,
+        onClick: handleClick
     }, close, header, /*#__PURE__*/ React.createElement("div", {
         className: classPrefix,
         style: {
@@ -30,6 +38,6 @@ export var Content = function(props) {
         }
     }, renderHeader(), /*#__PURE__*/ React.createElement("div", {
         className: "".concat(classPrefix, "-content")
-    }, /*#__PURE__*/ React.createElement(React.Fragment, null, children)), renderFooter()));
+    }, children), renderFooter()));
 };
 Content.displayName = 'NutContent';

package/dist/es/packages/dialog/dialog.d.ts

@@ -1,3 +1,2 @@
-import { DialogBasicProps, DialogComponent } from './config';
-export type DialogProps = DialogBasicProps;
+import { DialogComponent } from './types';
 export declare const Dialog: DialogComponent;

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

@@ -7,14 +7,12 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { forwardRef, useState } from "react";
 import classNames from "classnames";
-import { Close } from "@nutui/icons-react";
+import { Failure, Close } from "@nutui/icons-react";
 import Button from "../button";
 import confirm from "./confirm";
-import { DialogWrap } from "./dialogwrap";
+import { DialogWrap, defaultDialogWrapProps } from "./dialogwrap";
 import { useConfig } from "../configprovider";
-import { ComponentDefaults } from "../../utils/typings";
-import { mergeProps } from "../../utils/merge-props";
-var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
+var defaultProps = _object_spread_props(_object_spread({}, defaultDialogWrapProps), {
     confirmText: '',
     cancelText: '',
     overlay: true,
@@ -26,6 +24,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     lockScroll: true,
     closeIconPosition: 'bottom',
     closeIcon: false,
+    zIndex: 1200,
     beforeCancel: function() {
         return true;
     },
@@ -35,7 +34,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 var BaseDialog = function(props, ref) {
     var locale = useConfig().locale;
-    var _mergeProps = mergeProps(defaultProps, props), visible = _mergeProps.visible, footer = _mergeProps.footer, hideConfirmButton = _mergeProps.hideConfirmButton, hideCancelButton = _mergeProps.hideCancelButton, lockScroll = _mergeProps.lockScroll, disableConfirmButton = _mergeProps.disableConfirmButton, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, confirmText = _mergeProps.confirmText, cancelText = _mergeProps.cancelText, closeIconPosition = _mergeProps.closeIconPosition, closeIcon = _mergeProps.closeIcon, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onConfirm = _mergeProps.onConfirm, beforeCancel = _mergeProps.beforeCancel, beforeClose = _mergeProps.beforeClose, restProps = _object_without_properties(_mergeProps, [
+    var _ref = _object_spread({}, defaultProps, props), visible = _ref.visible, footer = _ref.footer, hideConfirmButton = _ref.hideConfirmButton, hideCancelButton = _ref.hideCancelButton, lockScroll = _ref.lockScroll, disableConfirmButton = _ref.disableConfirmButton, closeOnOverlayClick = _ref.closeOnOverlayClick, confirmText = _ref.confirmText, cancelText = _ref.cancelText, closeIconPosition = _ref.closeIconPosition, closeIcon = _ref.closeIcon, footerDirection = _ref.footerDirection, onClose = _ref.onClose, onCancel = _ref.onCancel, onConfirm = _ref.onConfirm, beforeCancel = _ref.beforeCancel, beforeClose = _ref.beforeClose, restProps = _object_without_properties(_ref, [
         "visible",
         "footer",
         "hideConfirmButton",
@@ -47,6 +46,7 @@ var BaseDialog = function(props, ref) {
         "cancelText",
         "closeIconPosition",
         "closeIcon",
+        "footerDirection",
         "onClose",
         "onCancel",
         "onConfirm",
@@ -110,15 +110,26 @@ var BaseDialog = function(props, ref) {
                 return _ref.apply(this, arguments);
             };
         }();
-        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && /*#__PURE__*/ React.createElement(Button, {
+        var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
+        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && (footerDirection === 'vertical' ? /*#__PURE__*/ React.createElement("div", {
+            style: {
+                order: 2
+            },
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+            onClick: function(e) {
+                return handleCancel(e);
+            }
+        }, cancelText || locale.cancel) : /*#__PURE__*/ React.createElement(Button, {
             type: "default",
-            className: "".concat(classPrefix, "-footer-cancel"),
+            size: "large",
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
             onClick: function(e) {
                 return handleCancel(e);
             }
-        }, cancelText || locale.cancel), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
+        }, cancelText || locale.cancel)), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
             type: "primary",
-            className: classNames("".concat(classPrefix, "-footer-ok"), {
+            size: "large",
+            className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                 disabled: disableConfirmButton
             }),
             disabled: disableConfirmButton,
@@ -138,19 +149,21 @@ var BaseDialog = function(props, ref) {
         };
         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
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null));
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     return /*#__PURE__*/ React.createElement("div", {
         style: {
             display: visible ? 'block' : 'none'
         }
-    }, /*#__PURE__*/ React.createElement(DialogWrap, _object_spread_props(_object_spread({}, props), {
+    }, /*#__PURE__*/ React.createElement(DialogWrap, _object_spread_props(_object_spread({}, restProps), {
         visible: visible,
         lockScroll: lockScroll,
         footer: renderFooter(),
+        footerDirection: footerDirection,
         close: renderCloseIcon(),
         onClose: onClose,
         onCancel: onCancel

package/dist/es/packages/dialog/dialogwrap.d.ts

@@ -1,15 +1,4 @@
-import React, { FunctionComponent, HTMLAttributes } from 'react';
-import { OverlayProps } from "../overlay/overlay";
-interface DialogWrapProps extends OverlayProps {
-    visible: boolean;
-    overlay: boolean;
-    overlayStyle: React.CSSProperties;
-    overlayClassName: string;
-    footer: React.ReactNode;
-    close: React.ReactNode;
-    onCancel: () => void;
-    onClose: () => void;
-    onOverlayClick: (e: MouseEvent) => boolean | void;
-}
+import { FunctionComponent, HTMLAttributes } from 'react';
+import { DialogWrapProps } from './types';
+export declare const defaultDialogWrapProps: DialogWrapProps;
 export declare const DialogWrap: FunctionComponent<Partial<DialogWrapProps> & Omit<HTMLAttributes<HTMLDivElement>, 'title' | 'content'>>;
-export {};

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

@@ -1,25 +1,34 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import React from "react";
 import { CSSTransition } from "react-transition-group";
-import classNames from "classnames";
-import { Content } from "./content";
+import { Content, defaultContentProps } from "./content";
 import { defaultOverlayProps } from "../overlay/overlay";
-import { ComponentDefaults } from "../../utils/typings";
 import Overlay from "../overlay";
-import { mergeProps } from "../../utils/merge-props";
-var defaultDialogProps = _object_spread(_object_spread_props(_object_spread({}, ComponentDefaults), {
+export var defaultDialogWrapProps = _object_spread_props(_object_spread({}, defaultOverlayProps, defaultContentProps), {
     overlay: true,
     overlayStyle: {},
-    overlayClassName: '',
+    overlayClassName: 'nut-dialog-overlay',
     onCancel: function() {},
     onClose: function() {},
-    onOverlayClick: function(e) {
+    onOverlayClick: function() {
         return true;
     }
-}), defaultOverlayProps);
+});
 export var DialogWrap = function(props) {
-    var _mergeProps = mergeProps(defaultDialogProps, props), visible = _mergeProps.visible, overlay = _mergeProps.overlay, overlayStyle = _mergeProps.overlayStyle, overlayClassName = _mergeProps.overlayClassName, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, lockScroll = _mergeProps.lockScroll, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onOverlayClick = _mergeProps.onOverlayClick;
+    var _ref = _object_spread({}, defaultDialogWrapProps, props), visible = _ref.visible, overlay = _ref.overlay, overlayStyle = _ref.overlayStyle, overlayClassName = _ref.overlayClassName, closeOnOverlayClick = _ref.closeOnOverlayClick, lockScroll = _ref.lockScroll, zIndex = _ref.zIndex, onClose = _ref.onClose, onCancel = _ref.onCancel, onOverlayClick = _ref.onOverlayClick, restProps = _object_without_properties(_ref, [
+        "visible",
+        "overlay",
+        "overlayStyle",
+        "overlayClassName",
+        "closeOnOverlayClick",
+        "lockScroll",
+        "zIndex",
+        "onClose",
+        "onCancel",
+        "onOverlayClick"
+    ]);
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
@@ -27,20 +36,21 @@ export var DialogWrap = function(props) {
             closed && (onCancel === null || onCancel === void 0 ? void 0 : onCancel());
         }
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay && /*#__PURE__*/ React.createElement(Overlay, {
+        zIndex: zIndex,
         style: overlayStyle,
-        className: classNames('nut-dialog-overlay', overlayClassName),
+        className: overlayClassName,
         visible: visible,
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: onHandleClickOverlay
-    }) : null, /*#__PURE__*/ React.createElement(CSSTransition, {
+    }), /*#__PURE__*/ React.createElement(CSSTransition, {
         in: visible,
         timeout: 300,
         classNames: "fadeDialog",
         unmountOnExit: true,
         appear: true
-    }, /*#__PURE__*/ React.createElement(Content, _object_spread_props(_object_spread({}, props), {
+    }, /*#__PURE__*/ React.createElement(Content, _object_spread_props(_object_spread({}, restProps), {
         visible: visible
     }))));
 };

package/dist/es/packages/dialog/index.d.ts

@@ -1,4 +1,3 @@
 import { Dialog } from './dialog';
-export type { DialogConfigType, DialogCloseIconPosition, DialogBasicProps, DialogConfirmProps, DialogReturnProps, } from './config';
-export type { DialogProps } from './dialog';
+export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, ContentProps, DialogWrapProps, DialogBasicProps, DialogConfirmProps, DialogReturnProps, } from './types';
 export default Dialog;

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

@@ -5,15 +5,14 @@
   flex-direction: column;
   align-items: center;
   width: $dialog-width;
-  // max-height: 67%;
+  min-width: $dialog-min-width;
+  /* #ifndef harmony*/
+  max-height: 67%;
+  /* #endif */
   min-height: $dialog-min-height;
   padding: $dialog-padding;
   box-sizing: border-box;
 
-  &-overlay {
-    --nutui-overlay-zIndex: 1200;
-  }
-
   &-outer {
     position: fixed;
     max-height: 100%;
@@ -58,11 +57,17 @@
     }
 
     &-bottom {
-      bottom: -56px;
+      bottom: -64px;
+      width: $dialog-bottom-close-icon-size;
+      height: $dialog-bottom-close-icon-size;
       left: 50%;
-      transform: translateY(-50%);
+      transform: translateX(-50%);
       .nut-icon {
-        color: $dialog-close-color;
+        color: $color-text-disabled;
+        background-color: $color-mask-part;
+        border-radius: 50%;
+        width: $dialog-bottom-close-icon-size;
+        height: $dialog-bottom-close-icon-size;
       }
     }
 
@@ -86,7 +91,7 @@
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
     font-size: $font-size-base;
-    color: $color-text;
+    color: $color-title;
     word-wrap: break-word;
     word-break: break-all;
     white-space: pre-wrap;
@@ -105,20 +110,15 @@
 
       .nut-button {
         min-width: 100%;
-        margin: 0;
+      }
 
-        &.nut-dialog-footer-ok {
-          order: 1;
-        }
-
-        &.nut-dialog-footer-cancel {
-          border: 0;
-          color: $color-text;
-          order: 2;
-          display: flex;
-          align-items: flex-end;
-          margin-top: $dialog-vertical-footer-ok-margin-top;
-        }
+      .nut-dialog-footer-cancel {
+        margin: 0;
+        color: $color-text;
+        font-size: $font-size-base;
+        display: flex;
+        justify-content: center;
+        margin-top: $dialog-vertical-footer-ok-margin-top;
       }
     }
 
@@ -132,6 +132,12 @@
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
+      font-weight: $font-weight-bold;
+    }
+    &-block {
+      &.nut-button {
+        min-width: 100%;
+      }
     }
   }
 }