@nutui/nutui-react-taro 3.0.21-cpp → 3.1.0-beta.2

package/dist/es/packages/popup/popup.js

@@ -4,13 +4,13 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import React, { useState, useEffect, useRef, useMemo, useCallback } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import { nextTick } from "@tarojs/taro";
 import { createPortal } from "react-dom";
+import { CSSTransition } from "react-transition-group";
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
-import ConfigurableCSSTransition from "../../utils/taro/ConfigurableCSSTransition";
 import { getRectInMultiPlatformWithoutCache } from "../../utils/taro/get-rect";
 import { defaultOverlayProps } from "../overlay/overlay";
 import Overlay from "../overlay/index";
@@ -42,71 +42,60 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps),
     },
     onTouchStart: function() {},
     onTouchMove: function() {},
-    onTouchEnd: function() {},
-    overlayProps: {},
-    animated: true
+    onTouchEnd: function() {}
 });
 // 默认1000，参看variables
 var _zIndex = 1100;
 export var Popup = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel, overlayProps = _$_object_spread.overlayProps, animated = _$_object_spread.animated;
-    var locale = useConfig().locale;
-    var transitionDuration = useMemo(function() {
-        return animated ? Number(duration) : 0;
-    }, [
-        animated,
-        duration
-    ]);
-    var _useState = _sliced_to_array(useState(zIndex || _zIndex), 2), index = _useState[0], setIndex = _useState[1];
+    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel;
+    var innerIndex = zIndex || _zIndex;
+    var _useState = _sliced_to_array(useState(innerIndex), 2), index = _useState[0], setIndex = _useState[1];
     var _useState1 = _sliced_to_array(useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = _sliced_to_array(useState(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
+    var _useState3 = _sliced_to_array(useState(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
     var nodeRef = useLockScrollTaro(innerVisible && lockScroll);
-    var topNodeRef = useRef(null);
+    var topNodeRef = React.useRef(null);
     var rootRect = useRef(null);
     var touchStartRef = useRef(0);
     var touchMoveDistanceRef = useRef(0);
     var heightRef = useRef(0);
     var defaultHeightRef = useRef(0);
     var isTouching = useRef(false);
+    var locale = useConfig().locale;
     var classPrefix = 'nut-popup';
-    var transitionName = useMemo(function() {
-        return transition || "".concat(classPrefix, "-slide-").concat(position);
-    }, [
-        transition,
-        position
-    ]);
-    var overlayStyles = useMemo(function() {
-        return _object_spread({}, overlayStyle);
-    }, [
-        overlayStyle
-    ]);
-    var contentZIndex = useMemo(function() {
-        return harmony() ? index + 1 : index // 解决harmony层级问题
-        ;
-    }, [
-        index
-    ]);
-    var popStyles = useMemo(function() {
-        return _object_spread({
-            zIndex: contentZIndex,
-            minHeight: minHeight
-        }, style);
-    }, [
-        contentZIndex,
-        minHeight,
-        style
-    ]);
-    var popClassName = useMemo(function() {
-        var _obj;
-        return classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    }, [
-        round,
-        position,
-        className
-    ]);
-    var _useState3 = _sliced_to_array(useState(''), 2), popupHeight = _useState3[0], setPopupHeight = _useState3[1];
-    var _useState4 = _sliced_to_array(useState(''), 2), topBottom = _useState4[0], setTopBottom = _useState4[1];
-    var getPopupHeight = useCallback(function() {
+    var overlayStyles = _object_spread({}, overlayStyle);
+    var contentZIndex = harmony() ? index + 1 : index // 解决harmony层级问题
+    ;
+    var popStyles = _object_spread({
+        zIndex: contentZIndex,
+        minHeight: minHeight
+    }, style);
+    var _obj;
+    var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
+    var _useState4 = _sliced_to_array(useState(''), 2), popupHeight = _useState4[0], setPopupHeight = _useState4[1];
+    var _useState5 = _sliced_to_array(useState(''), 2), topBottom = _useState5[0], setTopBottom = _useState5[1];
+    var resizeStyles = function() {
+        if (popupHeight !== '') {
+            return {
+                height: popupHeight
+            };
+        }
+    };
+    var open = function() {
+        if (!innerVisible) {
+            // 当高度改变后，再次打开时，将高度置为初始高度
+            if (position === 'bottom' && resizable && nodeRef.current && heightRef.current) {
+                setPopupHeight(pxTransform(defaultHeightRef.current));
+            }
+            setInnerVisible(true);
+            setIndex(++innerIndex);
+        }
+        if (destroyOnClose) {
+            setShowChildren(true);
+        }
+        onOpen && onOpen();
+    };
+    var getPopupHeight = function() {
         return _async_to_generator(function() {
             var _nodeRef_current, rect, height;
             return _ts_generator(this, function(_state) {
@@ -126,109 +115,48 @@ export var Popup = function(props) {
                 }
             });
         })();
-    }, [
-        nodeRef
-    ]);
-    var open = useCallback(function() {
-        if (!innerVisible) {
-            // 当高度改变后，再次打开时，将高度置为初始高度
-            if (position === 'bottom' && resizable && nodeRef.current && heightRef.current) {
-                setPopupHeight(pxTransform(defaultHeightRef.current));
-            }
-            setInnerVisible(true);
-            setIndex(function(prev) {
-                return prev + 1;
+    };
+    useEffect(function() {
+        if (innerVisible && topNodeRef.current && nodeRef.current) {
+            nextTick(function() {
+                nextTick(function() {
+                    getPopupHeight();
+                });
             });
         }
-        if (destroyOnClose) {
-            setShowChildren(true);
-        }
-        onOpen === null || onOpen === void 0 ? void 0 : onOpen();
     }, [
-        innerVisible,
-        position,
-        resizable,
-        destroyOnClose,
-        onOpen,
-        nodeRef,
-        setInnerVisible,
-        setIndex,
-        setShowChildren
+        innerVisible
     ]);
-    var close = useCallback(function() {
+    var close = function() {
         if (innerVisible) {
             setInnerVisible(false);
             if (destroyOnClose) {
                 setTimeout(function() {
                     setShowChildren(false);
-                }, transitionDuration);
+                }, Number(duration));
             }
-            onClose === null || onClose === void 0 ? void 0 : onClose();
+            onClose && onClose();
         }
-    }, [
-        innerVisible,
-        destroyOnClose,
-        transitionDuration,
-        onClose,
-        setInnerVisible,
-        setShowChildren
-    ]);
-    useEffect(function() {
-        visible ? open() : close();
-    }, [
-        visible,
-        open,
-        close
-    ]);
-    useEffect(function() {
-        if (innerVisible && topNodeRef.current && nodeRef.current) {
-            nextTick(function() {
-                nextTick(function() {
-                    getPopupHeight();
-                });
-            });
-        }
-    }, [
-        innerVisible,
-        getPopupHeight,
-        nodeRef
-    ]);
-    var handleOverlayClick = useCallback(function(e) {
+    };
+    var handleOverlayClick = function(e) {
         e.stopPropagation();
         if (closeOnOverlayClick && onOverlayClick(e)) {
             close();
         }
-    }, [
-        closeOnOverlayClick,
-        onOverlayClick,
-        close
-    ]);
-    var handleCloseIconClick = useCallback(function(e) {
+    };
+    var handleCloseIconClick = function(e) {
         onCloseIconClick(e) && close();
-    }, [
-        onCloseIconClick,
-        close
-    ]);
-    var renderCloseIcon = useCallback(function() {
-        if (!closeable) return null;
+    };
+    var renderCloseIcon = function() {
         var closeClasses = classNames("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
-        return /*#__PURE__*/ React.createElement(View, {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement(View, {
             className: closeClasses,
             onClick: handleCloseIconClick,
             ariaRole: "button",
             ariaLabel: closeAriaLabel || locale.close
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, {
-            ariaHidden: true
-        }));
-    }, [
-        closeable,
-        closeIconPosition,
-        handleCloseIconClick,
-        closeAriaLabel,
-        locale.close,
-        closeIcon
-    ]);
-    var renderTop = useCallback(function() {
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
+    };
+    var renderTop = function() {
         if (!top) return null;
         return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-bottom-top"),
@@ -237,11 +165,8 @@ export var Popup = function(props) {
                 bottom: topBottom
             }
         }, top);
-    }, [
-        top,
-        topBottom
-    ]);
-    var renderTitle = useCallback(function() {
+    };
+    var renderTitle = function() {
         if (left || title || description) {
             return /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(classPrefix, "-title")
@@ -258,15 +183,8 @@ export var Popup = function(props) {
         if (closeable) {
             return renderCloseIcon();
         }
-    }, [
-        left,
-        title,
-        description,
-        position,
-        closeable,
-        renderCloseIcon
-    ]);
-    var handleTouchStart = useCallback(function(event) {
+    };
+    var handleTouchStart = function(event) {
         return _async_to_generator(function() {
             var _nodeRef_current, _rootRect_current, e, rect;
             return _ts_generator(this, function(_state) {
@@ -296,13 +214,8 @@ export var Popup = function(props) {
                 }
             });
         })();
-    }, [
-        position,
-        resizable,
-        onTouchStart,
-        nodeRef
-    ]);
-    var handleTouchMove = useCallback(function(event) {
+    };
+    var handleTouchMove = function(event) {
         if (position !== 'bottom' || !resizable || !nodeRef.current || !rootRect.current) return;
         var e = event;
         e.stopPropagation();
@@ -321,42 +234,21 @@ export var Popup = function(props) {
             }
         };
         requestAnimationFrame(handleMove);
-    }, [
-        position,
-        resizable,
-        minHeight,
-        onTouchMove,
-        nodeRef
-    ]);
-    var handleTouchEnd = useCallback(function(event) {
+    };
+    var handleTouchEnd = function(event) {
         if (position !== 'bottom' || !resizable || !nodeRef.current || !rootRect.current) return;
         var e = event;
         isTouching.current = false;
         var min = typeof minHeight === 'number' ? minHeight : parseInt(String(minHeight || 0), 10) || 0;
         var currentHeight = Math.max(min, heightRef.current - touchMoveDistanceRef.current);
         onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(currentHeight, e);
-    }, [
-        position,
-        resizable,
-        minHeight,
-        onTouchEnd,
-        nodeRef
-    ]);
-    var renderPop = function() {
-        return /*#__PURE__*/ React.createElement(ConfigurableCSSTransition, {
-            nodeRef: nodeRef,
-            classNames: transitionName,
-            mountOnEnter: true,
-            unmountOnExit: destroyOnClose,
-            timeout: Number(transitionDuration),
-            in: innerVisible,
-            onEntered: afterShow,
-            onExited: afterClose
-        }, /*#__PURE__*/ React.createElement(View, {
+    };
+    var renderContent = function() {
+        return /*#__PURE__*/ React.createElement(View, {
             ref: nodeRef,
-            style: _object_spread({}, popStyles, popupHeight ? {
-                height: popupHeight
-            } : {}),
+            style: _object_spread(_object_spread_props(_object_spread({}, popStyles), {
+                display: innerVisible ? (popStyles === null || popStyles === void 0 ? void 0 : popStyles.display) || 'block' : 'none'
+            }), resizeStyles()),
             className: popClassName,
             onClick: onClick,
             catchMove: lockScroll,
@@ -364,20 +256,43 @@ export var Popup = function(props) {
             onTouchMove: handleTouchMove,
             onTouchEnd: handleTouchEnd,
             onTouchCancel: handleTouchEnd
-        }, renderTop(), renderTitle(), showChildren ? children : null));
+        }, renderTop(), renderTitle(), showChildren ? children : null);
+    };
+    var renderPop = function() {
+        return /*#__PURE__*/ React.createElement(CSSTransition, {
+            nodeRef: nodeRef,
+            classNames: transitionName,
+            mountOnEnter: true,
+            unmountOnExit: destroyOnClose,
+            timeout: duration,
+            in: innerVisible,
+            onEntered: afterShow,
+            onExited: afterClose
+        }, renderContent());
     };
     var renderNode = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, _object_spread({
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
             zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
-            duration: transitionDuration,
+            duration: duration,
             onClick: handleOverlayClick
-        }, overlayProps)) : null, renderPop());
+        }) : null, renderPop());
     };
+    useEffect(function() {
+        visible ? open() : close();
+    }, [
+        visible
+    ]);
+    useEffect(function() {
+        setTransitionName(transition || "".concat(classPrefix, "-slide-").concat(position));
+    }, [
+        position,
+        transition
+    ]);
     var resolveContainer = function(getContainer) {
         return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };

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

@@ -47,7 +47,9 @@
       position: absolute;
       top: $popup-title-padding;
       right: $popup-title-padding;
-
+      display: flex;
+      align-items: center;
+      justify-content: center;
       z-index: 1;
       width: $popup-icon-size;
       height: $popup-icon-size;
@@ -81,7 +83,7 @@
     right: auto;
     bottom: auto;
     min-height: 10%;
-    max-width: 295px;
+    max-width: scale-px(295px);
     transform: translate(-50%, -50%);
 
     &.nut-popup-round {
@@ -110,7 +112,7 @@
     right: 0;
     left: auto;
     bottom: auto;
-    width: 100px;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {
@@ -123,7 +125,7 @@
     left: 0;
     right: auto;
     bottom: auto;
-    width: 100px;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {

package/dist/es/packages/popup/style/style.css

@@ -1,4 +1,14 @@
 @charset "UTF-8";
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -9,7 +19,7 @@
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-base, 14px);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-popup-title {
   display: flex;
@@ -17,7 +27,7 @@
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
-  padding: var(--nutui-popup-title-padding, 11px);
+  padding: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
   position: relative;
 }
 .nut-popup-title-wrapper {
@@ -29,28 +39,31 @@
 .nut-popup-title-title {
   color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-popup-title-description {
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-description-gap {
-  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1))));
 }
 .nut-popup-title-left {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 11px);
-  right: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  display: flex;
+  align-items: center;
+  justify-content: center;
   z-index: 1;
-  width: var(--nutui-popup-icon-size, 20px);
-  height: var(--nutui-popup-icon-size, 20px);
+  width: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
+  height: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
   color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
@@ -58,16 +71,16 @@
   opacity: 0.7;
 }
 .nut-popup-title-right-top-left {
-  top: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-left {
-  bottom: var(--nutui-popup-title-padding, 11px);
-  left: var(--nutui-popup-title-padding, 11px);
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-right {
-  right: var(--nutui-popup-title-padding, 11px);
-  bottom: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-center {
   top: 50%;
@@ -75,11 +88,11 @@
   right: auto;
   bottom: auto;
   min-height: 10%;
-  max-width: 295px;
+  max-width: calc(295px * var(--nut-scale-f, 1));
   transform: translate(-50%, -50%);
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -89,7 +102,7 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0;
 }
 .nut-popup-bottom-top {
   position: absolute;
@@ -99,22 +112,22 @@
   right: 0;
   left: auto;
   bottom: auto;
-  width: 100px;
+  width: calc(100px * var(--nut-scale-f, 1));
   height: 100%;
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
   right: auto;
   bottom: auto;
-  width: 100px;
+  width: calc(100px * var(--nut-scale-f, 1));
   height: 100%;
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0;
 }
 .nut-popup-top {
   top: 0;
@@ -124,7 +137,7 @@
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -306,27 +319,27 @@
 [dir=rtl] .nut-popup-title-left,
 .nut-rtl .nut-popup-title-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right,
 .nut-rtl .nut-popup-title-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-top-left,
 .nut-rtl .nut-popup-title-right-top-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-left,
 .nut-rtl .nut-popup-title-right-bottom-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-right,
 .nut-rtl .nut-popup-title-right-bottom-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title .nut-icon-ArrowLeft,
 .nut-rtl .nut-popup-title .nut-icon-ArrowLeft {