chore: 对齐master

Author: QiuShuiBai

packages/mpx-cube-ui/src/common/stylus/theme/components/popup.styl

@@ -5,6 +5,6 @@ $popup-mask-opacity := 0.4 // 遮罩透明度
 $popup-default-animation-time := 0.3s // 默认动画时间
 $popup-default-animation-fn := ease // 默认动画函数
 
-$popup-mask-transition := opacity 0.3s ease // 遮罩过渡
-$popup-mask-hide-transition := opacity 0.3s ease // 遮罩隐藏过渡
+$popup-mask-transition := opacity 0.2s ease // 遮罩过渡
+$popup-mask-hide-transition := opacity 0.2s ease // 遮罩隐藏过渡
 $popup-default-hide-animation-fn := ease // 默认隐藏动画函数

packages/mpx-cube-ui/src/components/dialog/css.rn.styl

@@ -27,9 +27,6 @@
   margin-top $var(dialog-head-icon-margin-top)
   border-radius-all($var(dialog-head-icon-border-top-left-radius), $var(dialog-head-icon-border-top-right-radius), $var(dialog-head-icon-border-bottom-right-radius), $var(dialog-head-icon-border-bottom-left-radius))
 
-.cube-dialog-container
-  width 100%
-
 .cube-dialog-confirm
   position relative
   overflow hidden

packages/mpx-cube-ui/src/components/popup/css.rn.styl

@@ -43,7 +43,7 @@
   background-color $var(mask-bgc_opacity)
   opacity 0
 
-.cube-popup-move-up
+.move-up
   transform translateY(999)
 .move-left
   transform translateX(999)

packages/mpx-cube-ui/src/components/popup/css.styl

@@ -70,13 +70,13 @@
     .cube-popup-mask
       opacity $var(popup-mask-opacity)
     .cube-popup-content
-      &.cube-popup-move-up
+      &.move-up
         popup-transition(popup-move-up-show, $var(popup-default-animation-time), $var(popup-default-animation-fn))
-      &.cube-popup-move-right
+      &.move-right
         popup-transition(popup-move-right-show)
-      &.cube-popup-move-left
+      &.move-left
         popup-transition(popup-move-left-show)
-      &.cube-popup-move-down
+      &.move-down
         popup-transition(popup-move-down-show)
       &.move-center
         popup-transition(popup-move-center-show)
@@ -93,13 +93,13 @@
       .cube-popup-mask
         transition: $var(popup-mask-hide-transition)
     .cube-popup-content
-      &.cube-popup-move-up
+      &.move-up
         popup-transition(popup-move-up-hide, $var(popup-default-animation-time), $var(popup-default-hide-animation-fn))
-      &.cube-popup-move-right
+      &.move-right
         popup-transition(popup-move-right-hide)
-      &.cube-popup-move-left
+      &.move-left
         popup-transition(popup-move-left-hide)
-      &.cube-popup-move-down
+      &.move-down
         popup-transition(popup-move-down-hide)
       &.move-center
         popup-transition(popup-move-center-hide)

packages/mpx-cube-ui/src/components/popup/index.mpx

@@ -64,8 +64,8 @@
       </view>
       <view
         wx:ref="popup-content"
-        class="cube-popup-content {{ transition ? `cube-popup-${transition}` : '' }}"
-        wx:style="{{ styleConfig.content }}"
+        class="cube-popup-content {{ transition }}"
+        wx:style="{{ [styleConfig.content, contentTranslateStyle] }}"
         animation="{{ animationData }}">
         <slot></slot>
       </view>

packages/mpx-cube-ui/src/components/popup/popup.ts

@@ -139,12 +139,12 @@ createComponent({
       this.isVisible = true
       this.display = true
       this.visibleClass = 'show'
-      this.transitionClass = this.transition ? `cube-popup-${this.transition}` : ''
+      this.transitionClass = this.transition
     },
     hide() {
       this.isVisible = false
       this.visibleClass = 'hide'
-      this.transitionClass = this.transition ? `cube-popup-${this.transition}` : ''
+      this.transitionClass = this.transition
     }
   }
 })