Commit 0c8e30a9 authored by Sendya's avatar Sendya Committed by 言肆

fix: update deps

parent 1c2a611c
import { defineComponent, createApp } from 'vue';
import { Layout, Menu } from 'ant-design-vue';
const View = defineComponent({
setup() {
return () => (
<Layout>
<Layout.Header>header</Layout.Header>
<Layout>
<Layout.Sider>
<Menu>
<Menu.Item>
<span>123</span>
</Menu.Item>
</Menu>
</Layout.Sider>
<Layout.Content>
<div>content</div>
</Layout.Content>
</Layout>
</Layout>
);
},
});
const app = createApp(View);
app.mount('#__vue-content>div');
......@@ -22,9 +22,9 @@
"prepublishOnly": "npm run lint && npm run compile && npm run test"
},
"peerDependencies": {
"ant-design-vue": "^2.0.0",
"ant-design-vue": ">=2.2.0",
"vue-router": "^4.0.3",
"vue": ">=3.0.0"
"vue": ">=3.1.0"
},
"devDependencies": {
"@ant-design-vue/tools": "^3.0.8",
......@@ -45,7 +45,7 @@
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-typescript": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.0.3",
"@vue/compiler-sfc": "^3.1.1",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/test-utils": "^2.0.0-beta.2",
......@@ -66,13 +66,13 @@
"ts-jest": "^26.4.4",
"ts-node": "^9.1.1",
"typescript": "~3.9.3",
"vue": "^3.0.5",
"vue": "^3.1.1",
"vue-jest": "^5.0.0-alpha.3",
"vue-router": "^4.0.3"
},
"dependencies": {
"@babel/runtime": "^7.11.2",
"ant-design-vue": "^2.0.0",
"ant-design-vue": "^2.2.0-beta.2",
"core-js": "^3.9.1",
"lodash-es": "^4.17.20",
"omit.js": "^2.0.2",
......
......@@ -7,7 +7,7 @@ import { default as SiderMenuWrapper, SiderMenuWrapperProps } from './SiderMenu'
import { WrapContent } from './WrapContent';
import { default as Header, HeaderViewProps } from './Header';
import { CustomRender, WithFalse } from './typings';
import { getCustomRender, PropRenderType, PropTypes } from './utils';
import { getPropsSlot, PropRenderType, PropTypes } from './utils';
import omit from 'omit.js';
import useMediaQuery from './hooks/useMediaQuery';
import './BasicLayout.less';
......@@ -114,12 +114,12 @@ const ProLayout = defineComponent({
}
return <Header matchMenuKeys={matchMenuKeys || []} {...p} headerHeight={48} />;
};
const rightContentRender = getCustomRender(props, slots, 'rightContentRender');
const customHeaderRender = getCustomRender(props, slots, 'headerRender');
const menuHeaderRender = getCustomRender(props, slots, 'menuHeaderRender');
const footerRender = getCustomRender(props, slots, 'footerRender');
// const menuRender = getCustomRender(props, slots, 'menuRender');
const breadcrumbRender = getCustomRender(props, slots, 'breadcrumbRender');
const rightContentRender = getPropsSlot(slots, props, 'rightContentRender');
const customHeaderRender = getPropsSlot(slots, props, 'headerRender');
const menuHeaderRender = getPropsSlot(slots, props, 'menuHeaderRender');
const footerRender = getPropsSlot(slots, props, 'footerRender');
// const menuRender = getPropsSlot(slots, props, 'menuRender');
const breadcrumbRender = getPropsSlot(slots, props, 'breadcrumbRender');
const headerDom = computed(() =>
headerRender(
......
......@@ -6,7 +6,7 @@ import { PageHeaderProps } from './interfaces/PageHeader';
import { AffixProps } from './interfaces/Affix';
/* replace antd ts define end */
import { RouteContextProps, useRouteContext } from '../RouteContext';
import { getCustomRender } from '../utils';
import { getPropsSlot } from '../utils';
import { withInstall } from 'ant-design-vue/es/_util/type';
import 'ant-design-vue/es/affix/style';
import Affix from 'ant-design-vue/es/affix';
......@@ -194,10 +194,10 @@ const PageContainer: FunctionalComponent<PageContainerProps> = (props, { slots }
};
});
const tags = getCustomRender(props, slots, 'tags');
const headerContent = getCustomRender(props, slots, 'content');
const extra = getCustomRender(props, slots, 'extra');
const extraContent = getCustomRender(props, slots, 'extraContent');
const tags = getPropsSlot(slots, props, 'tags');
const headerContent = getPropsSlot(slots, props, 'content');
const extra = getPropsSlot(slots, props, 'extra');
const extraContent = getPropsSlot(slots, props, 'extraContent');
const content = slots.default ? (
<div>
......
......@@ -27,8 +27,8 @@ export function useRootSubmenuKeys(menus: MenuDataItem[]): ComputedRef<string[]>
// ts typo
interface CustomMenuRender {
menuItemRender: WithFalse<(item: MenuDataItem) => CustomRender>;
subMenuItemRender: WithFalse<(item: MenuDataItem, children?: CustomRender[]) => CustomRender>;
menuItemRender?: WithFalse<(item: MenuDataItem) => CustomRender>;
subMenuItemRender?: WithFalse<(item: MenuDataItem, children?: CustomRender[]) => CustomRender>;
}
export interface BaseMenuProps
extends Partial<PureSettings>,
......@@ -160,7 +160,6 @@ class MenuUtil {
const menuTitle = (i18n && i18n(item.meta?.title)) || item.meta?.title;
const defaultTitle = item.meta?.icon ? (
<span class={`${prefixCls}-menu-item`}>
{!isChildren && <LazyIcon icon={item.meta.icon} />}
<span class={`${prefixCls}-menu-item-title`}>{menuTitle}</span>
</span>
) : (
......@@ -169,7 +168,11 @@ class MenuUtil {
const MenuComponent = item.meta?.type === 'group' ? Menu.ItemGroup : Menu.SubMenu;
return (
<MenuComponent title={defaultTitle} key={item.path}>
<MenuComponent
title={defaultTitle}
key={item.path}
icon={item.meta?.type === 'group' ? null : <LazyIcon icon={item.meta?.icon} />}
>
{this.getNavMenuItems(item.children, true)}
</MenuComponent>
);
......@@ -178,9 +181,10 @@ class MenuUtil {
return (
((this.props.menuItemRender && this.props.menuItemRender(item)) as VNode) || (
<Menu.Item
inlineIndent={24}
disabled={item.meta?.disabled}
danger={item.meta?.danger}
key={item.path}
icon={item.meta?.icon && <LazyIcon icon={item.meta.icon} />}
// onClick={}
>
{this.getMenuItem(item, isChildren)}
......@@ -200,15 +204,12 @@ class MenuUtil {
const { prefixCls, i18n } = this.props;
const menuTitle = (i18n && i18n(item.meta?.title)) || item.meta?.title;
const defaultTitle = item.meta?.icon ? (
<CustomTag {...attrs} {...props}>
<span class={`${prefixCls}-menu-item`}>
{!isChildren && <LazyIcon icon={item.meta.icon} />}
<span class={`${prefixCls}-menu-item-title`}>{menuTitle}</span>
</span>
<CustomTag {...attrs} {...props} class={`${prefixCls}-menu-item`}>
<span class={`${prefixCls}-menu-item-title`}>{menuTitle}</span>
</CustomTag>
) : (
<CustomTag {...attrs} {...props}>
<span class={`${prefixCls}-menu-item`}>{menuTitle}</span>
<CustomTag {...attrs} {...props} class={`${prefixCls}-menu-item`}>
<span>{menuTitle}</span>
</CustomTag>
);
......@@ -233,6 +234,7 @@ export default defineComponent({
const menuUtil = new MenuUtil(props);
const handleOpenChange = (openKeys: string[]): void => {
console.log('openChange', '....');
emit('update:openKeys', openKeys);
};
const handleSelect = (params: {
......@@ -249,7 +251,7 @@ export default defineComponent({
return () => (
<Menu
key="Menu"
inlineCollapsed={(isInline.value && props.collapsed) || undefined}
// inlineCollapsed={(isInline.value && props.collapsed) || undefined}
inlineIndent={16}
mode={props.mode}
theme={props.theme as 'dark' | 'light'}
......
......@@ -198,7 +198,7 @@ const SiderMenu: FunctionalComponent<SiderMenuProps> = (props: SiderMenuProps) =
<Menu.Item
key={'collapsed-button'}
class={`${baseClassName}-collapsed-button`}
title={null}
title={false}
>
{collapsedButtonRender && collapsedButtonRender(collapsed)}
</Menu.Item>
......
......@@ -291,6 +291,13 @@
}
}
a.@{ant-prefix}-pro-menu-item {
color: unset;
&:hover {
color: unset;
}
}
@keyframes fade-in {
0% {
display: none;
......
import { VNodeChild, CSSProperties, HTMLAttributes } from 'vue';
export type MenuMode = 'vertical' | 'vertical-left' | 'vertical-right' | 'horizontal' | 'inline';
export { MenuMode, MenuTheme } from 'ant-design-vue/es/menu/src/interface';
export interface MenuInfo {
key: string | number;
......@@ -27,7 +26,6 @@ export type OpenEventHandler = (
export type CollapseType = 'clickTrigger' | 'responsive';
export type SiderTheme = 'light' | 'dark';
export interface SiderProps extends HTMLAttributes {
prefixCls?: string;
collapsible?: boolean;
......
import { Slots, VNodeChild } from 'vue';
import { MenuDataItem } from '../typings';
export { getComponent } from 'ant-design-vue/es/_util/props-util';
export { getPropsSlot } from 'ant-design-vue/es/_util/props-util';
export { default as PropTypes } from 'ant-design-vue/es/_util/vue-types';
export { default as isUrl } from './isUrl';
export { default as isImg } from './isImg';
export { default as isNil } from './isNil';
export function getComponentOrSlot(props: any, slots: Slots, name: string): VNodeChild {
const comp = props[name] || slots[name];
return typeof comp === 'function' ? comp() : (comp && (comp as VNodeChild)) || false;
}
export function getCustomRender(
props: any,
slots: Slots,
name: string,
): any | /* | CustomRender */ false | null {
const propRender = props[name];
if (propRender === false) {
return false;
}
if (propRender) {
return propRender;
}
const slotVNode = slots[name];
return slotVNode || null;
}
export function warn(valid: boolean, message: string) {
// Support uglify
if (process.env.NODE_ENV !== 'production' && !valid && console !== undefined) {
......
......@@ -2267,6 +2267,17 @@
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-core@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.1.tgz#4f2c5d70eabd454675714cc8bd2b97f6a8efb196"
integrity sha512-Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.1.1"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
......@@ -2275,17 +2286,25 @@
"@vue/compiler-core" "3.0.11"
"@vue/shared" "3.0.11"
"@vue/compiler-sfc@^3.0.3":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
"@vue/compiler-dom@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz#ef60d856ac2ede5b2ad5c72a7a68122895e3d652"
integrity sha512-nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A==
dependencies:
"@vue/compiler-core" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/compiler-sfc@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.1.tgz#d4e4507c013d0b219f0b106b317ec5bb1cde3398"
integrity sha512-lSgMsZaYHF+bAgryq5aUqpvyfhu52GJI2/4LoiJCE5uaxc6FCZfxfgqgw/d9ltiZghv+HiISFtmQVAVvlsk+/w==
dependencies:
"@babel/parser" "^7.13.9"
"@babel/types" "^7.13.0"
"@vue/compiler-core" "3.0.11"
"@vue/compiler-dom" "3.0.11"
"@vue/compiler-ssr" "3.0.11"
"@vue/shared" "3.0.11"
"@vue/compiler-core" "3.1.1"
"@vue/compiler-dom" "3.1.1"
"@vue/compiler-ssr" "3.1.1"
"@vue/shared" "3.1.1"
consolidate "^0.16.0"
estree-walker "^2.0.1"
hash-sum "^2.0.0"
......@@ -2297,13 +2316,13 @@
postcss-selector-parser "^6.0.4"
source-map "^0.6.1"
"@vue/compiler-ssr@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.11.tgz#ac5a05fd1257412fa66079c823d8203b6a889a13"
integrity sha512-66yUGI8SGOpNvOcrQybRIhl2M03PJ+OrDPm78i7tvVln86MHTKhM3ERbALK26F7tXl0RkjX4sZpucCpiKs3MnA==
"@vue/compiler-ssr@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.1.tgz#1d08b98601397258ed059b75966e0e94a385d770"
integrity sha512-7H6krZtVt3h/YzfNp7eYK41hMDz8ZskiBy+Wby+EDRINX6BD9JQ5C8zyy2xAa7T6Iz2VrQzsaJ/Bb52lTPSS5A==
dependencies:
"@vue/compiler-dom" "3.0.11"
"@vue/shared" "3.0.11"
"@vue/compiler-dom" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
version "3.2.0"
......@@ -2347,6 +2366,13 @@
dependencies:
"@vue/shared" "3.0.11"
"@vue/reactivity@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.1.tgz#9c02fd146a6c3b03e7d658b7cf76f4b69b0f98c8"
integrity sha512-DsH5woNVCcPK1M0RRYVgJEU1GJDU2ASOKpAqW3ppHk+XjoFLCbqc/26RTCgTpJYd9z8VN+79Q1u7/QqgQPbuLQ==
dependencies:
"@vue/shared" "3.1.1"
"@vue/runtime-core@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
......@@ -2355,6 +2381,14 @@
"@vue/reactivity" "3.0.11"
"@vue/shared" "3.0.11"
"@vue/runtime-core@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.1.tgz#542110c09a643d7d80646a2f071aff6b324c4158"
integrity sha512-GboqR02txOtkd9F3Ysd8ltPL68vTCqIx2p/J52/gFtpgb5FG9hvOAPEwFUqxeEJRu7ResvQnmdOHiEycGPCLhQ==
dependencies:
"@vue/reactivity" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/runtime-dom@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
......@@ -2364,11 +2398,25 @@
"@vue/shared" "3.0.11"
csstype "^2.6.8"
"@vue/runtime-dom@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.1.tgz#5539bbce132d29f6445b4964cb7b4164a89a5ce6"
integrity sha512-o57n/199e/BBAmLRMSXmD2r12Old/h/gf6BgL0RON1NT2pwm6MWaMY4Ul55eyq+FsDILz4jR/UgoPQ9vYB8xcw==
dependencies:
"@vue/runtime-core" "3.1.1"
"@vue/shared" "3.1.1"
csstype "^2.6.8"
"@vue/shared@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
"@vue/shared@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.1.tgz#2287cfc3dc20e5b20aeb65c2c3a56533bdca801c"
integrity sha512-g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA==
"@vue/test-utils@^2.0.0-beta.2":
version "2.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0-rc.6.tgz#d0aac24d20450d379e183f70542c0822670b8783"
......@@ -2787,10 +2835,10 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
ant-design-vue@^2.0.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-2.1.2.tgz#2065d7e63199c0c584919458af57b6a0b597f677"
integrity sha512-gDG0wauGVt4LE63behrJaIcq4BB+dgs+dpj9jz17IgKr2MPYSEeKetU/x9Kk8d58cGonz4Ulncg7fBZJ7EljsQ==
ant-design-vue@^2.2.0-beta.2:
version "2.2.0-beta.2"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-2.2.0-beta.2.tgz#f6a97245a81e4aabfb792c3ff17292919a2112a7"
integrity sha512-Dqpc1J3aG/beww/Hb8g3I+eDAW+zfxvQNFuyZBmlI7pKAIV6GZOOtQKI4oq8wsvxr32TP/Xl4/ffKN2Z03aefQ==
dependencies:
"@ant-design-vue/use" "^0.0.1-0"
"@ant-design/icons-vue" "^6.0.0"
......@@ -2798,13 +2846,12 @@ ant-design-vue@^2.0.0:
"@simonwep/pickr" "~1.8.0"
array-tree-filter "^2.1.0"
async-validator "^3.3.0"
dom-align "^1.10.4"
dom-align "^1.12.1"
dom-scroll-into-view "^2.0.0"
is-mobile "^2.2.1"
lodash "^4.17.21"
lodash-es "^4.17.15"
moment "^2.27.0"
omit.js "^2.0.0"
resize-observer-polyfill "^1.5.1"
scroll-into-view-if-needed "^2.2.25"
shallow-equal "^1.0.0"
vue-types "^3.0.0"
......@@ -5592,10 +5639,10 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"
dom-align@^1.10.4:
version "1.12.0"
resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c"
integrity sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA==
dom-align@^1.12.1:
version "1.12.2"
resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.2.tgz#0f8164ebd0c9c21b0c790310493cd855892acd4b"
integrity sha512-pHuazgqrsTFrGU2WLDdXxCFabkdQDx72ddkraZNih1KsMcN5qsRSTR9O4VJRlwTPCPb5COYg3LOfiMHHcPInHg==
dom-converter@^0.2:
version "0.2.0"
......@@ -8599,11 +8646,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
is-mobile@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/is-mobile/-/is-mobile-2.2.2.tgz#f6c9c5d50ee01254ce05e739bdd835f1ed4e9954"
integrity sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==
is-negated-glob@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
......@@ -15832,7 +15874,7 @@ vue-types@^3.0.0, vue-types@^3.0.1:
dependencies:
is-plain-object "3.0.1"
vue@^3.0.0, vue@^3.0.5:
vue@^3.0.0:
version "3.0.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
......@@ -15841,6 +15883,15 @@ vue@^3.0.0, vue@^3.0.5:
"@vue/runtime-dom" "3.0.11"
"@vue/shared" "3.0.11"
vue@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.1.tgz#9ad655758a0fa6c0dee5b3d2431d3912a9b381aa"
integrity sha512-j9fj3PNPMxo2eqOKYjMuss9XBS8ZtmczLY3kPvjcp9d3DbhyNqLYbaMQH18+1pDIzzVvQCQBvIf774LsjjqSKA==
dependencies:
"@vue/compiler-dom" "3.1.1"
"@vue/runtime-dom" "3.1.1"
"@vue/shared" "3.1.1"
w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
......
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