提交 cb1ae34f 编写于 作者: V vben

fix: fix notify type error

上级 d9b19600
......@@ -40,8 +40,8 @@ export default defineComponent({
}
function renderTag() {
const { item, showTitle } = props;
if (!item || showTitle) return null;
const { item, showTitle, isTop } = props;
if (!item || showTitle || isTop) return null;
const { tag } = item;
if (!tag) return null;
......@@ -60,16 +60,15 @@ export default defineComponent({
if (!props.item) {
return null;
}
const { showTitle, isTop } = props;
const { showTitle } = props;
const { name, icon } = props.item;
const searchValue = props.searchValue || '';
const index = name.indexOf(searchValue);
const beforeStr = name.substr(0, index);
const afterStr = name.substr(index + searchValue.length);
let cls = showTitle ? ['show-title'] : ['basic-menu__name'];
const cls = showTitle ? ['show-title'] : ['basic-menu__name'];
isTop && !showTitle && (cls = []);
return (
<>
{renderIcon(icon!)}
......
import type { ModalFunc, ModalFuncProps } from 'ant-design-vue/lib/modal/Modal';
import type { MessageApi } from 'ant-design-vue/lib/message';
import type { VNodeTypes, CSSProperties } from 'vue';
import { Modal, message as Message, notification } from 'ant-design-vue';
import { InfoCircleFilled, CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons-vue';
import { useSetting } from '/@/hooks/core/useSetting';
import { ArgsProps, ConfigProps } from 'ant-design-vue/lib/notification';
export interface ArgsProps {
message: VNodeTypes;
description?: VNodeTypes;
btn?: VNodeTypes;
key?: string;
onClose?: () => void;
duration?: number | null;
icon?: VNodeTypes;
placement?: NotificationPlacement;
style?: CSSProperties;
prefixCls?: string;
class?: string;
readonly type?: IconType;
onClick?: () => void;
top?: number;
bottom?: number;
getContainer?: () => HTMLElement;
closeIcon?: VNodeTypes;
export interface NotifyApi {
info(config: ArgsProps): void;
success(config: ArgsProps): void;
error(config: ArgsProps): void;
warn(config: ArgsProps): void;
warning(config: ArgsProps): void;
open(args: ArgsProps): void;
close(key: String): void;
config(options: ConfigProps): void;
destroy(): void;
}
export declare type NotificationPlacement = 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
export declare type IconType = 'success' | 'info' | 'error' | 'warning';
export interface ConfigProps {
top?: string | number;
bottom?: string | number;
duration?: number;
placement?: NotificationPlacement;
getContainer?: () => HTMLElement;
closeIcon?: VNodeTypes;
}
export interface ModalOptionsEx extends Omit<ModalFuncProps, 'iconType'> {
iconType: 'warning' | 'success' | 'error' | 'info';
}
......@@ -118,7 +101,7 @@ notification.config({
export function useMessage() {
return {
createMessage: Message as MessageApi,
notification: notification as (arg: ArgsProps) => void,
notification: notification as NotifyApi,
createConfirm: createConfirm,
createSuccessModal,
createErrorModal,
......
......@@ -37,7 +37,7 @@ export function resetRouter() {
router.getRoutes().forEach((route) => {
const { name } = route;
if (name && !resetWhiteNameList.includes(name as string)) {
router.removeRoute(name);
router.hasRoute(name) && router.removeRoute(name);
}
});
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册