提交 61cf0f79 作者: vben

fix(moment): fix moment error #217

上级 9ea257e1
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
"@types/sortablejs": "^1.10.6", "@types/sortablejs": "^1.10.6",
"@types/yargs": "^15.0.12", "@types/yargs": "^15.0.12",
"@types/zxcvbn": "^4.4.0", "@types/zxcvbn": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^4.14.0", "@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.0", "@typescript-eslint/parser": "^4.14.1",
"@vitejs/plugin-legacy": "^1.2.1", "@vitejs/plugin-legacy": "^1.2.1",
"@vitejs/plugin-vue": "1.1.0", "@vitejs/plugin-vue": "^1.1.2",
"@vitejs/plugin-vue-jsx": "^1.0.2", "@vitejs/plugin-vue-jsx": "^1.0.2",
"@vue/compiler-sfc": "^3.0.5", "@vue/compiler-sfc": "^3.0.5",
"@vuedx/typecheck": "^0.6.0", "@vuedx/typecheck": "^0.6.3",
"@vuedx/typescript-plugin-vue": "^0.6.0", "@vuedx/typescript-plugin-vue": "^0.6.3",
"autoprefixer": "^10.2.3", "autoprefixer": "^10.2.3",
"commitizen": "^4.2.3", "commitizen": "^4.2.3",
"conventional-changelog-cli": "^2.1.1", "conventional-changelog-cli": "^2.1.1",
...@@ -83,8 +83,6 @@ ...@@ -83,8 +83,6 @@
"husky": "^4.3.8", "husky": "^4.3.8",
"less": "^4.1.0", "less": "^4.1.0",
"lint-staged": "^10.5.3", "lint-staged": "^10.5.3",
"postcss": "^8.2.4",
"postcss-import": "^14.0.0",
"prettier": "^2.2.1", "prettier": "^2.2.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rollup-plugin-gzip": "^2.5.0", "rollup-plugin-gzip": "^2.5.0",
...@@ -95,11 +93,11 @@ ...@@ -95,11 +93,11 @@
"stylelint-order": "^4.1.0", "stylelint-order": "^4.1.0",
"ts-node": "^9.1.1", "ts-node": "^9.1.1",
"typescript": "^4.1.3", "typescript": "^4.1.3",
"vite": "2.0.0-beta.48", "vite": "2.0.0-beta.50",
"vite-plugin-html": "^2.0.0-beta.6", "vite-plugin-html": "^2.0.0-beta.6",
"vite-plugin-mock": "^2.0.0-rc.2", "vite-plugin-mock": "^2.0.0-rc.2",
"vite-plugin-purge-icons": "^0.6.0", "vite-plugin-purge-icons": "^0.6.0",
"vite-plugin-pwa": "^0.3.10", "vite-plugin-pwa": "^0.4.0",
"vite-plugin-style-import": "^0.4.6", "vite-plugin-style-import": "^0.4.6",
"vue-eslint-parser": "^7.4.1", "vue-eslint-parser": "^7.4.1",
"yargs": "^16.2.0" "yargs": "^16.2.0"
......
module.exports = { module.exports = {
plugins: { plugins: {
'postcss-import': {},
autoprefixer: {}, autoprefixer: {},
}, },
}; };
...@@ -9,7 +9,7 @@ import { useLocaleSetting } from '/@/hooks/setting/useLocaleSetting'; ...@@ -9,7 +9,7 @@ import { useLocaleSetting } from '/@/hooks/setting/useLocaleSetting';
import { i18n } from './setupI18n'; import { i18n } from './setupI18n';
import 'moment/locale/zh-cn'; import 'moment/dist/locale/zh-cn';
const antConfigLocaleRef = ref<any>(null); const antConfigLocaleRef = ref<any>(null);
......
...@@ -27,7 +27,7 @@ export function useNow(immediate = true) { ...@@ -27,7 +27,7 @@ export function useNow(immediate = true) {
const s = now.get('s'); const s = now.get('s');
state.year = now.get('y'); state.year = now.get('y');
state.month = now.get('M'); state.month = now.get('M') + 1;
state.week = localData.weekdays()[now.day()]; state.week = localData.weekdays()[now.day()];
state.day = now.get('D'); state.day = now.get('D');
state.hour = h; state.hour = h;
......
...@@ -84,7 +84,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { ...@@ -84,7 +84,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
'@ant-design/icons-vue', '@ant-design/icons-vue',
'echarts/map/js/china', 'echarts/map/js/china',
'ant-design-vue/es/locale/zh_CN', 'ant-design-vue/es/locale/zh_CN',
'moment/locale/zh-cn', 'moment/dist/locale/zh-cn',
'ant-design-vue/es/locale/en_US', 'ant-design-vue/es/locale/en_US',
'resize-observer-polyfill', 'resize-observer-polyfill',
], ],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论