npm - @nutui/nutui-react-taro - Versions diffs - 3.0.18-cpp.beta.1 → 3.0.19-beta.1 - Mend

@nutui/nutui-react-taro 3.0.18-cpp.beta.1 → 3.0.19-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (925) hide show

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

@@ -22,6 +22,8 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps,
     content: '',
     header: '',
     footer: '',
+    cancelBadge: '',
+    confirmBadge: '',
     confirmText: '',
     cancelText: '',
     hideConfirmButton: false,
@@ -48,7 +50,7 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps,
     }
 });
 export var BaseDialog = function(props) {
-    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
+    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, cancelBadge = _useParams_params.cancelBadge, confirmBadge = _useParams_params.confirmBadge, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     var classPrefix = 'nut-dialog';
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(useState(false), 2), loading = _useState[0], setLoading = _useState[1];
@@ -66,8 +68,8 @@ export var BaseDialog = function(props) {
             if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
             onCancel();
         };
-        var handleOk = /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(e) {
+        var handleOk = function(e) {
+            return _async_to_generator(function() {
                 var e1;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
@@ -107,11 +109,8 @@ export var BaseDialog = function(props) {
                             ];
                     }
                 });
-            });
-            return function handleOk(e) {
-                return _ref.apply(this, arguments);
-            };
-        }();
+            })();
+        };
         var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
         var renderCancelOfVertical = function() {
             return !hideCancelButton && /*#__PURE__*/ React.createElement(View, {
@@ -122,17 +121,43 @@ export var BaseDialog = function(props) {
             }, cancelText || locale.cancel);
         };
         var renderCancel = function() {
-            return !hideCancelButton && /*#__PURE__*/ React.createElement(Button, {
+            return !hideCancelButton && /*#__PURE__*/ React.createElement(React.Fragment, null, cancelBadge ? /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-footer-cancel-container")
+            }, /*#__PURE__*/ React.createElement(Button, {
                 type: "default",
                 size: "large",
                 className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
                 onClick: function(e) {
                     return handleCancel(e);
                 }
-            }, cancelText || locale.cancel);
+            }, cancelText || locale.cancel), cancelBadge ? /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-footer-cancel-badge")
+            }, cancelBadge) : null) : /*#__PURE__*/ React.createElement(Button, {
+                type: "default",
+                size: "large",
+                className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+                onClick: function(e) {
+                    return handleCancel(e);
+                }
+            }, cancelText || locale.cancel));
         };
         var renderConfirm = function() {
-            return !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
+            return !hideConfirmButton && /*#__PURE__*/ React.createElement(React.Fragment, null, confirmBadge ? /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-footer-ok-container")
+            }, /*#__PURE__*/ React.createElement(Button, {
+                type: "primary",
+                size: "large",
+                className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
+                    disabled: disableConfirmButton
+                }),
+                disabled: disableConfirmButton,
+                onClick: function(e) {
+                    return handleOk(e);
+                },
+                loading: loading
+            }, confirmText || locale.confirm), confirmBadge ? /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-footer-ok-badge")
+            }, confirmBadge) : null) : /*#__PURE__*/ React.createElement(Button, {
                 type: "primary",
                 size: "large",
                 className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
@@ -143,7 +168,7 @@ export var BaseDialog = function(props) {
                     return handleOk(e);
                 },
                 loading: loading
-            }, confirmText || locale.confirm);
+            }, confirmText || locale.confirm));
         };
         return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, footerDirection === 'vertical' ? /*#__PURE__*/ React.createElement(React.Fragment, null, renderConfirm(), renderCancelOfVertical()) : /*#__PURE__*/ React.createElement(React.Fragment, null, renderCancel(), renderConfirm()));
     };
@@ -158,7 +183,11 @@ export var BaseDialog = function(props) {
         var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement(View, {
             className: closeClasses,
-            onClick: handleClose
+            onClick: handleClose,
+            ariaRole: "button",
+            ariaLabel: locale.close,
+            // @ts-ignore
+            tabIndex: 0
         }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e) {

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

@@ -16,10 +16,12 @@
   &-outer {
     position: fixed;
     max-height: 100%;
-    background-color: $white;
+    background-color: $dialog-background;
+    /* #ifndef dynamic*/
     transition:
       transform 0.2s,
       -webkit-transform 0.2s;
+    /* #endif */
     -webkit-overflow-scrolling: touch;
     top: 50%;
     left: 50%;
@@ -81,6 +83,7 @@
     font-size: $dialog-header-font-size;
     font-weight: $dialog-header-font-weight;
     color: $color-title;
+    margin-bottom: $dialog-title-margin-bottom;
     @include oneline-ellipsis();
   }
@@ -118,27 +121,83 @@
         display: flex;
         justify-content: center;
         margin-top: $dialog-vertical-footer-ok-margin-top;
+        background: transparent;
       }
     }
     .nut-button {
       min-width: $dialog-footer-button-min-width;
+      border-radius: $dialog-footer-button-border;
+      padding: var(--nutui-button-large-padding, 0 12px);
     }
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
       background: $dialog-footer-cancel-bg;
