diff --git a/.prettierignore b/.prettierignore index 9e96efc..41ee2c8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,2 @@ /node_modules/* -/dist/* -/src/main.ts \ No newline at end of file +/dist/* \ No newline at end of file diff --git a/index.html b/index.html index 9983b8c..f3b1fa6 100644 --- a/index.html +++ b/index.html @@ -42,6 +42,6 @@
- + diff --git a/src/App.vue b/src/App.vue index 2a4cef1..b04b1bf 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,31 +4,31 @@ - diff --git a/src/api/auth.ts b/src/api/auth.js similarity index 76% rename from src/api/auth.ts rename to src/api/auth.js index e6a8de4..8796146 100644 --- a/src/api/auth.ts +++ b/src/api/auth.js @@ -5,8 +5,8 @@ import request from '@/utils/http' * @param params 登录参数 * @returns 登录响应 */ -export function fetchLogin(params: Api.Auth.LoginParams) { - return request.post({ +export function fetchLogin(params) { + return request.post({ url: '/api/auth/login', params // showSuccessMessage: true // 显示成功消息 @@ -19,7 +19,7 @@ export function fetchLogin(params: Api.Auth.LoginParams) { * @returns 用户信息 */ export function fetchGetUserInfo() { - return request.get({ + return request.get({ url: '/api/user/info' // 自定义请求头 // headers: { diff --git a/src/api/system-manage.js b/src/api/system-manage.js new file mode 100644 index 0000000..607d454 --- /dev/null +++ b/src/api/system-manage.js @@ -0,0 +1,24 @@ +import request from '@/utils/http' + +// 获取用户列表 +export function fetchGetUserList(params) { + return request.get({ + url: '/api/user/list', + params + }) +} + +// 获取角色列表 +export function fetchGetRoleList(params) { + return request.get({ + url: '/api/role/list', + params + }) +} + +// 获取菜单列表 +export function fetchGetMenuList() { + return request.get({ + url: '/api/v3/system/menus/simple' + }) +} diff --git a/src/api/system-manage.ts b/src/api/system-manage.ts deleted file mode 100644 index 8bf9c68..0000000 --- a/src/api/system-manage.ts +++ /dev/null @@ -1,25 +0,0 @@ -import request from '@/utils/http' -import { AppRouteRecord } from '@/types/router' - -// 获取用户列表 -export function fetchGetUserList(params: Api.SystemManage.UserSearchParams) { - return request.get({ - url: '/api/user/list', - params - }) -} - -// 获取角色列表 -export function fetchGetRoleList(params: Api.SystemManage.RoleSearchParams) { - return request.get({ - url: '/api/role/list', - params - }) -} - -// 获取菜单列表 -export function fetchGetMenuList() { - return request.get({ - url: '/api/v3/system/menus/simple' - }) -} diff --git a/src/locales/index.ts b/src/locales/index.js similarity index 74% rename from src/locales/index.ts rename to src/locales/index.js index 9263f5a..79c43ec 100644 --- a/src/locales/index.ts +++ b/src/locales/index.js @@ -22,8 +22,6 @@ */ import { createI18n } from 'vue-i18n' -import type { I18n, I18nOptions } from 'vue-i18n' -import { LanguageEnum } from '@/enums/appEnum' import { getSystemStorage } from '@/utils/storage' import { StorageKeyManager } from '@/utils/storage/storage-key-manager' @@ -40,8 +38,8 @@ const storageKeyManager = new StorageKeyManager() * 语言消息对象 */ const messages = { - [LanguageEnum.EN]: enMessages, - [LanguageEnum.ZH]: zhMessages + 'en': enMessages, + 'zh': zhMessages } /** @@ -49,15 +47,15 @@ const messages = { * 用于语言切换下拉框 */ export const languageOptions = [ - { value: LanguageEnum.ZH, label: '简体中文' }, - { value: LanguageEnum.EN, label: 'English' } + { value: 'zh', label: '简体中文' }, + { value: 'en', label: 'English' } ] /** * 从存储中获取语言设置 * @returns 语言设置，如果获取失败则返回默认语言 */ -const getDefaultLanguage = (): LanguageEnum => { +const getDefaultLanguage = () => { // 尝试从版本化的存储中获取语言设置 try { const storageKey = storageKeyManager.getStorageKey('user') @@ -65,7 +63,7 @@ const getDefaultLanguage = (): LanguageEnum => { if (userStore) { const { language } = JSON.parse(userStore) - if (language && Object.values(LanguageEnum).includes(language)) { + if (language && Object.values(['zh', 'en']).includes(language)) { return language } } @@ -78,7 +76,7 @@ const getDefaultLanguage = (): LanguageEnum => { const sys = getSystemStorage() if (sys) { const { user } = JSON.parse(sys) - if (user?.language && Object.values(LanguageEnum).includes(user.language)) { + if (user?.language && Object.values(['zh', 'en']).includes(user.language)) { return user.language } } @@ -87,37 +85,30 @@ const getDefaultLanguage = (): LanguageEnum => { } // 返回默认语言 - console.debug('[i18n] 使用默认语言:', LanguageEnum.ZH) - return LanguageEnum.ZH + console.debug('[i18n] 使用默认语言:', 'zh') + return 'zh' } /** * i18n 配置选项 */ -const i18nOptions: I18nOptions = { +const i18nOptions = { locale: getDefaultLanguage(), legacy: false, globalInjection: true, - fallbackLocale: LanguageEnum.ZH, + fallbackLocale: 'zh', messages } /** * i18n 实例 */ -const i18n: I18n = createI18n(i18nOptions) - -/** - * 翻译函数类型 - */ -interface Translation { - (key: string): string -} +const i18n = createI18n(i18nOptions) /** * 全局翻译函数 * 可在任何地方使用，无需导入 useI18n */ -export const $t = i18n.global.t as Translation +export const $t = i18n.global.t export default i18n diff --git a/src/main.js b/src/main.js new file mode 100644 index 0000000..e8a1276 --- /dev/null +++ b/src/main.js @@ -0,0 +1,20 @@ +import App from './App.vue' +import { createApp } from 'vue' +import { initStore } from './store' // Store +import { initRouter } from './router' // Router +import language from './locales' // 国际化 +import '@styles/core/tailwind.css' // tailwind +import '@styles/index.scss' // 样式 +import { setupGlobDirectives } from './directives' +import { setupErrorHandle } from './utils/sys/error-handle' + +document.addEventListener('touchstart', function () {}, { passive: false }) + +const app = createApp(App) +initStore(app) +initRouter(app) +setupGlobDirectives(app) +setupErrorHandle(app) + +app.use(language) +app.mount('#app') diff --git a/src/main.ts b/src/main.ts deleted file mode 100644 index 7df948a..0000000 --- a/src/main.ts +++ /dev/null @@ -1,25 +0,0 @@ -import App from './App.vue' -import { createApp } from 'vue' -import { initStore } from './store' // Store -import { initRouter } from './router' // Router -import language from './locales' // 国际化 -import '@styles/core/tailwind.css' // tailwind -import '@styles/index.scss' // 样式 -import '@utils/sys/console.ts' // 控制台输出内容 -import { setupGlobDirectives } from './directives' -import { setupErrorHandle } from './utils/sys/error-handle' - -document.addEventListener( - 'touchstart', - function () {}, - { passive: false } -) - -const app = createApp(App) -initStore(app) -initRouter(app) -setupGlobDirectives(app) -setupErrorHandle(app) - -app.use(language) -app.mount('#app') \ No newline at end of file diff --git a/src/utils/sys/console.ts b/src/utils/sys/console.ts deleted file mode 100644 index d631087..0000000 --- a/src/utils/sys/console.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ANSI 转义码生成网站 https://patorjk.com/software/taag/#p=display&f=Big&t=ABB%0A -const asciiArt = ` -\x1b[32m欢迎使用 Art Design Pro！ -\x1b[0m -\x1b[36m哇！你居然在用我的项目～ 好用的话别忘了去 GitHub 点个 ★Star 呀，你的支持就是我更新的超强动力！祝使用体验满分💯 -\x1b[0m -\x1b[33mGitHub: https://github.com/Daymychen/art-design-pro -\x1b[0m -\x1b[31m技术支持（QQ群）: 1038930070，和开发者一起交流～ 群里有小伙伴实时答疑，遇到问题不用慌！ -\x1b[0m -` - -console.log(asciiArt) diff --git a/src/views/auth/forget-password/index.vue b/src/views/auth/forget-password/index.vue index d9b9658..b1807a1 100644 --- a/src/views/auth/forget-password/index.vue +++ b/src/views/auth/forget-password/index.vue @@ -11,21 +11,13 @@

{{ $t('forgetPassword.subTitle') }}

账号 - +
- + {{ $t('forgetPassword.submitBtnText') }}
@@ -41,22 +33,22 @@ - diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue index e10d3ec..e73bbc8 100644 --- a/src/views/auth/login/index.vue +++ b/src/views/auth/login/index.vue @@ -10,65 +10,36 @@

{{ $t('login.title') }}

{{ $t('login.subTitle') }}

- + - + {{ account.label }} - + - +
-
- +
+
-

+

{{ $t('login.placeholder.slider') }}

@@ -83,13 +54,8 @@
- + {{ $t('login.btnText') }}
@@ -107,178 +73,168 @@
- diff --git a/src/views/auth/register/index.vue b/src/views/auth/register/index.vue index e7e5a8d..cf2117d 100644 --- a/src/views/auth/register/index.vue +++ b/src/views/auth/register/index.vue @@ -10,64 +10,36 @@

{{ $t('register.title') }}

{{ $t('register.subTitle') }}

- + - + - + - + {{ $t('register.agreeText') }} - {{ $t('register.privacyPolicy') }} + {{ $t('register.privacyPolicy') }}
- + {{ $t('register.submitBtnText') }}
@@ -85,160 +57,152 @@
- diff --git a/src/views/dashboard/console/index.vue b/src/views/dashboard/console/index.vue index 0b55b5e..15798f8 100644 --- a/src/views/dashboard/console/index.vue +++ b/src/views/dashboard/console/index.vue @@ -28,14 +28,14 @@ - diff --git a/src/views/dashboard/console/modules/about-project.vue b/src/views/dashboard/console/modules/about-project.vue index 67f3d81..b0770c5 100644 --- a/src/views/dashboard/console/modules/about-project.vue +++ b/src/views/dashboard/console/modules/about-project.vue @@ -21,7 +21,7 @@ - diff --git a/src/views/dashboard/console/modules/active-user.vue b/src/views/dashboard/console/modules/active-user.vue index 93876bb..b2ac46b 100644 --- a/src/views/dashboard/console/modules/active-user.vue +++ b/src/views/dashboard/console/modules/active-user.vue @@ -24,11 +24,7 @@ - diff --git a/src/views/exception/404/index.vue b/src/views/exception/404/index.vue index 4e44bd2..6d9b66a 100644 --- a/src/views/exception/404/index.vue +++ b/src/views/exception/404/index.vue @@ -10,7 +10,7 @@ /> - diff --git a/src/views/exception/500/index.vue b/src/views/exception/500/index.vue index d23b44c..9b4b2f9 100644 --- a/src/views/exception/500/index.vue +++ b/src/views/exception/500/index.vue @@ -10,7 +10,7 @@ /> - diff --git a/src/views/index/index.vue b/src/views/index/index.vue index e528551..772ed96 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -20,10 +20,6 @@ - - diff --git a/src/views/outside/Iframe.vue b/src/views/outside/Iframe.vue index 75a915f..a0fa7f8 100644 --- a/src/views/outside/Iframe.vue +++ b/src/views/outside/Iframe.vue @@ -10,7 +10,7 @@ - diff --git a/src/views/result/fail/index.vue b/src/views/result/fail/index.vue index c1169d5..81a2733 100644 --- a/src/views/result/fail/index.vue +++ b/src/views/result/fail/index.vue @@ -23,6 +23,6 @@ - diff --git a/src/views/result/success/index.vue b/src/views/result/success/index.vue index 0b7a29c..66cc0da 100644 --- a/src/views/result/success/index.vue +++ b/src/views/result/success/index.vue @@ -16,6 +16,6 @@ -