Commit 3023bbee authored by Sendya's avatar Sendya

fix: breadcrumbRender update

parent fe58716d
...@@ -158,37 +158,15 @@ const ProLayout = defineComponent({ ...@@ -158,37 +158,15 @@ const ProLayout = defineComponent({
} }
return <Header {...p} matchMenuKeys={matchMenuKeys || []} />; return <Header {...p} matchMenuKeys={matchMenuKeys || []} />;
}; };
const breadcrumb = computed(() => ({
...props.breadcrumb,
itemRender: getPropsSlotfn(slots, props, 'breadcrumbRender'),
}));
// const restProps = computed(() =>
// omit(props, []),
// );
// provide('route-context', routeContext);
// const routeContext = reactive({
// getPrefixCls,
// // ...props,
// locale: refProps.locale.value || defaultRouteContext.locale,
// breadcrumb: computed(() => {
// return {
// ...props.breadcrumb,
// itemRender: breadcrumbRender,
// };
// }),
// contentWidth: refProps.contentWidth, // 'Fluid',
// layout: refProps.layout,
// navTheme: refProps.navTheme,
// splitMenus: refProps.splitMenus,
// fixedHeader: refProps.fixSiderbar,
// fixSiderbar: refProps.fixSiderbar,
// sideWidth: siderWidth,
// headerHeight: refProps.headerHeight,
// hasFooterToolbar: false,
// menuData: refProps.menuData,
// selectedKeys: refProps.selectedKeys,
// openKeys: refProps.openKeys,
// });
const routeContext = reactive<RouteContextProps>({ const routeContext = reactive<RouteContextProps>({
...defaultRouteContext, ...defaultRouteContext,
...(omit(toRefs(props), ['onCollapse', 'onOpenKeys', 'onSelect', 'onMenuClick']) as any), ...(omit(toRefs(props), ['onCollapse', 'onOpenKeys', 'onSelect', 'onMenuClick']) as any),
breadcrumb: breadcrumb,
}); });
provideRouteContext(routeContext); provideRouteContext(routeContext);
return () => { return () => {
...@@ -212,7 +190,6 @@ const ProLayout = defineComponent({ ...@@ -212,7 +190,6 @@ const ProLayout = defineComponent({
const customHeaderRender = getPropsSlot(slots, props, 'headerRender'); const customHeaderRender = getPropsSlot(slots, props, 'headerRender');
const menuHeaderRender = getPropsSlot(slots, props, 'menuHeaderRender'); const menuHeaderRender = getPropsSlot(slots, props, 'menuHeaderRender');
const footerRender = getPropsSlot(slots, props, 'footerRender'); const footerRender = getPropsSlot(slots, props, 'footerRender');
const breadcrumbRender = getPropsSlotfn(slots, props, 'breadcrumbRender');
// menu render // menu render
const menuItemRender = getPropsSlotfn(slots, props, 'menuItemRender'); const menuItemRender = getPropsSlotfn(slots, props, 'menuItemRender');
const subMenuItemRender = getPropsSlotfn(slots, props, 'subMenuItemRender'); const subMenuItemRender = getPropsSlotfn(slots, props, 'subMenuItemRender');
......
...@@ -135,14 +135,8 @@ const renderFooter = ( ...@@ -135,14 +135,8 @@ const renderFooter = (
'title' 'title'
>, >,
): VNodeChild | JSX.Element => { ): VNodeChild | JSX.Element => {
const { const { tabList, tabActiveKey, onTabChange, tabBarExtraContent, tabProps, prefixedClassName } =
tabList, props;
tabActiveKey,
onTabChange,
tabBarExtraContent,
tabProps,
prefixedClassName,
} = props;
if (tabList && tabList.length) { if (tabList && tabList.length) {
return ( return (
<Tabs <Tabs
...@@ -195,7 +189,7 @@ const renderPageHeader = ( ...@@ -195,7 +189,7 @@ const renderPageHeader = (
const defaultPageHeaderRender = ( const defaultPageHeaderRender = (
props: PageContainerProps, props: PageContainerProps,
value: RouteContextProps & { prefixedClassName: string }, value: Required<RouteContextProps> & { prefixedClassName: string },
): VNodeChild | JSX.Element => { ): VNodeChild | JSX.Element => {
const { const {
title, title,
...@@ -214,10 +208,11 @@ const defaultPageHeaderRender = ( ...@@ -214,10 +208,11 @@ const defaultPageHeaderRender = (
if (!title && title !== false) { if (!title && title !== false) {
pageHeaderTitle = value.title; pageHeaderTitle = value.title;
} }
console.info('value.breadcrumb', value.breadcrumb);
const breadcrumb = restProps.breadcrumb || { const breadcrumb = restProps.breadcrumb || {
routes: value.breadcrumb?.routes, ...(value.breadcrumb || {}),
itemRender: value.breadcrumb?.itemRender, routes: unref(value.breadcrumb?.routes),
itemRender: unref(value.breadcrumb?.itemRender),
}; };
// inject value // inject value
return ( return (
...@@ -259,7 +254,7 @@ const PageContainer = defineComponent({ ...@@ -259,7 +254,7 @@ const PageContainer = defineComponent({
const headerContent = getPropsSlot(slots, props, 'content'); const headerContent = getPropsSlot(slots, props, 'content');
const extra = getPropsSlot(slots, props, 'extra'); const extra = getPropsSlot(slots, props, 'extra');
const extraContent = getPropsSlot(slots, props, 'extraContent'); const extraContent = getPropsSlot(slots, props, 'extraContent');
console.info('value', value);
return ( return (
<div class={`${prefixedClassName.value}-warp`}> <div class={`${prefixedClassName.value}-warp`}>
{defaultPageHeaderRender( {defaultPageHeaderRender(
...@@ -270,11 +265,12 @@ const PageContainer = defineComponent({ ...@@ -270,11 +265,12 @@ const PageContainer = defineComponent({
extra, extra,
extraContent, extraContent,
}, },
{ value,
...value, // {
prefixCls: undefined, // ...value,
prefixedClassName: prefixedClassName.value, // prefixCls: undefined,
}, // prefixedClassName: prefixedClassName.value,
// },
)} )}
</div> </div>
); );
......
...@@ -2519,16 +2519,11 @@ object.values@^1.1.3: ...@@ -2519,16 +2519,11 @@ object.values@^1.1.3:
define-properties "^1.1.3" define-properties "^1.1.3"
es-abstract "^1.18.2" es-abstract "^1.18.2"
omit.js@^2.0.0: omit.js@^2.0.0, omit.js@^2.0.2:
version "2.0.2" version "2.0.2"
resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f" resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f"
integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg== integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==
omit.js@^2.0.2:
version "2.0.2"
resolved "https://registry.npm.taobao.org/omit.js/download/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f"
integrity sha1-3ZuENvq5R6Xz/yFMslOGMeMT7C8=
once@^1.3.0: once@^1.3.0:
version "1.4.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment