diff --git a/kinit-admin/src/components/RightToolbar/src/RightToolbar.vue b/kinit-admin/src/components/RightToolbar/src/RightToolbar.vue index 9a0dde8..7b91a44 100644 --- a/kinit-admin/src/components/RightToolbar/src/RightToolbar.vue +++ b/kinit-admin/src/components/RightToolbar/src/RightToolbar.vue @@ -124,7 +124,7 @@ const mobile = appStore.getMobile diff --git a/kinit-admin/src/components/UserInfo/src/UserInfo.vue b/kinit-admin/src/components/UserInfo/src/UserInfo.vue index b176dbe..7dff3c9 100644 --- a/kinit-admin/src/components/UserInfo/src/UserInfo.vue +++ b/kinit-admin/src/components/UserInfo/src/UserInfo.vue @@ -29,7 +29,7 @@ const loginOut = () => { } const toHome = () => { - push('/system/home') + push('/home') } const toGitee = () => { diff --git a/kinit-admin/src/router/index.ts b/kinit-admin/src/router/index.ts index 2be0433..dfb60e7 100644 --- a/kinit-admin/src/router/index.ts +++ b/kinit-admin/src/router/index.ts @@ -16,7 +16,25 @@ export const constantRouterMap: AppRouteRecordRaw[] = [ hidden: true, title: '首页', noTagsView: true - } + }, + children: [ + { + path: 'home', + name: 'Home', + component: () => import('@/views/Home/Home.vue'), + meta: { + affix: false, + alwaysShow: true, + breadcrumb: true, + canTo: true, + hidden: true, + icon: null, + noCache: true, + noTagsView: false, + title: '个人主页' + } + } + ] }, { path: '/login', @@ -93,6 +111,7 @@ const router = createRouter({ export const resetRouter = (): void => { const resetWhiteNameList = [ + 'Home', 'Login', 'NoFind', 'Root', diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py index fd63ffd..49447a9 100644 --- a/kinit-api/application/settings.py +++ b/kinit-api/application/settings.py @@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer """ 系统版本 """ -VERSION = "1.9.2" +VERSION = "1.9.3" """安全警告: 不要在生产中打开调试运行!""" DEBUG = True diff --git a/kinit-api/apps/vadmin/system/crud.py b/kinit-api/apps/vadmin/system/crud.py index 9e46cfe..69b6296 100644 --- a/kinit-api/apps/vadmin/system/crud.py +++ b/kinit-api/apps/vadmin/system/crud.py @@ -128,7 +128,7 @@ class SettingsTabDal(DalBase): def __init__(self, db: AsyncSession): super(SettingsTabDal, self).__init__(db, models.VadminSystemSettingsTab, schemas.SettingsTabSimpleOut) - async def get_classify_tab_values(self, classify: List[str], hidden: Union[bool, None] = False): + async def get_classify_tab_values(self, classify: List[str], hidden: bool | None = False): """ 获取系统配置分类下的标签信息 """ @@ -144,7 +144,7 @@ class SettingsTabDal(DalBase): ) return self.__generate_values(datas) - async def get_tab_name_values(self, tab_names: List[str], hidden: Union[bool, None] = False): + async def get_tab_name_values(self, tab_names: List[str], hidden: bool | None = False): """ 获取系统配置标签下的标签信息 """ diff --git a/kinit-api/scripts/initialize/data/init.xlsx b/kinit-api/scripts/initialize/data/init.xlsx index 1da599d..bfe17c5 100644 Binary files a/kinit-api/scripts/initialize/data/init.xlsx and b/kinit-api/scripts/initialize/data/init.xlsx differ