Skip to content

Commit

Permalink
fix(moment): fix moment error vbenjs#217
Browse files Browse the repository at this point in the history
  • Loading branch information
anncwb committed Jan 26, 2021
1 parent 9ea257e commit 61cf0f7
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 141 deletions.
16 changes: 7 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
"@types/sortablejs": "^1.10.6",
"@types/yargs": "^15.0.12",
"@types/zxcvbn": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^4.14.0",
"@typescript-eslint/parser": "^4.14.0",
"@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.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",
"@vue/compiler-sfc": "^3.0.5",
"@vuedx/typecheck": "^0.6.0",
"@vuedx/typescript-plugin-vue": "^0.6.0",
"@vuedx/typecheck": "^0.6.3",
"@vuedx/typescript-plugin-vue": "^0.6.3",
"autoprefixer": "^10.2.3",
"commitizen": "^4.2.3",
"conventional-changelog-cli": "^2.1.1",
Expand All @@ -83,8 +83,6 @@
"husky": "^4.3.8",
"less": "^4.1.0",
"lint-staged": "^10.5.3",
"postcss": "^8.2.4",
"postcss-import": "^14.0.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.2",
"rollup-plugin-gzip": "^2.5.0",
Expand All @@ -95,11 +93,11 @@
"stylelint-order": "^4.1.0",
"ts-node": "^9.1.1",
"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-mock": "^2.0.0-rc.2",
"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",
"vue-eslint-parser": "^7.4.1",
"yargs": "^16.2.0"
Expand Down
1 change: 0 additions & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
plugins: {
'postcss-import': {},
autoprefixer: {},
},
};
2 changes: 1 addition & 1 deletion src/locales/useLocale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useLocaleSetting } from '/@/hooks/setting/useLocaleSetting';

import { i18n } from './setupI18n';

import 'moment/locale/zh-cn';
import 'moment/dist/locale/zh-cn';

const antConfigLocaleRef = ref<any>(null);

Expand Down
2 changes: 1 addition & 1 deletion src/views/sys/lock/useNow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function useNow(immediate = true) {
const s = now.get('s');

state.year = now.get('y');
state.month = now.get('M');
state.month = now.get('M') + 1;
state.week = localData.weekdays()[now.day()];
state.day = now.get('D');
state.hour = h;
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
'@ant-design/icons-vue',
'echarts/map/js/china',
'ant-design-vue/es/locale/zh_CN',
'moment/locale/zh-cn',
'moment/dist/locale/zh-cn',
'ant-design-vue/es/locale/en_US',
'resize-observer-polyfill',
],
Expand Down
Loading

0 comments on commit 61cf0f7

Please sign in to comment.