From 194eb03526daf8a7ac99abccbf166873004248bd Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Tue, 21 Jun 2022 15:45:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/guide/route.md | 23 +++++++++++--------
docs/reference/plugin/plugins/layout.md | 8 +++----
.../fes-plugin-layout/src/runtime/index.js | 4 +---
.../src/runtime/views/BaseLayout.vue | 20 ++++++++--------
4 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/docs/guide/route.md b/docs/guide/route.md
index cb8b456c..efd80b0a 100644
--- a/docs/guide/route.md
+++ b/docs/guide/route.md
@@ -198,7 +198,17 @@ const router = new VueRouter({
```
-接下来我们看看如何配置 `meta`。在单文件组件中可以通过``定义：
+我们使用`defineRouteMeta` 配置 `meta`：
+
+```jsx
+import { defineRouteMete } from '@fesjs/fes';
+defineRouteMeta({
+ name: "store",
+ title: "vuex测试"
+})
+```
+
+当然在单文件组件中，还可以通过``配置 `meta`：
```vue
@@ -209,15 +219,10 @@ const router = new VueRouter({
```
-在使用`jsx`或者`tsx`时，可以使用`defineRouteMeta` 定义：
+::: tip
+推荐使用`defineRouteMete`，有更好的提示。
+:::
-```jsx
-import { defineRouteMete } from '@fesjs/fes';
-defineRouteMeta({
- name: "store",
- title: "vuex测试"
-})
-```
路由元信息在编译后会附加到路由配置中：
diff --git a/docs/reference/plugin/plugins/layout.md b/docs/reference/plugin/plugins/layout.md
index f5e4dab7..7302d2a9 100644
--- a/docs/reference/plugin/plugins/layout.md
+++ b/docs/reference/plugin/plugins/layout.md
@@ -176,14 +176,14 @@ export const layout = (layoutConfig, { initialState }) => ({
- **详情**：页面布局类型，可选有 `side`、 `top`、 `mixin`
-### isHeaderFixed
+### isFixedHeader
- **类型**：`Boolean`
- **默认值**：`false`
- **详情**：是否固定头部，不跟随页面滚动。
-### isSidebarFixed
+### isFixedSidebar
- **类型**：`Boolean`
- **默认值**：`true`
@@ -345,7 +345,7 @@ export const access = {
1. 个性化 layout 配置改为使用传入 navigation
2. renderHeader 改为 renderCustom
-3. fixedHeader 改为 isHeaderFixed
+3. fixedHeader 改为 isFixedHeader
4. menusConfig 改为 menusProps
-5. fixedSideBar 改为 isSidebarFixed
+5. fixedSideBar 改为 isFixedSidebar
6. 去掉运行时 logo、header、sidebar 三个区域显示配置，请改为使用 navigation: left-right
\ No newline at end of file
diff --git a/packages/fes-plugin-layout/src/runtime/index.js b/packages/fes-plugin-layout/src/runtime/index.js
index 61271e73..00764ec3 100644
--- a/packages/fes-plugin-layout/src/runtime/index.js
+++ b/packages/fes-plugin-layout/src/runtime/index.js
@@ -1,3 +1 @@
-import page from './views/page.vue';
-
-export const Page = page;
+export Page from './views/page.vue';
\ No newline at end of file
diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
index 468dfebd..097de333 100644
--- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
@@ -3,7 +3,7 @@
-
+
-
+
-
+
@@ -209,11 +209,11 @@ export default {
type: String,
default: 'side', // side 左右（上/下）、 top 上/下、 mixin 上/下（左/右）
},
- isHeaderFixed: {
+ isFixedHeader: {
type: Boolean,
default: false,
},
- isSidebarFixed: {
+ isFixedSidebar: {
type: Boolean,
default: true,
},
@@ -243,11 +243,11 @@ export default {
return props.navigation;
});
- const currentFixedHeaderRef = computed(() => props.isHeaderFixed || props.navigation === 'mixin');
+ const currentFixedHeaderRef = computed(() => props.isFixedHeader || props.navigation === 'mixin');
const headerStyleRef = computed(() => (currentFixedHeaderRef.value ? { top: `${headerHeightRef.value}px` } : null));
const sideStyleRef = computed(() => {
const left = collapsedRef.value ? '48px' : `${props.sideWidth}px`;
- return props.isSidebarFixed ? { left } : null;
+ return props.isFixedSidebar ? { left } : null;
});
onMounted(() => {