From d7531554a274ad9d793ea621739dfffdc7f73db8 Mon Sep 17 00:00:00 2001 From: vben Date: Wed, 10 Feb 2021 01:03:28 +0800 Subject: [PATCH] fix(i18n): fix useMessage i18n type #262 --- src/hooks/web/useMessage.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/hooks/web/useMessage.tsx b/src/hooks/web/useMessage.tsx index 0bc2ae6e..56074e0e 100644 --- a/src/hooks/web/useMessage.tsx +++ b/src/hooks/web/useMessage.tsx @@ -4,6 +4,7 @@ import { Modal, message as Message, notification } from 'ant-design-vue'; import { InfoCircleFilled, CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons-vue'; import { ArgsProps, ConfigProps } from 'ant-design-vue/lib/notification'; +import { useI18n } from './useI18n'; export interface NotifyApi { info(config: ArgsProps): void; @@ -62,14 +63,17 @@ function createConfirm(options: ModalOptionsEx): ConfirmOptions { return (Modal.confirm(opt) as unknown) as ConfirmOptions; } -const baseOptions = { - okText: '确定', - centered: true, +const getBaseOptions = () => { + const { t } = useI18n(); + return { + okText: t('common.okText'), + centered: true, + }; }; function createModalOptions(options: ModalOptionsPartial, icon: string): ModalOptionsPartial { return { - ...baseOptions, + ...getBaseOptions(), ...options, content: renderContent(options), icon: getIcon(icon), -- GitLab