From d7e5ee40b5ffd118a95d092f0f536e88b9bcf3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 23 May 2019 19:11:39 +0800 Subject: [PATCH] [improvement] extract padZero utils --- docs/src/docs-entry.js | 1 - packages/coupon/index.js | 6 +----- packages/datetime-picker/index.js | 3 +-- packages/datetime-picker/utils.js | 4 ---- packages/utils/index.ts | 4 ++++ 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/docs/src/docs-entry.js b/docs/src/docs-entry.js index ec65fd252..c5f713a25 100644 --- a/docs/src/docs-entry.js +++ b/docs/src/docs-entry.js @@ -12,7 +12,6 @@ export default { 'style-guide.zh-CN': () => import('../markdown/style-guide.zh-CN.md'), 'theme.en-US': () => import('../markdown/theme.en-US.md'), 'theme.zh-CN': () => import('../markdown/theme.zh-CN.md'), - 'v2-progress-tracking': () => import('../markdown/v2-progress-tracking.md'), 'action-sheet.en-US': () => import('../../packages/action-sheet/en-US.md'), 'action-sheet.zh-CN': () => import('../../packages/action-sheet/zh-CN.md'), 'address-edit.en-US': () => import('../../packages/address-edit/en-US.md'), diff --git a/packages/coupon/index.js b/packages/coupon/index.js index 609703b13..a99e04016 100644 --- a/packages/coupon/index.js +++ b/packages/coupon/index.js @@ -1,13 +1,9 @@ -import { use } from '../utils'; +import { use, padZero } from '../utils'; import { RED } from '../utils/color'; import Checkbox from '../checkbox'; const [sfc, bem, t] = use('coupon'); -function padZero(num) { - return (num < 10 ? '0' : '') + num; -} - function getDate(timeStamp) { const date = new Date(timeStamp * 1000); return `${date.getFullYear()}.${padZero(date.getMonth() + 1)}.${padZero( diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js index a0cea4708..8cdd1c7c7 100644 --- a/packages/datetime-picker/index.js +++ b/packages/datetime-picker/index.js @@ -1,9 +1,8 @@ -import { use, range } from '../utils'; +import { use, range, padZero } from '../utils'; import Picker from '../picker'; import { pickerProps } from '../picker/shared'; import { times, - padZero, isValidDate, getTrueValue, getMonthEndDay diff --git a/packages/datetime-picker/utils.js b/packages/datetime-picker/utils.js index a153e6253..c54549e24 100644 --- a/packages/datetime-picker/utils.js +++ b/packages/datetime-picker/utils.js @@ -2,10 +2,6 @@ export function isValidDate(date) { return Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime()); } -export function padZero(val) { - return `00${val}`.slice(-2); -} - export function times(n, iteratee) { let index = -1; const result = Array(n); diff --git a/packages/utils/index.ts b/packages/utils/index.ts index 59ad68599..7102ae037 100644 --- a/packages/utils/index.ts +++ b/packages/utils/index.ts @@ -58,3 +58,7 @@ export function suffixPx(value?: string | number): string | undefined { value = String(value); return isNumber(value) ? `${value}px` : value; } + +export function padZero(num: number | string): string { + return (num < 10 ? '0' : '') + num; +}