From 8618c75459367db9dab8d77cef8e37f1d3a31102 Mon Sep 17 00:00:00 2001 From: vagusx Date: Sun, 27 Nov 2022 16:29:42 +0800 Subject: [PATCH] feat: replace moment to dayjs --- src/components/Layout/Header.js | 4 ++-- src/pages/dashboard/components/recentSales.js | 4 ++-- src/pages/user/components/Filter.js | 10 +++++----- src/utils/index.js | 12 ++++++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/components/Layout/Header.js b/src/components/Layout/Header.js index 2ee6af9..08ba1bc 100644 --- a/src/components/Layout/Header.js +++ b/src/components/Layout/Header.js @@ -10,7 +10,7 @@ import { } from '@ant-design/icons' import { Trans } from "@lingui/macro" import { getLocale, setLocale } from 'utils' -import moment from 'moment' +import dayjs from 'dayjs' import classnames from 'classnames' import config from 'config' import styles from './Header.less' @@ -107,7 +107,7 @@ class Header extends PureComponent { {item.title} } - description={moment(item.date).fromNow()} + description={dayjs(item.date).fromNow()} /> diff --git a/src/pages/dashboard/components/recentSales.js b/src/pages/dashboard/components/recentSales.js index 01907dc..bcfdac1 100644 --- a/src/pages/dashboard/components/recentSales.js +++ b/src/pages/dashboard/components/recentSales.js @@ -1,5 +1,5 @@ import React from 'react' -import moment from 'moment' +import dayjs from 'dayjs' import PropTypes from 'prop-types' import { Table, Tag } from 'antd' import { Color } from 'utils' @@ -38,7 +38,7 @@ function RecentSales({ data }) { { title: 'DATE', dataIndex: 'date', - render: text => moment(text).format('YYYY-MM-DD'), + render: text => dayjs(text).format('YYYY-MM-DD'), }, { title: 'PRICE', diff --git a/src/pages/user/components/Filter.js b/src/pages/user/components/Filter.js index 3443baa..74315c8 100644 --- a/src/pages/user/components/Filter.js +++ b/src/pages/user/components/Filter.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' -import moment from 'moment' +import dayjs from 'dayjs' import { FilterItem } from 'components' import { Trans } from "@lingui/macro" import { t } from "@lingui/macro" @@ -30,8 +30,8 @@ class Filter extends Component { const { createTime } = fields if (createTime && createTime.length) { fields.createTime = [ - moment(createTime[0]).format('YYYY-MM-DD'), - moment(createTime[1]).format('YYYY-MM-DD'), + dayjs(createTime[0]).format('YYYY-MM-DD'), + dayjs(createTime[1]).format('YYYY-MM-DD'), ] } return fields @@ -72,10 +72,10 @@ class Filter extends Component { let initialCreateTime = [] if (filter.createTime && filter.createTime[0]) { - initialCreateTime[0] = moment(filter.createTime[0]) + initialCreateTime[0] = dayjs(filter.createTime[0]) } if (filter.createTime && filter.createTime[1]) { - initialCreateTime[1] = moment(filter.createTime[1]) + initialCreateTime[1] = dayjs(filter.createTime[1]) } return ( diff --git a/src/utils/index.js b/src/utils/index.js index 925bc5b..85ace7c 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,10 +1,14 @@ import { cloneDeep } from 'lodash' const { pathToRegexp } = require("path-to-regexp") -import moment from 'moment' -import 'moment/locale/zh-cn' import store from 'store' import { i18n } from './config' +import dayjs from 'dayjs' +import relativeTime from 'dayjs/plugin/relativeTime' +import 'dayjs/locale/zh-cn' + +dayjs.extend(relativeTime) + export classnames from 'classnames' export config from './config' export request from './request' @@ -165,8 +169,8 @@ export function getLocale() { export function setLocale(language) { if (getLocale() !== language) { - moment.locale(language === 'zh' ? 'zh-cn' : language) + dayjs.locale(language === 'zh' ? 'zh-cn' : language) store.set('locale', language) window.location.reload() } -} \ No newline at end of file +}