Browse Source
fix: when the server component path is wrong, a blank interface is still displayed (#4567)
pull/4569/head
Vben
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
16 additions and
6 deletions
-
packages/effects/layouts/src/basic/content/content.vue
-
packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
|
|
|
@ -53,13 +53,20 @@ function transformComponent( |
|
|
|
component: VNode, |
|
|
|
route: RouteLocationNormalizedLoadedGeneric, |
|
|
|
) { |
|
|
|
// 组件视图未找到,如果有设置后备视图,则返回后备视图,如果没有,则抛出错误 |
|
|
|
if (!component) { |
|
|
|
console.error( |
|
|
|
'Component view not found,please check the route configuration', |
|
|
|
); |
|
|
|
return undefined; |
|
|
|
} |
|
|
|
|
|
|
|
const routeName = route.name as string; |
|
|
|
// 如果组件没有 name,则直接返回 |
|
|
|
if (!routeName) { |
|
|
|
return component; |
|
|
|
} |
|
|
|
|
|
|
|
const componentName = (component.type as any).name; |
|
|
|
const componentName = (component?.type as any)?.name; |
|
|
|
|
|
|
|
// 已经设置过 name,则直接返回 |
|
|
|
if (componentName) { |
|
|
|
|
|
|
|
@ -174,12 +174,15 @@ if (enableShortcutKey.value) { |
|
|
|
/> |
|
|
|
<div class="ml-2 w-full"> |
|
|
|
<div |
|
|
|
v-if="tagText || text || $slots.tagText" |
|
|
|
class="text-foreground mb-1 flex items-center text-sm font-medium" |
|
|
|
> |
|
|
|
{{ text }} |
|
|
|
<Badge class="ml-2 text-green-400"> |
|
|
|
{{ tagText }} |
|
|
|
</Badge> |
|
|
|
<slot name="tagText"> |
|
|
|
<Badge v-if="tagText" class="ml-2 text-green-400"> |
|
|
|
{{ tagText }} |
|
|
|
</Badge> |
|
|
|
</slot> |
|
|
|
</div> |
|
|
|
<div class="text-muted-foreground text-xs font-normal"> |
|
|
|
{{ description }} |
|
|
|
@ -208,7 +211,7 @@ if (enableShortcutKey.value) { |
|
|
|
{{ altView }} L |
|
|
|
</DropdownMenuShortcut> |
|
|
|
</DropdownMenuItem> |
|
|
|
<DropdownMenuSeparator /> |
|
|
|
<DropdownMenuSeparator v-if="preferences.widget.lockScreen" /> |
|
|
|
<DropdownMenuItem |
|
|
|
class="mx-1 flex cursor-pointer items-center rounded-sm py-1 leading-8" |
|
|
|
@click="handleLogout" |
|
|
|
|