Commit 922b39c02cd3f5a533f4a7c763b9d7f8ef9c2589
1 parent
855d23ae
docs: update
Showing
4 changed files
with
35 additions
and
34 deletions
README.md
| @@ -209,9 +209,9 @@ ps:核心功能已经实现,正在对接微信小程序中... | @@ -209,9 +209,9 @@ ps:核心功能已经实现,正在对接微信小程序中... | ||
| 209 | 209 | ||
| 210 | | 框架 | 说明 | 版本 | | 210 | | 框架 | 说明 | 版本 | |
| 211 | |----------------------------------------------------------------------|-----------------|--------| | 211 | |----------------------------------------------------------------------|-----------------|--------| |
| 212 | -| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.40 | | ||
| 213 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.7 | | ||
| 214 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.17 | | 212 | +| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.41 | |
| 213 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 | | ||
| 214 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.18 | | ||
| 215 | | [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.8.4 | | 215 | | [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.8.4 | |
| 216 | | [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.23 | | 216 | | [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.23 | |
| 217 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | 217 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | |
yudao-ui-admin-vue3/README.md
| @@ -27,12 +27,12 @@ | @@ -27,12 +27,12 @@ | ||
| 27 | 27 | ||
| 28 | | 框架 | 说明 | 版本 | | 28 | | 框架 | 说明 | 版本 | |
| 29 | | --- | --- |--------| | 29 | | --- | --- |--------| |
| 30 | -| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.40 | | ||
| 31 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.7 | | ||
| 32 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.17 | | 30 | +| [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.41 | |
| 31 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 | | ||
| 32 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.18 | | ||
| 33 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 | | 33 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 | |
| 34 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 | | 34 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 | |
| 35 | -| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.0 | | 35 | +| [vueuse](https://vueuse.org//) | 常用工具集 | 9.3.1 | |
| 36 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | 36 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | |
| 37 | | [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.5 | | 37 | | [vue-router](https://router.vuejs.org/) | vue 路由 | 4.1.5 | |
| 38 | | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 | | 38 | | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 | |
yudao-ui-admin-vue3/package.json
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | }, | 26 | }, |
| 27 | "dependencies": { | 27 | "dependencies": { |
| 28 | "@iconify/iconify": "^3.0.0", | 28 | "@iconify/iconify": "^3.0.0", |
| 29 | - "@vueuse/core": "^9.3.0", | 29 | + "@vueuse/core": "^9.3.1", |
| 30 | "@wangeditor/editor": "^5.1.21", | 30 | "@wangeditor/editor": "^5.1.21", |
| 31 | "@wangeditor/editor-for-vue": "^5.1.10", | 31 | "@wangeditor/editor-for-vue": "^5.1.10", |
| 32 | "@zxcvbn-ts/core": "^2.0.5", | 32 | "@zxcvbn-ts/core": "^2.0.5", |
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | "dayjs": "^1.11.5", | 36 | "dayjs": "^1.11.5", |
| 37 | "echarts": "^5.4.0", | 37 | "echarts": "^5.4.0", |
| 38 | "echarts-wordcloud": "^2.0.0", | 38 | "echarts-wordcloud": "^2.0.0", |
| 39 | - "element-plus": "2.2.17", | 39 | + "element-plus": "2.2.18", |
| 40 | "intro.js": "^6.0.0", | 40 | "intro.js": "^6.0.0", |
| 41 | "jsencrypt": "^3.2.1", | 41 | "jsencrypt": "^3.2.1", |
| 42 | "lodash-es": "^4.17.21", | 42 | "lodash-es": "^4.17.21", |
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | "qrcode": "^1.5.1", | 46 | "qrcode": "^1.5.1", |
| 47 | "qs": "^6.11.0", | 47 | "qs": "^6.11.0", |
| 48 | "url": "^0.11.0", | 48 | "url": "^0.11.0", |
| 49 | - "vue": "3.2.40", | 49 | + "vue": "3.2.41", |
| 50 | "vue-cropper": "^1.0.3", | 50 | "vue-cropper": "^1.0.3", |
| 51 | "vue-i18n": "9.2.2", | 51 | "vue-i18n": "9.2.2", |
| 52 | "vue-router": "^4.1.5", | 52 | "vue-router": "^4.1.5", |
| @@ -56,12 +56,12 @@ | @@ -56,12 +56,12 @@ | ||
| 56 | "devDependencies": { | 56 | "devDependencies": { |
| 57 | "@commitlint/cli": "^17.1.2", | 57 | "@commitlint/cli": "^17.1.2", |
| 58 | "@commitlint/config-conventional": "^17.1.0", | 58 | "@commitlint/config-conventional": "^17.1.0", |
| 59 | - "@iconify/json": "^2.1.120", | 59 | + "@iconify/json": "^2.1.122", |
| 60 | "@intlify/vite-plugin-vue-i18n": "^6.0.3", | 60 | "@intlify/vite-plugin-vue-i18n": "^6.0.3", |
| 61 | "@purge-icons/generated": "^0.9.0", | 61 | "@purge-icons/generated": "^0.9.0", |
| 62 | "@types/intro.js": "^5.1.0", | 62 | "@types/intro.js": "^5.1.0", |
| 63 | "@types/lodash-es": "^4.17.6", | 63 | "@types/lodash-es": "^4.17.6", |
| 64 | - "@types/node": "^18.8.4", | 64 | + "@types/node": "^18.11.0", |
| 65 | "@types/nprogress": "^0.2.0", | 65 | "@types/nprogress": "^0.2.0", |
| 66 | "@types/qrcode": "^1.5.0", | 66 | "@types/qrcode": "^1.5.0", |
| 67 | "@types/qs": "^6.9.7", | 67 | "@types/qs": "^6.9.7", |
| @@ -78,21 +78,21 @@ | @@ -78,21 +78,21 @@ | ||
| 78 | "less": "^4.1.3", | 78 | "less": "^4.1.3", |
| 79 | "lint-staged": "^13.0.3", | 79 | "lint-staged": "^13.0.3", |
| 80 | "plop": "^3.1.1", | 80 | "plop": "^3.1.1", |
| 81 | - "postcss": "^8.4.17", | 81 | + "postcss": "^8.4.18", |
| 82 | "postcss-html": "^1.5.0", | 82 | "postcss-html": "^1.5.0", |
| 83 | "postcss-less": "^6.0.0", | 83 | "postcss-less": "^6.0.0", |
| 84 | "prettier": "^2.7.1", | 84 | "prettier": "^2.7.1", |
| 85 | "rimraf": "^3.0.2", | 85 | "rimraf": "^3.0.2", |
| 86 | "rollup": "^2.79.1", | 86 | "rollup": "^2.79.1", |
| 87 | - "stylelint": "^14.13.0", | 87 | + "stylelint": "^14.14.0", |
| 88 | "stylelint-config-html": "^1.1.0", | 88 | "stylelint-config-html": "^1.1.0", |
| 89 | "stylelint-config-prettier": "^9.0.3", | 89 | "stylelint-config-prettier": "^9.0.3", |
| 90 | "stylelint-config-recommended": "^9.0.0", | 90 | "stylelint-config-recommended": "^9.0.0", |
| 91 | - "stylelint-config-standard": "^28.0.0", | 91 | + "stylelint-config-standard": "^29.0.0", |
| 92 | "stylelint-order": "^5.0.0", | 92 | "stylelint-order": "^5.0.0", |
| 93 | "typescript": "4.8.4", | 93 | "typescript": "4.8.4", |
| 94 | - "unplugin-vue-macros": "^0.12.0", | ||
| 95 | - "vite": "3.1.7", | 94 | + "unplugin-vue-macros": "^0.13.2", |
| 95 | + "vite": "3.1.8", | ||
| 96 | "vite-plugin-compression": "^0.5.1", | 96 | "vite-plugin-compression": "^0.5.1", |
| 97 | "vite-plugin-eslint": "^1.8.1", | 97 | "vite-plugin-eslint": "^1.8.1", |
| 98 | "vite-plugin-html": "^3.2.0", | 98 | "vite-plugin-html": "^3.2.0", |
| @@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
| 100 | "vite-plugin-style-import": "2.0.0", | 100 | "vite-plugin-style-import": "2.0.0", |
| 101 | "vite-plugin-svg-icons": "^2.0.1", | 101 | "vite-plugin-svg-icons": "^2.0.1", |
| 102 | "vite-plugin-windicss": "^1.8.8", | 102 | "vite-plugin-windicss": "^1.8.8", |
| 103 | - "vue-tsc": "^1.0.3", | 103 | + "vue-tsc": "^1.0.8", |
| 104 | "windicss": "^3.5.6", | 104 | "windicss": "^3.5.6", |
| 105 | "windicss-analysis": "^0.3.5" | 105 | "windicss-analysis": "^0.3.5" |
| 106 | }, | 106 | }, |
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
| @@ -103,24 +103,25 @@ const getCookie = () => { | @@ -103,24 +103,25 @@ const getCookie = () => { | ||
| 103 | // 登录 | 103 | // 登录 |
| 104 | const handleLogin = async (params) => { | 104 | const handleLogin = async (params) => { |
| 105 | loginLoading.value = true | 105 | loginLoading.value = true |
| 106 | - await getTenantId() | ||
| 107 | - const data = await validForm() | ||
| 108 | - if (!data) { | 106 | + try { |
| 107 | + await getTenantId() | ||
| 108 | + const data = await validForm() | ||
| 109 | + if (!data) { | ||
| 110 | + return | ||
| 111 | + } | ||
| 112 | + loginData.loginForm.captchaVerification = params.captchaVerification | ||
| 113 | + const res = await LoginApi.loginApi(loginData.loginForm) | ||
| 114 | + if (!res) { | ||
| 115 | + return | ||
| 116 | + } | ||
| 117 | + setToken(res) | ||
| 118 | + if (!redirect.value) { | ||
| 119 | + redirect.value = '/' | ||
| 120 | + } | ||
| 121 | + push({ path: redirect.value || permissionStore.addRouters[0].path }) | ||
| 122 | + } finally { | ||
| 109 | loginLoading.value = false | 123 | loginLoading.value = false |
| 110 | - return | ||
| 111 | - } | ||
| 112 | - loginData.loginForm.captchaVerification = params.captchaVerification | ||
| 113 | - const res = await LoginApi.loginApi(loginData.loginForm) | ||
| 114 | - if (!res) { | ||
| 115 | - loginLoading.value = false | ||
| 116 | - return | ||
| 117 | - } | ||
| 118 | - setToken(res) | ||
| 119 | - if (!redirect.value) { | ||
| 120 | - redirect.value = '/' | ||
| 121 | } | 124 | } |
| 122 | - push({ path: redirect.value || permissionStore.addRouters[0].path }) | ||
| 123 | - loginLoading.value = false | ||
| 124 | } | 125 | } |
| 125 | 126 | ||
| 126 | // 社交登录 | 127 | // 社交登录 |