Merge branch 'feat/v3.2' into next

Author: robinv8

packages/taro-ui/rn/components/countdown/index.tsx

@@ -64,8 +64,12 @@ export default class AtCountdown extends React.Component<
 
     if (this.seconds > 0) {
       day = this.props.isShowDay ? Math.floor(this.seconds / (60 * 60 * 24)) : 0
-      hours = Math.floor(this.seconds / (60 * 60)) - day * 24
-      minutes = Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60
+      hours = this.props.isShowHour
+        ? Math.floor(this.seconds / (60 * 60)) - day * 24
+        : 0
+      minutes = this.props.isShowMinute
+        ? Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60
+        : 0
       seconds =
         Math.floor(this.seconds) -
         day * 24 * 60 * 60 -
@@ -134,7 +138,8 @@ export default class AtCountdown extends React.Component<
       format,
       isShowDay,
       isCard,
-      isShowHour
+      isShowHour,
+      isShowMinute
     } = this.props
     const { _day, _hours, _minutes, _seconds } = this.state
 
@@ -150,25 +155,15 @@ export default class AtCountdown extends React.Component<
         style={customStyle}
       >
         {isShowDay && (
-          <AtCountdownItem isCard={isCard} num={_day} separator={format!.day} />
+          <AtCountdownItem num={_day} separator={format?.day || '天'} />
         )}
         {isShowHour && (
-          <AtCountdownItem
-            isCard={isCard}
-            num={_hours}
-            separator={format!.hours}
-          />
+          <AtCountdownItem num={_hours} separator={format?.hours || ''} />
         )}
-        <AtCountdownItem
-          isCard={isCard}
-          num={_minutes}
-          separator={format!.minutes}
-        />
-        <AtCountdownItem
-          isCard={isCard}
-          num={_seconds}
-          separator={format!.seconds}
-        />
+        {isShowMinute && (
+          <AtCountdownItem num={_minutes} separator={format?.minutes || ''} />
+        )}
+        <AtCountdownItem num={_seconds} separator={format?.seconds || ''} />
       </View>
     )
   }
@@ -180,6 +175,7 @@ AtCountdown.defaultProps = {
   isCard: false,
   isShowDay: false,
   isShowHour: true,
+  isShowMinute: true,
   format: {
     day: '天',
     hours: '时',
@@ -198,6 +194,7 @@ AtCountdown.propTypes = {
   isCard: PropTypes.bool,
   isShowDay: PropTypes.bool,
   isShowHour: PropTypes.bool,
+  isShowMinute: PropTypes.bool,
   format: PropTypes.object,
   day: PropTypes.number,
   hours: PropTypes.number,

packages/taro-ui/src/components/noticebar/index.tsx

@@ -25,7 +25,7 @@ export default class AtNoticebar extends React.Component<
       animationData: {
         actions: [{}]
       },
-      dura: 15,
+      dura: 0,
       isWEAPP: Taro.getEnv() === Taro.ENV_TYPE.WEAPP,
       isALIPAY: Taro.getEnv() === Taro.ENV_TYPE.ALIPAY,
       isWEB: Taro.getEnv() === Taro.ENV_TYPE.WEB
@@ -135,8 +135,13 @@ export default class AtNoticebar extends React.Component<
     const innerClassName = ['at-noticebar__content-inner']
     if (marquee) {
       close = false
-      style['animation-duration'] = `${dura}s`
       innerClassName.push(animElemId)
+      style['animation-delay'] = '3s'
+
+      if (dura > 0) {
+        style['animation-duration'] = `${dura}s`
+        style['animation-delay'] = '1s'
+      }
     }
 
     const classObject = {