From f2dcf65f2b6e28537d779d1304c2585171dbc6a9 Mon Sep 17 00:00:00 2001 From: Bull-BCLS <1019113057@qq.com> Date: Sat, 23 Sep 2023 19:23:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=82=E9=85=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- continew-admin-ui/src/api/common/index.ts | 10 +++ .../src/components/footer/index.vue | 35 ++--------- .../src/components/navbar/index.vue | 5 +- .../src/router/guard/userLoginInfo.ts | 4 +- .../src/store/modules/app/index.ts | 61 ++++++++++++++++++- .../src/store/modules/app/types.ts | 7 +++ .../src/views/login/components/login-form.vue | 5 +- continew-admin-ui/src/views/login/index.vue | 8 ++- .../config/components/basic-setting.vue | 5 +- .../controller/common/CommonController.java | 13 +++- 10 files changed, 114 insertions(+), 39 deletions(-) diff --git a/continew-admin-ui/src/api/common/index.ts b/continew-admin-ui/src/api/common/index.ts index adad514c..d6622234 100644 --- a/continew-admin-ui/src/api/common/index.ts +++ b/continew-admin-ui/src/api/common/index.ts @@ -3,6 +3,7 @@ import qs from 'query-string'; import { ListParam as DeptParam } from '@/api/system/dept'; import { ListParam as MenuParam } from '@/api/system/menu'; import { ListParam as RoleParam } from '@/api/system/role'; +import { ListParam as OptionParam } from '@/api/system/config'; import { TreeNodeData } from '@arco-design/web-vue'; import { LabelValueState } from '@/store/modules/dict/types'; @@ -39,6 +40,15 @@ export function listDict(code: string) { return axios.get(`${BASE_URL}/dict/${code}`); } +export function listOption(params: OptionParam) { + return axios.get(`${BASE_URL}/option`, { + params, + paramsSerializer: (obj) => { + return qs.stringify(obj); + }, + }); +} + export function upload(data: FormData) { return axios.post(`${BASE_URL}/file`, data); } diff --git a/continew-admin-ui/src/components/footer/index.vue b/continew-admin-ui/src/components/footer/index.vue index 35c02149..0417f608 100644 --- a/continew-admin-ui/src/components/footer/index.vue +++ b/continew-admin-ui/src/components/footer/index.vue @@ -1,28 +1,14 @@ - + diff --git a/continew-admin-ui/src/components/navbar/index.vue b/continew-admin-ui/src/components/navbar/index.vue index c6395220..afe5d178 100644 --- a/continew-admin-ui/src/components/navbar/index.vue +++ b/continew-admin-ui/src/components/navbar/index.vue @@ -2,12 +2,12 @@
- logo + logo - {{ $t('title') }} + {{ appStore.getTitle }} { NProgress.start(); const loginStore = useLoginStore(); + const appStore = useAppStore(); + appStore.init(); if (isLogin()) { if (loginStore.roles[0]) { next(); diff --git a/continew-admin-ui/src/store/modules/app/index.ts b/continew-admin-ui/src/store/modules/app/index.ts index 28fd9218..9151bd74 100644 --- a/continew-admin-ui/src/store/modules/app/index.ts +++ b/continew-admin-ui/src/store/modules/app/index.ts @@ -9,7 +9,9 @@ import type { MessageReturn } from '@arco-design/web-vue/es/message/interface'; import type { RouteRecordNormalized } from 'vue-router'; import defaultSettings from '@/config/settings.json'; import { listRoute } from '@/api/auth/login'; -import { AppState } from './types'; +import { listOption } from '@/api/common'; +import getFile from '@/utils/file'; +import { AppState, Config } from './types'; const recursionMenu = ( appMenu: RouteRecordNormalized[], @@ -45,6 +47,18 @@ const useAppStore = defineStore('app', { ); return menuList; }, + getLogo(state: AppState): string | undefined { + return state.config?.site_logo; + }, + getFavicon(state: AppState): string | undefined { + return state.config?.site_favicon; + }, + getTitle(state: AppState): string | undefined { + return state.config?.site_title; + }, + getCopyright(state: AppState): string | undefined { + return state.config?.site_copyright; + }, }, actions: { @@ -97,6 +111,51 @@ const useAppStore = defineStore('app', { clearServerMenu() { this.serverMenu = []; }, + + /** + * 初始化系统配置信息 + */ + init() { + listOption({ + code: ['site_title', 'site_copyright', 'site_favicon', 'site_logo'], + }).then((res) => { + const resMap = new Map(); + res.data.forEach((item) => { + resMap.set(item.label, item.value); + }); + this.config = { + site_title: resMap.get('site_title'), + site_copyright: resMap.get('site_copyright'), + site_logo: resMap.get('site_logo'), + site_favicon: resMap.get('site_logo'), + }; + document.title = resMap.get('site_title'); + document + .querySelector('link[rel="shortcut icon"]') + ?.setAttribute( + 'href', + getFile(resMap.get('site_favicon')) || + 'https://cnadmin.charles7c.top/favicon.ico' + ); + }); + }, + + /** + * 保存系统配置 + * + * @param config 系统配置 + */ + save(config: Config) { + this.$state.config = config; + document.title = config.site_title || ''; + document + .querySelector('link[rel="shortcut icon"]') + ?.setAttribute( + 'href', + getFile(config.site_favicon) || + 'https://cnadmin.charles7c.top/favicon.ico' + ); + }, }, }); diff --git a/continew-admin-ui/src/store/modules/app/types.ts b/continew-admin-ui/src/store/modules/app/types.ts index 99d9db52..32a9c93c 100644 --- a/continew-admin-ui/src/store/modules/app/types.ts +++ b/continew-admin-ui/src/store/modules/app/types.ts @@ -1,5 +1,11 @@ import type { RouteRecordNormalized } from 'vue-router'; +export interface Config { + site_title?: string; + site_copyright?: string; + site_logo?: string; + site_favicon?: string; +} export interface AppState { theme: string; colorWeak: boolean; @@ -18,4 +24,5 @@ export interface AppState { menuFromServer: boolean; serverMenu: RouteRecordNormalized[]; [key: string]: unknown; + config?: Config; } diff --git a/continew-admin-ui/src/views/login/components/login-form.vue b/continew-admin-ui/src/views/login/components/login-form.vue index 6f1a7609..cbe60114 100644 --- a/continew-admin-ui/src/views/login/components/login-form.vue +++ b/continew-admin-ui/src/views/login/components/login-form.vue @@ -1,6 +1,6 @@