@nutui/nutui-react 3.0.0-beta.11 → 3.0.0-beta.13

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

@@ -21,25 +21,13 @@ var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _dialog = require("./dialog");
-var _config = require("./config");
+var _types = require("./types");
 var _render = require("../../utils/render");
 function ConfirmDialog(props) {
     return /*#__PURE__*/ _react.default.createElement(_dialog.Dialog, props, props.content);
 }
 var normalizeConfig = function normalizeConfig(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 confirm(config, renderFunc) {
@@ -83,10 +71,10 @@ var confirm = function confirm(config, renderFunc) {
         if (div === null || div === void 0 ? void 0 : div.parentNode) {
             div.parentNode.removeChild(div);
         }
-        for(var i = 0; i < _config.destroyList.length; i++){
-            var fn = _config.destroyList[i];
+        for(var i = 0; i < _types.destroyList.length; i++){
+            var fn = _types.destroyList[i];
             if (fn === close) {
-                _config.destroyList.splice(i, 1);
+                _types.destroyList.splice(i, 1);
                 break;
             }
         }
@@ -102,9 +90,7 @@ var confirm = function confirm(config, renderFunc) {
         });
     };
     var update = function update(newConfig) {
-        dialogConfig = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, dialogConfig), {
-            title: config.title
-        }), newConfig);
+        dialogConfig = (0, _object_spread._)({}, dialogConfig, newConfig);
         dialogConfig = normalizeConfig(dialogConfig);
         renderFunction(dialogConfig);
     };
@@ -116,7 +102,7 @@ var confirm = function confirm(config, renderFunc) {
         };
         renderFunction(dialogConfig);
     };
-    _config.destroyList.push(close);
+    _types.destroyList.push(close);
     return {
         close: close,
         update: update

package/dist/cjs/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/cjs/packages/dialog/content.js

@@ -2,38 +2,54 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "Content", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    Content: function() {
         return Content;
+    },
+    defaultContentProps: function() {
+        return defaultContentProps;
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _define_property = require("@swc/helpers/_/_define_property");
+var _object_spread = require("@swc/helpers/_/_object_spread");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var defaultContentProps = {
+    visible: false,
+    title: '',
+    header: '',
+    footer: '',
+    close: '',
+    footerDirection: 'horizontal',
+    onClick: function onClick() {}
+};
 var Content = function Content(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 = (0, _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 renderHeader() {
-        return title ? /*#__PURE__*/ _react.default.createElement("div", {
+        return title && /*#__PURE__*/ _react.default.createElement("div", {
             className: "".concat(classPrefix, "-header")
-        }, title) : null;
+        }, title);
     };
     var renderFooter = function renderFooter() {
-        return footer ? /*#__PURE__*/ _react.default.createElement("div", {
+        return footer && /*#__PURE__*/ _react.default.createElement("div", {
             className: (0, _classnames.default)("".concat(classPrefix, "-footer"), (0, _define_property._)({}, footerDirection, footerDirection))
-        }, footer) : null;
+        }, footer);
     };
     var handleClick = function handleClick(e) {
         onClick && onClick(e);
     };
     return /*#__PURE__*/ _react.default.createElement("div", {
-        className: (0, _classnames.default)("".concat(classPrefix, "-outer"), props.className),
-        style: props.style,
-        onClick: function onClick(e) {
-            return handleClick(e);
-        }
+        className: (0, _classnames.default)("".concat(classPrefix, "-outer"), className),
+        style: style,
+        onClick: handleClick
     }, close, header, /*#__PURE__*/ _react.default.createElement("div", {
         className: classPrefix,
         style: {
@@ -41,6 +57,6 @@ var Content = function Content(props) {
         }
     }, renderHeader(), /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-content")
-    }, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, children)), renderFooter()));
+    }, children), renderFooter()));
 };
 Content.displayName = 'NutContent';

package/dist/cjs/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/cjs/packages/dialog/dialog.js

@@ -24,9 +24,7 @@ var _button = /*#__PURE__*/ _interop_require_default._(require("../button"));
 var _confirm = /*#__PURE__*/ _interop_require_default._(require("./confirm"));
 var _dialogwrap = require("./dialogwrap");
 var _configprovider = require("../configprovider");
-var _typings = require("../../utils/typings");
-var _mergeprops = require("../../utils/merge-props");
-var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _dialogwrap.defaultDialogWrapProps), {
     confirmText: '',
     cancelText: '',
     overlay: true,
@@ -38,6 +36,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     lockScroll: true,
     closeIconPosition: 'bottom',
     closeIcon: false,
+    zIndex: 1200,
     beforeCancel: function beforeCancel() {
         return true;
     },
@@ -47,7 +46,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var BaseDialog = function BaseDialog(props, ref) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var _mergeProps = (0, _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, footerDirection = _mergeProps.footerDirection, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onConfirm = _mergeProps.onConfirm, beforeCancel = _mergeProps.beforeCancel, beforeClose = _mergeProps.beforeClose, restProps = (0, _object_without_properties._)(_mergeProps, [
+    var _ref = (0, _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 = (0, _object_without_properties._)(_ref, [
         "visible",
         "footer",
         "hideConfirmButton",
@@ -169,10 +168,11 @@ var BaseDialog = function BaseDialog(props, ref) {
         style: {
             display: visible ? 'block' : 'none'
         }
-    }, /*#__PURE__*/ _react.default.createElement(_dialogwrap.DialogWrap, (0, _object_spread_props._)((0, _object_spread._)({}, props), {
+    }, /*#__PURE__*/ _react.default.createElement(_dialogwrap.DialogWrap, (0, _object_spread_props._)((0, _object_spread._)({}, restProps), {
         visible: visible,
         lockScroll: lockScroll,
         footer: renderFooter(),
+        footerDirection: footerDirection,
         close: renderCloseIcon(),
         onClose: onClose,
         onCancel: onCancel

package/dist/cjs/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/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

@@ -11,10 +11,6 @@
   padding: $dialog-padding;
   box-sizing: border-box;
 
-  &-overlay {
-    --nutui-overlay-zIndex: 1200;
-  }
-
   &-outer {
     position: fixed;
     max-height: 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;
@@ -29,7 +29,7 @@
   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, 0.5px);
 }
@@ -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 */
 }
@@ -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-4));
+  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);
@@ -214,37 +214,37 @@
 }
 .nut-button-primary-disabled, .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;
 }
@@ -256,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));
@@ -298,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;
 }
@@ -306,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;
 }
@@ -338,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));
@@ -392,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);
 }
 
@@ -462,9 +457,6 @@
   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%;
@@ -511,8 +503,8 @@
   transform: translateX(-50%);
 }
 .nut-dialog-close-bottom .nut-icon {
-  color: var(--nutui-gray-4);
-  background-color: var(--nutui-black-7);
+  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);
@@ -525,7 +517,7 @@
   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, var(--nutui-font-weight-bold, 600));
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -537,7 +529,7 @@
   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-7);
+  color: var(--nutui-color-title, #1a1a1a);
   word-wrap: break-word;
   word-break: break-all;
   white-space: pre-wrap;
@@ -561,7 +553,7 @@
 }
 .nut-dialog-footer.vertical .nut-dialog-footer-cancel {
   margin: 0;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-base, 14px);
   order: 2;
   display: flex;