zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: moment replaced with dayjs

This commit is contained in:
vben 2021-11-10 22:12:10 +08:00
parent 83921284a6
commit 122c27ea91
13 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -41,16 +41,16 @@
"@vueuse/core": "^6.8.0",
"@vueuse/shared": "^6.8.0",
"@zxcvbn-ts/core": "^1.0.0",
"ant-design-vue": "2.2.8",
"ant-design-vue": "3.0.0-alpha.11",
"axios": "^0.24.0",
"codemirror": "^5.63.3",
"cropperjs": "^1.5.12",
"crypto-js": "^4.1.1",
"dayjs": "^1.10.7",
"echarts": "^5.2.2",
"intro.js": "^4.3.0",
"lodash-es": "^4.17.21",
"mockjs": "^1.1.0",
"moment": "^2.29.1",
"nprogress": "^0.2.0",
"path-to-regexp": "^6.2.0",
"pinia": "2.0.2",

34
pnpm-lock.yaml
View File

@ -39,7 +39,7 @@ specifiers:
'@vueuse/core': ^6.8.0
'@vueuse/shared': ^6.8.0
'@zxcvbn-ts/core': ^1.0.0
ant-design-vue: 2.2.8
ant-design-vue: 3.0.0-alpha.11
autoprefixer: ^10.4.0
axios: ^0.24.0
codemirror: ^5.63.3
@ -48,6 +48,7 @@ specifiers:
cropperjs: ^1.5.12
cross-env: ^7.0.3
crypto-js: ^4.1.1
dayjs: ^1.10.7
dotenv: ^10.0.0
echarts: ^5.2.2
eslint: ^8.2.0
@ -66,7 +67,6 @@ specifiers:
lint-staged: 11.2.6
lodash-es: ^4.17.21
mockjs: ^1.1.0
moment: ^2.29.1
npm-run-all: ^4.1.5
nprogress: ^0.2.0
path-to-regexp: ^6.2.0
@ -123,16 +123,16 @@ dependencies:
'@vueuse/core': 6.8.0_vue@3.2.21
'@vueuse/shared': 6.8.0_vue@3.2.21
'@zxcvbn-ts/core': 1.0.0
ant-design-vue: 2.2.8_076477a87ad5f7673ec470dd8ffa7935
ant-design-vue: 3.0.0-alpha.11_076477a87ad5f7673ec470dd8ffa7935
axios: 0.24.0
codemirror: 5.63.3
cropperjs: 1.5.12
crypto-js: 4.1.1
dayjs: 1.10.7
echarts: 5.2.2
intro.js: 4.3.0
lodash-es: 4.17.21
mockjs: 1.1.0
moment: 2.29.1
nprogress: 0.2.0
path-to-regexp: 6.2.0
pinia: 2.0.2_typescript@4.4.4+vue@3.2.21
@ -2963,24 +2963,24 @@ packages:
engines: {node: '>=10'}
dev: true
/ant-design-vue/2.2.8_076477a87ad5f7673ec470dd8ffa7935:
resolution: {integrity: sha512-3graq9/gCfJQs6hznrHV6sa9oDmk/D1H3Oo0vLdVpPS/I61fZPk8NEyNKCHpNA6fT2cx6xx9U3QS63uuyikg/Q==}
/ant-design-vue/3.0.0-alpha.11_076477a87ad5f7673ec470dd8ffa7935:
resolution: {integrity: sha512-cEbWtdoXYU6h5yUXBTbUzi3Zyh4JQDqRZI3n8Hkj0DeWYAM1SvWvQ7JhEY2Xnw1/3fjJw+j4GTP7lcob1e16wg==}
peerDependencies:
'@vue/compiler-sfc': '>=3.1.0'
vue: '>=3.1.0'
dependencies:
'@ant-design/colors': 6.0.0
'@ant-design/icons-vue': 6.0.1_vue@3.2.21
'@babel/runtime': 7.16.0
'@simonwep/pickr': 1.8.2
'@vue/compiler-sfc': 3.2.21
array-tree-filter: 2.1.0
async-validator: 3.5.2
async-validator: 4.0.7
dayjs: 1.10.7
dom-align: 1.12.2
dom-scroll-into-view: 2.0.1
lodash: 4.17.21
lodash-es: 4.17.21
moment: 2.29.1
omit.js: 2.0.2
resize-observer-polyfill: 1.5.1
scroll-into-view-if-needed: 2.2.28
shallow-equal: 1.2.1
@ -3083,8 +3083,8 @@ packages:
engines: {node: '>=8'}
dev: true
/async-validator/3.5.2:
resolution: {integrity: sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==}
/async-validator/4.0.7:
resolution: {integrity: sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==}
dev: false
/async/0.9.2:
@ -4319,6 +4319,10 @@ packages:
resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
dev: true
/dayjs/1.10.7:
resolution: {integrity: sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==}
dev: false
/debug/2.6.9:
resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
dependencies:
@ -8250,10 +8254,6 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
/moment/2.29.1:
resolution: {integrity: sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==}
dev: false
/mousetrap/1.6.5:
resolution: {integrity: sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==}
dev: false
@ -8503,10 +8503,6 @@ packages:
isobject: 3.0.1
dev: true
/omit.js/2.0.2:
resolution: {integrity: sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==}
dev: false
/on-finished/2.3.0:
resolution: {integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=}
engines: {node: '>= 0.8'}

