Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复Modal.confirm的返回类型问题，需要有destroy，update的方法 #3161

Merged
merged 2 commits into from
Oct 17, 2023
Merged

fix: 修复Modal.confirm的返回类型问题，需要有destroy，update的方法 #3161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4988a90
fix: 修复Modal.confirm的返回类型问题，需要有destroy，update的方法
a63149300 Oct 17, 2023
d50ecc1
chore: simplify
likui628 Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/hooks/web/useMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ModalFunc, ModalFuncProps } from 'ant-design-vue/lib/modal/Modal';
import type { ModalFuncProps } from 'ant-design-vue/lib/modal/Modal';
import { Modal, message as Message, notification } from 'ant-design-vue';
import { InfoCircleFilled, CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons-vue';
import { NotificationArgsProps, ConfigProps } from 'ant-design-vue/lib/notification';
Expand All @@ -24,14 +24,6 @@ export interface ModalOptionsEx extends Omit<ModalFuncProps, 'iconType'> {
}
export type ModalOptionsPartial = Partial<ModalOptionsEx> & Pick<ModalOptionsEx, 'content'>;

interface ConfirmOptions {
info: ModalFunc;
success: ModalFunc;
error: ModalFunc;
warn: ModalFunc;
warning: ModalFunc;
}

function getIcon(iconType: string) {
if (iconType === 'warning') {
return <InfoCircleFilled class="modal-icon-warning" />;
Expand All @@ -55,7 +47,7 @@ function renderContent({ content }: Pick<ModalOptionsEx, 'content'>) {
/**
* @description: Create confirmation box
*/
function createConfirm(options: ModalOptionsEx): ConfirmOptions {
function createConfirm(options: ModalOptionsEx) {
const iconType = options.iconType || 'warning';
Reflect.deleteProperty(options, 'iconType');
const opt: ModalFuncProps = {
Expand All @@ -64,7 +56,7 @@ function createConfirm(options: ModalOptionsEx): ConfirmOptions {
...options,
content: renderContent(options),
};
return Modal.confirm(opt) as unknown as ConfirmOptions;
return Modal.confirm(opt);
}

const getBaseOptions = () => {
Expand Down Expand Up @@ -112,7 +104,7 @@ export function useMessage() {
return {
createMessage: Message,
notification: notification as NotifyApi,
createConfirm: createConfirm,
createConfirm,
createSuccessModal,
createErrorModal,
createInfoModal,
Expand Down