fix: menuRender

tpim · Jul 31, 2020 · 30d1ccb · 30d1ccb
1 parent 6e46139
commit 30d1ccb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/BasicLayout.jsx b/src/BasicLayout.jsx
@@ -93,6 +93,7 @@ const BasicLayout = {
     const menuHeaderRender = getComponentFromProp(content, 'menuHeaderRender')
     const breadcrumbRender = getComponentFromProp(content, 'breadcrumbRender')
     const headerContentRender = getComponentFromProp(content, 'headerContentRender')
+    const menuRender = getComponentFromProp(content, 'menuRender')
 
     const isTopMenu = layout === 'topmenu'
     const hasSiderMenu = !isTopMenu
@@ -107,7 +108,8 @@ const BasicLayout = {
       rightContentRender,
       collapsedButtonRender,
       breadcrumbRender,
-      headerContentRender
+      headerContentRender,
+      menuRender
     }
 
     return (

diff --git a/src/components/SiderMenu/SiderMenu.jsx b/src/components/SiderMenu/SiderMenu.jsx
@@ -24,6 +24,7 @@ export const SiderMenuProps = {
   title: PropTypes.string.def(''),
   // render function or vnode
   menuHeaderRender: PropTypes.oneOfType([PropTypes.func, PropTypes.array, PropTypes.object, PropTypes.bool]),
+  menuRender: PropTypes.oneOfType([PropTypes.func, PropTypes.array, PropTypes.object, PropTypes.bool]),
 }
 
 export const defaultRenderLogo = (h, logo) => {
@@ -83,7 +84,8 @@ const SiderMenu = {
       handleCollapse,
       onMenuHeaderClick = () => null,
       i18nRender,
-      menuHeaderRender
+      menuHeaderRender,
+      menuRender
     } = this
     const siderCls = ['ant-pro-sider-menu-sider']
     if (fixSiderbar) siderCls.push('fix-sider-bar')
@@ -118,7 +120,13 @@ const SiderMenu = {
           </router-link>
         </div>
       )}
-      <BaseMenu collapsed={collapsed} menus={menus} mode={mode} theme={theme} i18nRender={i18nRender} />
+      {menuRender && (
+        isFun(menuRender)
+          && menuRender(h, this.$props)
+          || menuRender
+      ) || (
+        <BaseMenu collapsed={collapsed} menus={menus} mode={mode} theme={theme} i18nRender={i18nRender} />
+      )}
     </Sider>)
   }
 }