taro-ui 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-ui",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "UI KIT for Taro",
   "module": "dist/index.esm.js",
   "main": "dist/index.js",
@@ -54,14 +54,6 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^11.0.2",
-    "@tarojs/plugin-platform-alipay": "3.6.6",
-    "@tarojs/plugin-platform-h5": "3.6.6",
-    "@tarojs/plugin-platform-jd": "3.6.6",
-    "@tarojs/plugin-platform-qq": "3.6.6",
-    "@tarojs/plugin-platform-swan": "3.6.6",
-    "@tarojs/plugin-platform-tt": "3.6.6",
-    "@tarojs/plugin-platform-weapp": "3.6.6",
-    "@tarojs/taro-rn": "3.6.6",
     "@rollup/plugin-json": "^4.0.2",
     "@rollup/plugin-node-resolve": "^7.1.1",
     "@tarojs/components": "3.6.6",
@@ -86,15 +78,7 @@
     "@tarojs/taro": ">=3",
     "react": ">=16.13.0",
     "react-dom": ">=16.13.0",
-    "react-native": ">=0.62.0",
-    "@tarojs/plugin-platform-alipay": "3.6.6",
-    "@tarojs/plugin-platform-h5": "3.6.6",
-    "@tarojs/plugin-platform-jd": "3.6.6",
-    "@tarojs/plugin-platform-qq": "3.6.6",
-    "@tarojs/plugin-platform-swan": "3.6.6",
-    "@tarojs/plugin-platform-tt": "3.6.6",
-    "@tarojs/plugin-platform-weapp": "3.6.6",
-    "@tarojs/taro-rn": "3.6.6"
+    "react-native": ">=0.62.0"
   },
   "gitHead": "c33cc7fbb734f0dbdd6e305dda1bc8300e5adbe2"
 }

package/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,

package/types/countdown.d.ts

@@ -41,6 +41,11 @@ export interface AtCountDownProps extends AtComponent {
    * @default true
    */
   isShowHour?: boolean
+  /**
+   * 是否显示分钟
+   * @default true
+   */
+  isShowMinute?: boolean
   /**
    * 格式化分割符号
    * @default { day: '天', hours: '时', minutes: '分', seconds: '秒' }