From ec768be28f25af1205aae798728d632d61859f24 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Mon, 4 Jul 2022 16:08:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlayout=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fes-plugin-layout/src/runtime/views/BaseLayout.vue | 2 +-
packages/fes-plugin-layout/src/runtime/views/index.tpl | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
index 097de333..8057fd43 100644
--- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
@@ -43,7 +43,7 @@
</f-layout>
</f-layout>
</template>
- <template v-if="currentNavigation === 'left-right'">
+ <template v-else-if="currentNavigation === 'left-right'">
<f-aside
v-model:collapsed="collapsedRef"
:fixed="isFixedSidebar"
diff --git a/packages/fes-plugin-layout/src/runtime/views/index.tpl b/packages/fes-plugin-layout/src/runtime/views/index.tpl
index c3bf8c66..d1315d37 100644
--- a/packages/fes-plugin-layout/src/runtime/views/index.tpl
+++ b/packages/fes-plugin-layout/src/runtime/views/index.tpl
@@ -21,9 +21,14 @@ const Layout = defineComponent({
const filledMenuRef = computed(() => fillMenu(menusRef.value, getRoutes()));
const localeShared = plugin.getShared('locale');
+
+ const renderCustom = config.renderCustom;
+
+ delete config.renderCustom;
+
return () => {
const slots = {
- renderCustom: config.renderCustom,
+ renderCustom,
locale: () => {
if (localeShared) {
return <localeShared.SelectLang></localeShared.SelectLang>;