2
src/components/Form/src/BasicForm.vue
View File

@ -122,7 +122,7 @@
if (!Array.isArray(defaultValue)) {
schema.defaultValue = dateUtil(defaultValue);
} else {
const def: moment.Moment[] = [];
const def: any[] = [];
defaultValue.forEach((item) => {
def.push(dateUtil(item));
});

3
src/components/Form/src/hooks/useFormValues.ts
View File

@ -33,7 +33,8 @@ export function useFormValues({
if (isObject(value)) {
value = transformDateFunc?.(value);
}
if (isArray(value) && value[0]?._isAMomentObject && value[1]?._isAMomentObject) {
if (isArray(value) && value[0]?.format && value[1]?.format) {
value = value.map((item) => transformDateFunc?.(item));
}
// Remove spaces

2
src/components/Form/src/props.ts
View File

@ -53,7 +53,7 @@ export const basicProps = {
transformDateFunc: {
type: Function as PropType<Fn>,
default: (date: any) => {
return date._isAMomentObject ? date?.format('YYYY-MM-DD HH:mm:ss') : date;
return date?.format?.('YYYY-MM-DD HH:mm:ss') ?? date;
},
},
rulesMessageJoinLabel: propTypes.bool.def(true),

13
src/components/registerGlobComp.ts
View File

@ -1,18 +1,7 @@
import type { App } from 'vue';
import { Button } from './Button';
import {
// Need
Button as AntButton,
Input,
Layout,
} from 'ant-design-vue';
const compList = [AntButton.Group];
import { Input, Layout } from 'ant-design-vue';
export function registerGlobComp(app: App) {
compList.forEach((comp) => {
app.component(comp.name || comp.displayName, comp);
});
app.use(Input).use(Button).use(Layout);
}

5
src/locales/lang/en.ts
View File

@ -1,6 +1,5 @@
import { genMessage } from '../helper';
import antdLocale from 'ant-design-vue/es/locale/en_US';
// import momentLocale from 'moment/dist/locale/en-us';
const modules = import.meta.globEager('./en/**/*.ts');
export default {
@ -8,6 +7,6 @@ export default {
...genMessage(modules, 'en'),
antdLocale,
},
momentLocale: null,
momentLocaleName: 'en',
dateLocale: null,
dateLocaleName: 'en',
};

3
src/locales/lang/zh_CN.ts
View File

@ -1,6 +1,5 @@
import { genMessage } from '../helper';
import antdLocale from 'ant-design-vue/es/locale/zh_CN';
import momentLocale from 'moment/dist/locale/zh-cn';
const modules = import.meta.globEager('./zh-CN/**/*.ts');
export default {
@ -8,6 +7,4 @@ export default {
...genMessage(modules, 'zh-CN'),
antdLocale,
},
momentLocale,
momentLocaleName: 'zh-cn',
};

9
src/locales/useLocale.ts
View File

@ -3,8 +3,6 @@
*/
import type { LocaleType } from '/#/config';
import moment from 'moment';
import { i18n } from './setupI18n';
import { useLocaleStoreWithOut } from '/@/store/modules/locale';
import { unref, computed } from 'vue';
@ -12,8 +10,8 @@ import { loadLocalePool, setHtmlPageLang } from './helper';
interface LangModule {
message: Recordable;
momentLocale: Recordable;
momentLocaleName: string;
dateLocale: Recordable;
dateLocaleName: string;
}
function setI18nLanguage(locale: LocaleType) {
@ -53,10 +51,9 @@ export function useLocale() {
const langModule = ((await import(`./lang/${locale}.ts`)) as any).default as LangModule;
if (!langModule) return;
const { message, momentLocale, momentLocaleName } = langModule;
const { message } = langModule;
globalI18n.setLocaleMessage(locale, message);
moment.updateLocale(momentLocaleName, momentLocale);
loadLocalePool.push(locale);
setI18nLanguage(locale);

15
src/utils/dateUtil.ts
View File

@ -1,20 +1,23 @@
/**
* Independent time operation tool to facilitate subsequent switch to dayjs
*/
import moment from 'moment';
import dayjs from 'dayjs';
const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
const DATE_FORMAT = 'YYYY-MM-DD ';
export function formatToDateTime(
date: moment.MomentInput = undefined,
date: dayjs.Dayjs | undefined = undefined,
format = DATE_TIME_FORMAT,
): string {
return moment(date).format(format);
return dayjs(date).format(format);
}
export function formatToDate(date: moment.MomentInput = undefined, format = DATE_FORMAT): string {
return moment(date).format(format);
export function formatToDate(
date: dayjs.Dayjs | undefined = undefined,
format = DATE_FORMAT,
): string {
return dayjs(date).format(format);
}
export const dateUtil = moment;
export const dateUtil = dayjs;

3
src/utils/http/axios/helper.ts
View File

@ -27,7 +27,8 @@ export function formatRequestDate(params: Recordable) {
}
for (const key in params) {
if (params[key] && params[key]._isAMomentObject) {
const format = params[key]?.format ?? null;
if (format && typeof format === 'function') {
params[key] = params[key].format(DATE_TIME_FORMAT);
}
if (isString(key)) {

6
types/module.d.ts vendored
View File

@ -10,12 +10,6 @@ declare module 'ant-design-vue/es/locale/*' {
export default locale as Locale & ReadonlyRecordable;
}
declare module 'moment/dist/locale/*' {
import { LocaleSpecification } from 'moment';
const locale: LocaleSpecification & ReadonlyRecordable;
export default locale;
}
declare module 'virtual:*' {
const result: any;
export default result;

6
vite.config.ts
View File

@ -1,6 +1,6 @@
import type { UserConfig, ConfigEnv } from 'vite';
import pkg from './package.json';
import moment from 'moment';
import dayjs from 'dayjs';
import { loadEnv } from 'vite';
import { resolve } from 'path';
import { generateModifyVars } from './build/generate/generateModifyVars';
@ -16,7 +16,7 @@ function pathResolve(dir: string) {
const { dependencies, devDependencies, name, version } = pkg;
const __APP_INFO__ = {
pkg: { dependencies, devDependencies, name, version },
lastBuildTime: moment().format('YYYY-MM-DD HH:mm:ss'),
lastBuildTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
};
export default ({ command, mode }: ConfigEnv): UserConfig => {
@ -97,9 +97,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
include: [
'@iconify/iconify',
'ant-design-vue/es/locale/zh_CN',
'moment/dist/locale/zh-cn',
'ant-design-vue/es/locale/en_US',
'moment/dist/locale/eu',
],
exclude: ['vue-demi'],
},