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

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

@@ -2,35 +2,52 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "DialogWrap", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    DialogWrap: function() {
         return DialogWrap;
+    },
+    defaultDialogWrapProps: function() {
+        return defaultDialogWrapProps;
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _reacttransitiongroup = require("react-transition-group");
-var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _content = require("./content");
 var _overlay = require("../overlay/overlay");
-var _typings = require("../../utils/typings");
 var _overlay1 = /*#__PURE__*/ _interop_require_default._(require("../overlay"));
-var _mergeprops = require("../../utils/merge-props");
-var defaultDialogProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var defaultDialogWrapProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps, _content.defaultContentProps), {
     overlay: true,
     overlayStyle: {},
-    overlayClassName: '',
+    overlayClassName: 'nut-dialog-overlay',
     onCancel: function onCancel() {},
     onClose: function onClose() {},
-    onOverlayClick: function onOverlayClick(e) {
+    onOverlayClick: function onOverlayClick() {
         return true;
     }
-}), _overlay.defaultOverlayProps);
+});
 var DialogWrap = function DialogWrap(props) {
-    var _mergeProps = (0, _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 = (0, _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 = (0, _object_without_properties._)(_ref, [
+        "visible",
+        "overlay",
+        "overlayStyle",
+        "overlayClassName",
+        "closeOnOverlayClick",
+        "lockScroll",
+        "zIndex",
+        "onClose",
+        "onCancel",
+        "onOverlayClick"
+    ]);
     var onHandleClickOverlay = function onHandleClickOverlay(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
@@ -38,20 +55,21 @@ var DialogWrap = function DialogWrap(props) {
             closed && (onCancel === null || onCancel === void 0 ? void 0 : onCancel());
         }
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay && /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+        zIndex: zIndex,
         style: overlayStyle,
-        className: (0, _classnames.default)('nut-dialog-overlay', overlayClassName),
+        className: overlayClassName,
         visible: visible,
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: onHandleClickOverlay
-    }) : null, /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
+    }), /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
         in: visible,
         timeout: 300,
         classNames: "fadeDialog",
         unmountOnExit: true,
         appear: true
-    }, /*#__PURE__*/ _react.default.createElement(_content.Content, (0, _object_spread_props._)((0, _object_spread._)({}, props), {
+    }, /*#__PURE__*/ _react.default.createElement(_content.Content, (0, _object_spread_props._)((0, _object_spread._)({}, restProps), {
         visible: visible
     }))));
 };

package/dist/cjs/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/cjs/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%;
+      }
     }
   }
 }

package/dist/cjs/packages/dialog/style/style.css

@@ -6,10 +6,10 @@
   position: relative;
   display: flex;
   display: inline-block;
-  /* #ifdef rn harmony*/
+  /* #ifdef harmony*/
   width: 80px;
   /* #endif */
-  /* #ifndef rn harmony*/
+  /* #ifndef harmony*/
   width: auto;
   /* #endif */
   flex-direction: row;
@@ -21,7 +21,7 @@
   padding: 0;
   height: var(--nutui-button-default-height, 32px);
   font-size: var(--nutui-button-default-font-size, var(--nutui-font-size-base, 14px));
-  font-weight: var(--nutui-button-default-font-weight, var(--nutui-font-weight, 400));
+  font-weight: var(--nutui-font-weight, 400);
   text-align: center;
   cursor: pointer;
   transition: opacity 0.2s;
@@ -29,9 +29,9 @@
   touch-action: manipulation;
   -webkit-appearance: none;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-  color: var(--nutui-button-default-color, var(--nutui-gray-7));
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
   background: var(--nutui-button-default-background-color, transparent);
-  border-width: var(--nutui-button-border-width, 1px);
+  border-width: var(--nutui-button-border-width, 0.5px);
 }
 .nut-button-text {
   margin-left: var(--nutui-button-text-icon-margin, 4px);
@@ -50,9 +50,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10);
+  background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border: inherit;
-  border-color: var(--nutui-black-10);
+  border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;
@@ -71,7 +71,7 @@
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  /* #ifndef rn harmony */
+  /* #ifndef harmony */
   background: initial;
   /* #endif */
 }
