Unverified Commit 643279dc authored by Sendya's avatar Sendya

fix: breadcrumbRender, build momentjs

parent 9df14c60
{
"name": "@ant-design-vue/pro-layout",
"version": "3.1.0-alpha.1",
"version": "3.1.0-alpha.2",
"license": "MIT",
"files": [
"dist",
......
......@@ -165,10 +165,7 @@ const ProLayout = defineComponent({
const menuHeaderRender = getPropsSlot(slots, props, 'menuHeaderRender');
const footerRender = getPropsSlot(slots, props, 'footerRender');
// const menuRender = getPropsSlot(slots, props, 'menuRender');
const breadcrumbRender = getPropsSlot(slots, props, 'breadcrumbRender');
console.log('collapsedButtonRender', collapsedButtonRender);
console.log('rightContentRender', rightContentRender);
const breadcrumbRender = props['breadcrumbRender'] || slots['breadcrumbRender'];
const headerDom = computed(() =>
headerRender(
{
......
......@@ -135,14 +135,8 @@ const renderFooter = (
'title'
>,
): VNodeChild | JSX.Element => {
const {
tabList,
tabActiveKey,
onTabChange,
tabBarExtraContent,
tabProps,
prefixedClassName,
} = props;
const { tabList, tabActiveKey, onTabChange, tabBarExtraContent, tabProps, prefixedClassName } =
props;
if (tabList && tabList.length) {
return (
<Tabs
......@@ -219,8 +213,6 @@ const defaultPageHeaderRender = (
routes: unref(value.breadcrumb?.routes),
itemRender: value.breadcrumb?.itemRender,
};
//
// inject value
return (
<PageHeader
......
import { Slots } from 'vue';
import type { RouteRecord, RouteRecordRaw } from 'vue-router';
import { MenuDataItem } from '../typings';
import PropTypes from 'ant-design-vue/es/_util/vue-types';
import { MenuDataItem } from '../typings';
export { default as isUrl } from './isUrl';
export { default as isImg } from './isImg';
......@@ -30,7 +30,9 @@ export function clearMenuItem(menusData: RouteRecord[] | RouteRecordRaw[]): Rout
if (finalItem && finalItem?.children) {
if (
!finalItem.meta?.hideChildInMenu &&
finalItem.children.some((child: RouteRecord | RouteRecordRaw) => child && child.name && !child.meta?.hideInMenu)
finalItem.children.some(
(child: RouteRecord | RouteRecordRaw) => child && child.name && !child.meta?.hideInMenu,
)
) {
return {
...item,
......@@ -47,12 +49,12 @@ export function clearMenuItem(menusData: RouteRecord[] | RouteRecordRaw[]): Rout
export function flatMap(menusData: RouteRecord[]): MenuDataItem[] {
return menusData
.map(item => {
let finalItem = { ...item } as MenuDataItem;
const finalItem = { ...item } as MenuDataItem;
if (!finalItem.name || finalItem.meta?.hideInMenu) {
return null;
}
if (finalItem.children) {
delete finalItem.children
delete finalItem.children;
}
return finalItem;
})
......@@ -66,7 +68,7 @@ export function getMenuFirstChildren(menus: MenuDataItem[], key?: string) {
}
export function getPropsSlot(slots: Slots, props: Record<string, any>, prop = 'default') {
return props[prop] ?? slots[prop]?.();
return props[prop] || slots[prop]?.();
}
export const PropRenderType = {
......
......@@ -19,26 +19,21 @@ export default defineConfig({
name: 'ProLayout',
},
rollupOptions: {
// input: {
// main: resolve(__dirname, 'index.html'),
// },
external: ['vue'],
external: ['vue', '@ant-design/icons-vue', 'ant-design-vue', 'antd', 'moment'],
output: {
// Provide global variables to use in the UMD build
// for externalized deps
globals: {
vue: 'Vue',
moment: 'moment',
'ant-design-vue': 'antd',
'@ant-design/icons-vue': 'iconsVue',
},
},
},
},
optimizeDeps: {
include: [
/* '@ant-design-vue/pro-layout', */
'ant-design-vue/es',
'@ant-design/icons-vue',
'lodash-es',
],
include: ['ant-design-vue/es', '@ant-design/icons-vue', 'lodash-es'],
},
css: {
postcss: {},
......
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