From 6fe571cb13cfbf13b3043ee875cdd62be65ba8d7 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Tue, 21 Jun 2022 16:07:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/reference/plugin/plugins/layout.md       |  4 +-
 .../fes-plugin-layout/src/runtime/index.js    |  4 +-
 packages/fes-plugin-layout/types.d.ts         | 38 ++++++++++++++-----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/docs/reference/plugin/plugins/layout.md b/docs/reference/plugin/plugins/layout.md
index 7302d2a9..1f04b820 100644
--- a/docs/reference/plugin/plugins/layout.md
+++ b/docs/reference/plugin/plugins/layout.md
@@ -254,7 +254,7 @@ export const layout = (layoutConfig, { initialState }) => ({
 
 
 
-### menusProps
+### menuProps
 - **类型**：`Object`
   
 - **默认值**：`{}`
@@ -346,6 +346,6 @@ export const access = {
 1. 个性化 layout 配置改为使用传入 navigation
 2. renderHeader 改为 renderCustom
 3. fixedHeader 改为 isFixedHeader
-4. menusConfig 改为 menusProps
+4. menusConfig 改为 menuProps
 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 00764ec3..61271e73 100644
--- a/packages/fes-plugin-layout/src/runtime/index.js
+++ b/packages/fes-plugin-layout/src/runtime/index.js
@@ -1 +1,3 @@
-export Page from './views/page.vue';
\ No newline at end of file
+import page from './views/page.vue';
+
+export const Page = page;
diff --git a/packages/fes-plugin-layout/types.d.ts b/packages/fes-plugin-layout/types.d.ts
index d90459cb..e851c2cf 100644
--- a/packages/fes-plugin-layout/types.d.ts
+++ b/packages/fes-plugin-layout/types.d.ts
@@ -1,4 +1,4 @@
-import { Component } from 'vue';
+import {Component, VNode, Ref } from 'vue';
 import { Router, NavigationGuard } from 'vue-router';
 
 interface Menu {
@@ -6,21 +6,27 @@ interface Menu {
     path: string;
     match: string[];
     title: string;
-    icon: string;
+    icon: string | Component;
     children?: Menu[]
 }
 
 export interface LayoutBuildConfig {
     layout: {
-        title: string;
         footer: string;
         theme: 'dark' | 'light';
+        navigation: 'side' | 'top' | 'mixin' | 'left-right';
+        title: string;
+        isFixedHeader: boolean;
+        isFixedSidebar: boolean;
+        logo: string;
         multiTabs: boolean;
-        navigation: 'side' | 'top' | 'mixin';
-        fixedHeader: boolean;
-        fixedSideBar: boolean;
         sideWidth: number;
         menus: Menu[];
+        menuProps: {
+            expandedKeys: string[];
+            defaultExpandAll: boolean;
+            accordion: boolean;
+        };
     };
 }
 
@@ -28,10 +34,22 @@ export interface LayoutBuildConfig {
 
 export interface LayoutRuntimeConfig {
     layout: {
-        header: boolean;
-        sidebar: boolean;
-        logo: boolean;
-        customHeader: Component,
+        footer: string;
+        theme: 'dark' | 'light';
+        navigation: 'side' | 'top' | 'mixin' | 'left-right';
+        title: string;
+        isFixedHeader: boolean;
+        isFixedSidebar: boolean;
+        logo: string;
+        multiTabs: boolean;
+        sideWidth: number;
+        menus: Menu[] | (()=> (Ref<Menu[]> | Menu[]));
+        menuProps: {
+            expandedKeys: string[];
+            defaultExpandAll: boolean;
+            accordion: boolean;
+        };
+        renderCustom: ()=> VNode[],
         noFoundHandler: (param: { router: Router } & NavigationGuard) => void;
         unAccessHandler: (param: { router: Router } & NavigationGuard) => void;
     };