Unverified Commit 643279dc authored by Sendya's avatar Sendya

fix: breadcrumbRender, build momentjs

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