Skip to content

Commit 37fc4d4

Browse files
committed
feat: 添加无法自定义显示天,时,分,秒
#1716
1 parent 2247d4e commit 37fc4d4

File tree

1 file changed

+16
-19
lines changed
  • packages/taro-ui/rn/components/countdown

1 file changed

+16
-19
lines changed

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,12 @@ export default class AtCountdown extends React.Component<
6464

6565
if (this.seconds > 0) {
6666
day = this.props.isShowDay ? Math.floor(this.seconds / (60 * 60 * 24)) : 0
67-
hours = Math.floor(this.seconds / (60 * 60)) - day * 24
68-
minutes = Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60
67+
hours = this.props.isShowHour
68+
? Math.floor(this.seconds / (60 * 60)) - day * 24
69+
: 0
70+
minutes = this.props.isShowMinute
71+
? Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60
72+
: 0
6973
seconds =
7074
Math.floor(this.seconds) -
7175
day * 24 * 60 * 60 -
@@ -134,7 +138,8 @@ export default class AtCountdown extends React.Component<
134138
format,
135139
isShowDay,
136140
isCard,
137-
isShowHour
141+
isShowHour,
142+
isShowMinute
138143
} = this.props
139144
const { _day, _hours, _minutes, _seconds } = this.state
140145

@@ -150,25 +155,15 @@ export default class AtCountdown extends React.Component<
150155
style={customStyle}
151156
>
152157
{isShowDay && (
153-
<AtCountdownItem isCard={isCard} num={_day} separator={format!.day} />
158+
<AtCountdownItem num={_day} separator={format?.day || '天'} />
154159
)}
155160
{isShowHour && (
156-
<AtCountdownItem
157-
isCard={isCard}
158-
num={_hours}
159-
separator={format!.hours}
160-
/>
161+
<AtCountdownItem num={_hours} separator={format?.hours || ''} />
161162
)}
162-
<AtCountdownItem
163-
isCard={isCard}
164-
num={_minutes}
165-
separator={format!.minutes}
166-
/>
167-
<AtCountdownItem
168-
isCard={isCard}
169-
num={_seconds}
170-
separator={format!.seconds}
171-
/>
163+
{isShowMinute && (
164+
<AtCountdownItem num={_minutes} separator={format?.minutes || ''} />
165+
)}
166+
<AtCountdownItem num={_seconds} separator={format?.seconds || ''} />
172167
</View>
173168
)
174169
}
@@ -180,6 +175,7 @@ AtCountdown.defaultProps = {
180175
isCard: false,
181176
isShowDay: false,
182177
isShowHour: true,
178+
isShowMinute: true,
183179
format: {
184180
day: '天',
185181
hours: '时',
@@ -198,6 +194,7 @@ AtCountdown.propTypes = {
198194
isCard: PropTypes.bool,
199195
isShowDay: PropTypes.bool,
200196
isShowHour: PropTypes.bool,
197+
isShowMinute: PropTypes.bool,
201198
format: PropTypes.object,
202199
day: PropTypes.number,
203200
hours: PropTypes.number,

0 commit comments

Comments
 (0)