taro-ui 3.2.0-beta.2 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-ui",
-  "version": "3.2.0-beta.2",
+  "version": "3.2.1",
   "description": "UI KIT for Taro",
   "module": "dist/index.esm.js",
   "main": "dist/index.js",
@@ -29,6 +29,22 @@
     "url": "git@github.com:nervjs/taro-ui.git"
   },
   "license": "MIT",
+  "scripts": {
+    "dev": "pnpm run dev:lib",
+    "dev:lib": "tsc --project ./tsconfig.build.json --watch --incremental",
+    "dev:rollup": "rollup --config ./config/rollup.config.js --watch",
+    "build": "pnpm run build:rollup && pnpm run build:lib",
+    "build:lib": "tsc --project ./tsconfig.build.json",
+    "build:rollup": "rollup --config ./config/rollup.config.js",
+    "lint": "eslint ./src --fix",
+    "lint:style": "stylelint \"src/**/*.scss\" --syntax scss",
+    "lint:style-fix": "stylelint \"src/**/*.scss\" --syntax scss --fix",
+    "test": "cross-env NODE_ENV=test && jest --coverage",
+    "test:ci": "pnpm run build:h5 && pnpm run test",
+    "test:analyze": "rollup --config ./config/rollup.config.analyze.js",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
+    "clean": "rimraf .temp dist lib coverage"
+  },
   "dependencies": {
     "classnames": "^2.2.6",
     "dayjs": "^1.7.7",
@@ -38,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",
@@ -80,21 +88,5 @@
     "@tarojs/plugin-platform-weapp": "3.6.6",
     "@tarojs/taro-rn": "3.6.6"
   },
-  "gitHead": "c33cc7fbb734f0dbdd6e305dda1bc8300e5adbe2",
-  "scripts": {
-    "dev": "pnpm run dev:lib",
-    "dev:lib": "tsc --project ./tsconfig.build.json --watch --incremental",
-    "dev:rollup": "rollup --config ./config/rollup.config.js --watch",
-    "build": "pnpm run build:rollup && pnpm run build:lib",
-    "build:lib": "tsc --project ./tsconfig.build.json",
-    "build:rollup": "rollup --config ./config/rollup.config.js",
-    "lint": "eslint ./src --fix",
-    "lint:style": "stylelint \"src/**/*.scss\" --syntax scss",
-    "lint:style-fix": "stylelint \"src/**/*.scss\" --syntax scss --fix",
-    "test": "cross-env NODE_ENV=test && jest --coverage",
-    "test:ci": "pnpm run build:h5 && pnpm run test",
-    "test:analyze": "rollup --config ./config/rollup.config.analyze.js",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "clean": "rimraf .temp dist lib coverage"
-  }
-}
+  "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: '秒' }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 koppt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.