mirror of
https://github.com/zuiidea/antd-admin
synced 2026-10-29 04:14:12 +00:00
feat: replace moment to dayjs
This commit is contained in:
@@ -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}
|
||||
</Ellipsis>
|
||||
}
|
||||
description={moment(item.date).fromNow()}
|
||||
description={dayjs(item.date).fromNow()}
|
||||
/>
|
||||
<RightOutlined style={{ fontSize: 10, color: '#ccc' }} />
|
||||
</List.Item>
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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 (
|
||||
|
||||
+8
-4
@@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user