Merge branch 'main' into main

This commit is contained in:
XiaoFans 2024-02-21 21:56:07 +08:00 committed by GitHub
commit 5049e2fbe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 7 deletions

View File

@ -30,7 +30,6 @@ const getConfig = (key?: string): ServerConfigs => {
export const getServerConfig = async (app: App): Promise<undefined> => {
app.config.globalProperties.$config = getConfig();
return axios({
method: "get",
url: `${configConver()}serverConfig.json`
})
.then(({ data: config }) => {

View File

@ -158,12 +158,7 @@ router.beforeEach((to: ToRouteType, _from, next) => {
getTopMenu(true);
// query、params模式路由传参数的标签页不在此处处理
if (route && route.meta?.title) {
if (
isAllEmpty(route.parentId) &&
route.meta?.backstage &&
route.children &&
route.children.length > 0
) {
if (isAllEmpty(route.parentId) && route.meta?.backstage) {
// 此处为动态顶级路由(目录)
const { path, name, meta } = route.children[0];
useMultiTagsStoreHook().handleTags("push", {