+      color: $button-default-color;
+      border-color: var(--nutui-button-default-border-color, transparent);
+      .nut-button-children {
+        color: $button-default-color;
+      }
+    }
+    &-ok-container {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: space-around;
+      .nut-dialog-footer-ok-badge {
+        position: absolute;
+        right: 0;
+        top: $dialog-footer-badge-top;
+        display: flex;
+        align-items: center;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-ok;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-ok;
+      }
     }
     &-ok {
       max-width: $dialog-footer-ok-max-width;
-      font-weight: $font-weight-bold;
+      font-weight: $font-weight-medium;
+      .nut-button-children {
+        font-weight: $font-weight-medium;
+      }
     }
     &-block {
       &.nut-button {
         min-width: 100%;
       }
     }
+    &-cancel-container {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: space-around;
+      .nut-dialog-footer-cancel-badge {
+        position: absolute;
+        right: $dialog-footer-cancel-margin-right;
+        top: $dialog-footer-badge-top;
+        display: flex;
+        align-items: center;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-cancel;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-cancel;
+      }
+    }
   }
 }

package/dist/es/packages/dialog/style/style.css CHANGED Viewed

@@ -18,8 +18,10 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-background-overlay, #ffffff));
+  /* #ifndef dynamic*/
   transition: transform 0.2s, -webkit-transform 0.2s;
+  /* #endif */
   -webkit-overflow-scrolling: touch;
   top: 50%;
   left: 50%;
@@ -72,9 +74,10 @@
 .nut-dialog-header {
   display: block;
   text-align: center;
-  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-dialog-header-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-color-title, #1a1a1a);
+  margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -82,7 +85,7 @@
 }
 .nut-dialog-content {
   width: 100%;
-  margin: var(--nutui-dialog-content-margin, 12px 0 16px 0);
+  margin: var(--nutui-dialog-content-margin, 0 0 20px 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);
@@ -112,21 +115,72 @@
   display: flex;
   justify-content: center;
   margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 16px);
+  background: transparent;
 }
 .nut-dialog-footer .nut-button {
   min-width: var(--nutui-dialog-footer-button-min-width, 117px);
+  border-radius: var(--nutui-dialog-footer-button-border, 6px);
+  padding: var(--nutui-button-large-padding, 0 12px);
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
-  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, transparent));
+  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-color-background-sunken, #f7f8fc));
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
+  border-color: var(--nutui-button-default-border-color, transparent);
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
+}
+.nut-dialog-footer-ok-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-ok-container .nut-dialog-footer-ok-badge {
+  position: absolute;
+  right: 0;
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-ok, var(--nutui-color-danger-light, #ffebef));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-ok, var(--nutui-color-primary, #ff0f23));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
-  font-weight: var(--nutui-font-weight-bold, 600);
+  font-weight: var(--nutui-font-weight-medium, 500);
+}
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-medium, 500);
 }
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }
+.nut-dialog-footer-cancel-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-cancel-container .nut-dialog-footer-cancel-badge {
+  position: absolute;
+  right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-cancel, var(--nutui-color-danger-light, #ffebef));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-cancel, var(--nutui-color-primary, #ff0f23));
+}
 [dir=rtl] .nut-dialog-outer,
 .nut-rtl .nut-dialog-outer {

package/dist/es/packages/dialog/style/style.harmony.css CHANGED Viewed

@@ -57,6 +57,9 @@
   transform: translate(-50%, -50%);
   opacity: 0;
   content: " ";
+  /* #ifdef dynamic*/
+  pointer-events: none;
+  /* #endif */
 }
 .nut-button::after {
   border: none;
@@ -138,7 +141,7 @@
 .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-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
   border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-large .nut-button-text {
@@ -148,12 +151,12 @@
   margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
 }
 .nut-button-large .nut-icon {
-  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
+  width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
+  height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
 }
 .nut-button-large-children {
-  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
 }
 .nut-button-small {
   height: var(--nutui-button-small-height, 28px);
@@ -449,8 +452,10 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-background-overlay, #ffffff));
+  /* #ifndef dynamic*/
   transition: transform 0.2s, -webkit-transform 0.2s;
+  /* #endif */
   -webkit-overflow-scrolling: touch;
   top: 50%;
   left: 50%;
@@ -503,9 +508,10 @@
 .nut-dialog-header {
   display: block;
   text-align: center;
-  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-dialog-header-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-color-title, #1a1a1a);
+  margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -513,7 +519,7 @@
 }
 .nut-dialog-content {
   width: 100%;
-  margin: var(--nutui-dialog-content-margin, 12px 0 16px 0);
+  margin: var(--nutui-dialog-content-margin, 0 0 20px 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);
@@ -543,21 +549,72 @@
   display: flex;
   justify-content: center;
   margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 16px);
+  background: transparent;
 }
 .nut-dialog-footer .nut-button {
   min-width: var(--nutui-dialog-footer-button-min-width, 117px);
+  border-radius: var(--nutui-dialog-footer-button-border, 6px);
+  padding: var(--nutui-button-large-padding, 0 12px);
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
-  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, transparent));
+  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-color-background-sunken, #f7f8fc));
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
+  border-color: var(--nutui-button-default-border-color, transparent);
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
+}
+.nut-dialog-footer-ok-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-ok-container .nut-dialog-footer-ok-badge {
+  position: absolute;
+  right: 0;
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-ok, var(--nutui-color-danger-light, #ffebef));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-ok, var(--nutui-color-primary, #ff0f23));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
-  font-weight: var(--nutui-font-weight-bold, 600);
+  font-weight: var(--nutui-font-weight-medium, 500);
+}
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-medium, 500);
 }
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }
+.nut-dialog-footer-cancel-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-cancel-container .nut-dialog-footer-cancel-badge {
+  position: absolute;
+  right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-cancel, var(--nutui-color-danger-light, #ffebef));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-cancel, var(--nutui-color-primary, #ff0f23));
+}
 [dir=rtl] .nut-dialog-outer,
 .nut-rtl .nut-dialog-outer {

package/dist/es/packages/dialog/style-jmapp/dialog.scss CHANGED Viewed

@@ -16,10 +16,12 @@
   &-outer {
     position: fixed;
     max-height: 100%;
-    background-color: $white;
+    background-color: $dialog-background;
+    /* #ifndef dynamic*/
     transition:
       transform 0.2s,
       -webkit-transform 0.2s;
+    /* #endif */
     -webkit-overflow-scrolling: touch;
     top: 50%;
     left: 50%;
@@ -81,6 +83,7 @@
     font-size: $dialog-header-font-size;
     font-weight: $dialog-header-font-weight;
     color: $color-title;
+    margin-bottom: $dialog-title-margin-bottom;
     @include oneline-ellipsis();
   }
@@ -118,27 +121,83 @@
         display: flex;
         justify-content: center;
         margin-top: $dialog-vertical-footer-ok-margin-top;
+        background: transparent;
       }
     }
     .nut-button {
       min-width: $dialog-footer-button-min-width;
+      border-radius: $dialog-footer-button-border;
+      padding: var(--nutui-button-large-padding, 0 12px);
     }
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
       background: $dialog-footer-cancel-bg;