@@ -98,10 +98,10 @@
   border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-round-large {
-  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-s, 6px));
+  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-round-small {
-  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-xs, 4px));
+  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
 }
 .nut-button-round-mini {
   border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
@@ -109,20 +109,20 @@
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
-  border-color: var(--nutui-button-default-border-color, var(--nutui-gray-6));
+  border-color: var(--nutui-button-default-border-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-default-disabled, .nut-button-default-solid-disabled {
   color: var(--nutui-button-primary-color, #ffffff);
-  background: var(--nutui-button-default-disabled, var(--nutui-gray-4));
-  border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
+  background: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-default-none-disabled {
-  color: var(--nutui-button-default-disabled-color, var(--nutui-gray-5));
+  color: var(--nutui-button-default-disabled-color, var(--nutui-color-text-help, #888b94));
 }
 .nut-button-default-outline-disabled, .nut-button-default-dashed-disabled {
   background: transparent;
-  color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
-  border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
+  color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-normal {
   padding: var(--nutui-button-normal-padding, 0px 12px);
@@ -131,7 +131,6 @@
   height: var(--nutui-button-xlarge-height, 48px);
   padding: var(--nutui-button-xlarge-padding, 0px 24px);
   font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
-  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
   border-radius: var(--nutui-radius-base, 8px);
 }
 .nut-button-xlarge .nut-button-text {
@@ -147,13 +146,11 @@
 }
 .nut-button-xlarge-children {
   font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
-  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-button-large {
   height: var(--nutui-button-large-height, 40px);
   padding: var(--nutui-button-large-padding, 0px 16px);
   font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
   border-radius: var(--nutui-radius-s, 6px);
 }
 .nut-button-large .nut-button-text {
@@ -169,7 +166,6 @@
 }
 .nut-button-large-children {
   font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  font-weight: var(--nutui-button-large-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-button-small {
   height: var(--nutui-button-small-height, 28px);
@@ -216,39 +212,39 @@
 .nut-button-primary-solid.nut-button-small, .nut-button-primary-solid.nut-button-mini {
   font-weight: var(--nutui-font-weight, 400);
 }
-.nut-button-primary-disabled, .nut-button-primary-solid-disabled {
+.nut-button-primary-disabled, .nut-button-primary-disabled.nut-button-icononly, .nut-button-primary-solid-disabled {
   color: var(--nutui-button-primary-color, #ffffff);
-  background: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  background: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-none {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-none-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-outline {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
-  border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
+  border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-outline-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-dashed {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
-  border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
+  border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-dashed-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary.nut-button-solid.nut-button-normal {
   font-weight: var(--nutui-font-weight-bold, 600);
 }
 .nut-button-success {
   color: var(--nutui-button-success-color, #ffffff);
-  background: var(--nutui-button-success-background-color, var(--nutui-green-2));
+  background: var(--nutui-button-success-background-color, var(--nutui-color-success, #00d900));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -260,15 +256,15 @@
   border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
 }
 .nut-button-success-outline, .nut-button-success-dashed {
-  color: var(--nutui-button-success-border-color, var(--nutui-green-2));
-  border-color: var(--nutui-button-success-border-color, var(--nutui-green-2));
+  color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
+  border-color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
 }
 .nut-button-success-outline-disabled, .nut-button-success-dashed-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-success-none {
-  color: var(--nutui-button-success-border-color, var(--nutui-green-2));
+  color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
 }
 .nut-button-success-none-disabled {
   color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
@@ -302,7 +298,7 @@
 }
 .nut-button-danger {
   color: var(--nutui-button-danger-color, #ffffff);
-  background: var(--nutui-button-danger-background-color, var(--nutui-red-2));
+  background: var(--nutui-button-danger-background-color, var(--nutui-color-danger, #ff0f23));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -310,26 +306,26 @@
   color: var(--nutui-button-danger-color, #ffffff);
 }
 .nut-button-danger-solid-disabled {
-  background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
-  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
+  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-danger-outline, .nut-button-danger-dashed {
-  color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
-  border-color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
+  color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
+  border-color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-button-danger-outline-disabled, .nut-button-danger-dashed-disabled {
-  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
-  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
+  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-danger-none {
-  color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
+  color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-button-danger-none-disabled {
-  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-warning {
   color: var(--nutui-button-warning-color, #ffffff);
-  background: var(--nutui-button-warning-background-color, var(--nutui-yellow-2));
+  background: var(--nutui-button-warning-background-color, var(--nutui-color-warning, #ffbf00));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -342,15 +338,15 @@
   border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
 }
 .nut-button-warning-outline, .nut-button-warning-dashed {
-  color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
-  border-color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
+  color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
+  border-color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-button-warning-outline-disabled, .nut-button-warning-dashed-disabled {
   color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
   border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
 }
 .nut-button-warning-none {
-  color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
+  color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-button-warning-none-disabled {
   color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
@@ -396,19 +392,14 @@
 }
 
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -460,13 +451,14 @@
   flex-direction: column;
   align-items: center;
   width: var(--nutui-dialog-width, 295px);
+  min-width: var(--nutui-dialog-min-width, 240px);
+  /* #ifndef harmony*/
+  max-height: 67%;
+  /* #endif */
   min-height: var(--nutui-dialog-min-height, 124px);
   padding: var(--nutui-dialog-padding, 24px);
   box-sizing: border-box;
 }
-.nut-dialog-overlay {
-  --nutui-overlay-zIndex: 1200;
-}
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
@@ -477,7 +469,7 @@
   left: 50%;
   -webkit-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
-  border-radius: var(--nutui-dialog-border-radius, 16px);
+  border-radius: var(--nutui-dialog-border-radius, var(--nutui-radius-xl, 12px));
   z-index: var(--nutui-dialog-z-index, 1200);
   animation-duration: 0.3s;
 }
@@ -485,17 +477,17 @@
   position: absolute !important;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-dialog-close-width, 18px);
-  height: var(--nutui-dialog-close-height, 18px);
+  width: var(--nutui-dialog-close-width, 16px);
+  height: var(--nutui-dialog-close-height, 16px);
   display: flex;
   justify-content: center;
   align-items: center;
   color: var(--nutui-dialog-close-color, #ffffff);
 }
 .nut-dialog-close .nut-icon {
-  font-size: var(--nutui-dialog-close-width, 18px);
-  width: var(--nutui-dialog-close-width, 18px);
-  height: var(--nutui-dialog-close-height, 18px);
+  font-size: var(--nutui-dialog-close-width, 16px);
+  width: var(--nutui-dialog-close-width, 16px);
+  height: var(--nutui-dialog-close-height, 16px);
 }
 .nut-dialog-close-top-right {
   top: var(--nutui-dialog-close-top, 16px);
@@ -506,12 +498,18 @@
   left: var(--nutui-dialog-close-left, 16px);
 }
 .nut-dialog-close-bottom {
-  bottom: -56px;
+  bottom: -64px;
+  width: var(--nutui-dialog-bottom-close-icon-size, 24px);
+  height: var(--nutui-dialog-bottom-close-icon-size, 24px);
   left: 50%;
-  transform: translateY(-50%);
+  transform: translateX(-50%);
 }
 .nut-dialog-close-bottom .nut-icon {
-  color: var(--nutui-dialog-close-color, #ffffff);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
+  background-color: var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4));
+  border-radius: 50%;
+  width: var(--nutui-dialog-bottom-close-icon-size, 24px);
+  height: var(--nutui-dialog-bottom-close-icon-size, 24px);
 }
 .nut-dialog-close:active {
   opacity: 0.7;
@@ -520,8 +518,8 @@
   display: block;
   text-align: center;
   font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-l, 16px));
-  font-weight: var(--nutui-dialog-header-font-weight, normal);
-  color: var(--nutui-gray-7);
+  font-weight: var(--nutui-dialog-header-font-weight, var(--nutui-font-weight-bold, 600));
+  color: var(--nutui-color-title, #1a1a1a);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -529,11 +527,11 @@
 }
 .nut-dialog-content {
   width: 100%;
-  margin: var(--nutui-dialog-content-margin, 5px 0 24px 0);
+  margin: var(--nutui-dialog-content-margin, 12px 0 16px 0);
   max-height: var(--nutui-dialog-content-max-height, 268px);
   line-height: var(--nutui-dialog-content-line-height, 20px);
   font-size: var(--nutui-font-size-base, 14px);
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-title, #1a1a1a);
   word-wrap: break-word;
   word-break: break-all;
   white-space: pre-wrap;
@@ -551,18 +549,14 @@
 }
 .nut-dialog-footer.vertical .nut-button {
   min-width: 100%;
-  margin: 0;
 }
-.nut-dialog-footer.vertical .nut-button.nut-dialog-footer-ok {
-  order: 1;
-}
-.nut-dialog-footer.vertical .nut-button.nut-dialog-footer-cancel {
-  border: 0;
-  color: var(--nutui-gray-6);
-  order: 2;
+.nut-dialog-footer.vertical .nut-dialog-footer-cancel {
+  margin: 0;
+  color: var(--nutui-color-text, #505259);
+  font-size: var(--nutui-font-size-base, 14px);
   display: flex;
-  align-items: flex-end;
-  margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 5px);
+  justify-content: center;
+  margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 16px);
 }
 .nut-dialog-footer .nut-button {
   min-width: var(--nutui-dialog-footer-button-min-width, 117px);
@@ -572,6 +566,10 @@
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
+  font-weight: var(--nutui-font-weight-bold, 600);
+}
+.nut-dialog-footer-block.nut-button {
+  min-width: 100%;
 }
 
 [dir=rtl] .nut-dialog-outer,

package/dist/cjs/packages/dialog/types.d.ts

@@ -0,0 +1,57 @@
+import { ReactNode, ForwardRefExoticComponent, PropsWithChildren } from 'react';
+import type { MouseEvent, CSSProperties } from 'react';
+import { OverlayProps } from "../overlay/types";
+import { BasicComponent } from "../../utils/typings";
+export type DialogConfigType = {
+    prefixCls?: string;
+    simple?: boolean;
+};
+export type DialogCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
+export type DialogFooterDirection = 'horizontal' | 'vertical';
+export interface ContentProps extends BasicComponent {
+    visible: boolean;
+    title: ReactNode;
+    header: ReactNode;
+    footer: ReactNode;
+    close: ReactNode;
+    footerDirection: DialogFooterDirection;
+    onClick: (event: MouseEvent) => void;
+}
+export interface DialogWrapProps extends OverlayProps, Omit<ContentProps, 'onClick'> {
+    visible: boolean;
+    overlay: boolean;
+    overlayStyle: CSSProperties;
+    overlayClassName: string;
+    onCancel: () => void;
+    onClose: () => void;
+    onOverlayClick: (e: MouseEvent) => boolean | void;
+}
+export interface DialogBasicProps extends DialogWrapProps {
+    content?: ReactNode;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
+    hideConfirmButton?: boolean;
+    hideCancelButton?: boolean;
+    disableConfirmButton?: boolean;
+    closeIconPosition?: DialogCloseIconPosition;
+    closeIcon?: boolean | ReactNode;
+    beforeClose?: () => boolean;
+    beforeCancel?: () => boolean;
+    onConfirm?: (e?: MouseEvent<HTMLButtonElement>) => PromiseLike<any> | void;
+}
+export interface DialogConfirmProps extends DialogBasicProps {
+    content: ReactNode;
+    isNotice: boolean;
+    noticeType: string;
+}
+export type DialogReturnProps = {
+    update: (newConfig: Partial<DialogConfirmProps>) => void;
+    close: () => void;
+};
+export interface DialogComponent extends ForwardRefExoticComponent<PropsWithChildren<Partial<DialogBasicProps>>> {
+    confirm: (props: Partial<DialogConfirmProps>) => DialogReturnProps;
+    alert: (props: Partial<DialogConfirmProps>) => DialogReturnProps;
+    config: (config: DialogConfigType) => void;
+    destroyAll: () => void;
+}
+export declare const destroyList: Array<() => void>;