@nutui/nutui-react-taro 3.0.19-cpp.14 → 3.0.19-cpp.15

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

@@ -121,6 +121,7 @@
         display: flex;
         justify-content: center;
         margin-top: $dialog-vertical-footer-ok-margin-top;
+        background: transparent;
       }
     }
 
@@ -140,12 +141,36 @@
       }
     }
 
+    &-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-medium;
       .nut-button-children {
         font-weight: $font-weight-medium;
       }
+
     }
 
     &-block {
@@ -153,6 +178,28 @@
         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

@@ -115,6 +115,7 @@
   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);
@@ -130,6 +131,26 @@
 .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-medium, 500);
@@ -140,6 +161,26 @@
 .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 {

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

@@ -121,6 +121,7 @@
         display: flex;
         justify-content: center;
         margin-top: $dialog-vertical-footer-ok-margin-top;
+        background: transparent;
       }
     }
 
@@ -140,12 +141,36 @@
       }
     }
 
+    &-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-medium;
       .nut-button-children {
         font-weight: $font-weight-medium;
       }
+
     }
 
     &-block {
@@ -153,6 +178,28 @@
         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-jrkf/style.css

@@ -115,6 +115,7 @@
   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);
@@ -130,6 +131,26 @@
 .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, #ff6666));
+}
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
   font-weight: var(--nutui-font-weight-medium, 500);
@@ -140,6 +161,26 @@
 .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, #ff6666));
+}
 
 [dir=rtl] .nut-dialog-outer,
 .nut-rtl .nut-dialog-outer {

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

@@ -174,7 +174,7 @@
 
   // .required {
   //   left: auto;
-  //   right: 0.1em; 
+  //   right: 0.1em;
   // }
 }
 

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

@@ -174,7 +174,7 @@
 
   // .required {
   //   left: auto;
-  //   right: 0.1em; 
+  //   right: 0.1em;
   // }
 }
 

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

@@ -174,7 +174,7 @@
 
   // .required {
   //   left: auto;
-  //   right: 0.1em; 
+  //   right: 0.1em;
   // }
 }
 

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

@@ -59,7 +59,7 @@
 
 .nut-menu-placeholder-element {
   position: fixed;
-  top: calc(-1 * var(--menu-bar-line-height)); 
+  top: calc(-1 * var(--menu-bar-line-height));
   left: 0;
   right: 0;
   z-index: $menu-bar-opened-z-index;

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

@@ -59,7 +59,7 @@
 
 .nut-menu-placeholder-element {
   position: fixed;
-  top: calc(-1 * var(--menu-bar-line-height)); 
+  top: calc(-1 * var(--menu-bar-line-height));
   left: 0;
   right: 0;
   z-index: $menu-bar-opened-z-index;

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

@@ -59,7 +59,7 @@
 
 .nut-menu-placeholder-element {
   position: fixed;
-  top: calc(-1 * var(--menu-bar-line-height)); 
+  top: calc(-1 * var(--menu-bar-line-height));
   left: 0;
   right: 0;
   z-index: $menu-bar-opened-z-index;

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

@@ -75,7 +75,7 @@
 
   &-left-icon,
   &-right-icon {
-     /* #ifdef dynamic*/
+    /* #ifdef dynamic*/
     display: flex;
     /* #endif */
     /* #ifndef dynamic*/

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

@@ -75,7 +75,7 @@
 
   &-left-icon,
   &-right-icon {
-     /* #ifdef dynamic*/
+    /* #ifdef dynamic*/
     display: flex;
     /* #endif */
     /* #ifndef dynamic*/

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

@@ -75,7 +75,7 @@
 
   &-left-icon,
   &-right-icon {
-     /* #ifdef dynamic*/
+    /* #ifdef dynamic*/
     display: flex;
     /* #endif */
     /* #ifndef dynamic*/

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

@@ -77,7 +77,7 @@
     max-height: initial;
     overflow-y: initial;
     /* #endif */
-    
+
     &-group {
       padding: 0 $popover-padding;
     }

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

@@ -77,7 +77,7 @@
     max-height: initial;
     overflow-y: initial;
     /* #endif */
-    
+
     &-group {
       padding: 0 $popover-padding;
     }

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

@@ -77,7 +77,7 @@
     max-height: initial;
     overflow-y: initial;
     /* #endif */
-    
+
     &-group {
       padding: 0 $popover-padding;
     }

package/dist/es/packages/swipe/swipe.js

@@ -261,8 +261,6 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
             }
             close();
         };
-        // start 关掉动效
-        // end 打开
         document.addEventListener('touchstart', handler);
         return function() {
             document.removeEventListener('touchstart', handler);

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

@@ -38,6 +38,8 @@ export interface BaseDialog extends DialogWrapProps {
     * 取消按钮文案
     */
     cancelText: ReactNode
+    confirmBadge: ReactNode;
+    cancelBadge: ReactNode;
     /**
     * 是否隐藏确定按钮
     */

package/dist/nutui.react.umd.js

@@ -15116,6 +15116,8 @@
     content: "",
     header: "",
     footer: "",
+    cancelBadge: "",
+    confirmBadge: "",
     confirmText: "",
     cancelText: "",
     hideConfirmButton: false,
@@ -15145,7 +15147,7 @@
     }
   });
   var BaseDialog = function(props) {
-    var _useParams = useParams(mergeProps(defaultProps$H, 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, content2 = _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$H, 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, content2 = _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 classPrefix2 = "nut-dialog";
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(React.useState(false), 2), loading = _useState[0], setLoading = _useState[1];
@@ -15215,17 +15217,43 @@
         }, cancelText || locale.cancel);
       };
       var renderCancel = function() {
-        return !hideCancelButton && /* @__PURE__ */ React.createElement(Button, {
+        return !hideCancelButton && /* @__PURE__ */ React.createElement(React.Fragment, null, cancelBadge ? /* @__PURE__ */ React.createElement(components.View, {
+          className: "".concat(classPrefix2, "-footer-cancel-container")
+        }, /* @__PURE__ */ React.createElement(Button, {
           type: "default",
           size: "large",
           className: "".concat(classPrefix2, "-footer-cancel ").concat(btnClass),
           onClick: function(e) {
             return handleCancel(e);
           }
-        }, cancelText || locale.cancel);
+        }, cancelText || locale.cancel), cancelBadge ? /* @__PURE__ */ React.createElement(components.View, {
+          className: "".concat(classPrefix2, "-footer-cancel-badge")
+        }, cancelBadge) : null) : /* @__PURE__ */ React.createElement(Button, {
+          type: "default",
+          size: "large",
+          className: "".concat(classPrefix2, "-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(components.View, {
+          className: "".concat(classPrefix2, "-footer-ok-container")
+        }, /* @__PURE__ */ React.createElement(Button, {
+          type: "primary",
+          size: "large",
+          className: classNames("".concat(classPrefix2, "-footer-ok ").concat(btnClass), {
+            disabled: disableConfirmButton
+          }),
+          disabled: disableConfirmButton,
+          onClick: function(e) {
+            return handleOk(e);
+          },
+          loading
+        }, confirmText || locale.confirm), confirmBadge ? /* @__PURE__ */ React.createElement(components.View, {
+          className: "".concat(classPrefix2, "-footer-ok-badge")
+        }, confirmBadge) : null) : /* @__PURE__ */ React.createElement(Button, {
           type: "primary",
           size: "large",
           className: classNames("".concat(classPrefix2, "-footer-ok ").concat(btnClass), {
@@ -15236,7 +15264,7 @@
             return handleOk(e);
           },
           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()));
     };