+      color: $button-default-color;
+      border-color: var(--nutui-button-default-border-color, transparent);
+      .nut-button-children {
+        color: $button-default-color;
+      }
+    }
+    &-ok-container {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: space-around;
+      .nut-dialog-footer-ok-badge {
+        position: absolute;
+        right: 0;
+        top: $dialog-footer-badge-top;
+        display: flex;
+        align-items: center;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-ok;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-ok;
+      }
     }
     &-ok {
       max-width: $dialog-footer-ok-max-width;
-      font-weight: $font-weight-bold;
+      font-weight: $font-weight-medium;
+      .nut-button-children {
+        font-weight: $font-weight-medium;
+      }
     }
     &-block {
       &.nut-button {
         min-width: 100%;
       }
     }
+    &-cancel-container {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: space-around;
+      .nut-dialog-footer-cancel-badge {
+        position: absolute;
+        right: $dialog-footer-cancel-margin-right;
+        top: $dialog-footer-badge-top;
+        display: flex;
+        align-items: center;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-cancel;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-cancel;
+      }
+    }
   }
 }

package/dist/es/packages/dialog/style-jmapp/style.css CHANGED Viewed

@@ -18,8 +18,10 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-surface-2));
+  /* #ifndef dynamic*/
   transition: transform 0.2s, -webkit-transform 0.2s;
+  /* #endif */
   -webkit-overflow-scrolling: touch;
   top: 50%;
   left: 50%;
@@ -75,6 +77,7 @@
   font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-text-large));
   font-weight: var(--nutui-dialog-header-font-weight, normal);
   color: var(--nutui-color-title);
+  margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -112,21 +115,72 @@
   display: flex;
   justify-content: center;
   margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 5px);
+  background: transparent;
 }
 .nut-dialog-footer .nut-button {
   min-width: var(--nutui-dialog-footer-button-min-width, 117px);
+  border-radius: var(--nutui-dialog-footer-button-border, 6px);
+  padding: var(--nutui-button-large-padding, 0 12px);
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
   background: var(--nutui-dialog-footer-cancel-bg, transparent);
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
+  border-color: var(--nutui-button-default-border-color, transparent);
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
+}
+.nut-dialog-footer-ok-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-ok-container .nut-dialog-footer-ok-badge {
+  position: absolute;
+  right: 0;
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-ok, var(--nutui-color-danger-light));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-ok, var(--nutui-color-primary));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
-  font-weight: var(--nutui-font-weight-bold);
+  font-weight: var(--nutui-font-weight-medium, 500);
+}
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-medium, 500);
 }
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }
+.nut-dialog-footer-cancel-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-cancel-container .nut-dialog-footer-cancel-badge {
+  position: absolute;
+  right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-cancel, var(--nutui-color-danger-light));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-cancel, var(--nutui-color-primary));
+}
 [dir=rtl] .nut-dialog-outer,
 .nut-rtl .nut-dialog-outer {