diff --git a/src/views/configuration/email-user/components/email-users-dialog.vue b/src/views/configuration/email-user/components/email-users-dialog.vue index f3c96b5..598672a 100644 --- a/src/views/configuration/email-user/components/email-users-dialog.vue +++ b/src/views/configuration/email-user/components/email-users-dialog.vue @@ -8,8 +8,7 @@ import { usePublicHooks } from '@/views/hooks'; const props = withDefaults(defineProps(), { formInline: () => ({ // 邮箱 - email: undefined, - emailTemplate: undefined, + email: '', // 密码 password: undefined, // Host地址 @@ -18,6 +17,7 @@ const props = withDefaults(defineProps(), { port: undefined, // 邮箱协议 smtpAgreement: undefined, + openSSL: false, // 是否为默认邮件 isDefault: false, }), diff --git a/src/views/i18n/i18n-setting/components/i18n-upload-dialog.vue b/src/views/i18n/i18n-setting/components/i18n-upload-dialog.vue index e5f066e..c25e439 100644 --- a/src/views/i18n/i18n-setting/components/i18n-upload-dialog.vue +++ b/src/views/i18n/i18n-setting/components/i18n-upload-dialog.vue @@ -11,6 +11,7 @@ interface Props { type: string; file: any; fileType: string; + isAppend: boolean; }; } @@ -36,6 +37,7 @@ const props = withDefaults(defineProps(), { type: '', file: undefined, fileType: '', + isAppend: true, }), }); @@ -63,6 +65,10 @@ defineExpose({ formRef }); + + + + @@ -75,6 +81,6 @@ defineExpose({ formRef }); - {{ $t('update_tip') }} + {{ $t('update_i18n_tip') }} diff --git a/src/views/i18n/i18n-setting/utils/hooks.tsx b/src/views/i18n/i18n-setting/utils/hooks.tsx index e3cc2e1..61cbfe9 100644 --- a/src/views/i18n/i18n-setting/utils/hooks.tsx +++ b/src/views/i18n/i18n-setting/utils/hooks.tsx @@ -23,18 +23,17 @@ export const downloadI18nSetting = (type: string) => { i18nStore.downloadI18nFile({ type }); }; -/* 下载多语言配置 */ +/* 上传多语言配置 */ export const updateI18nSetting = (fileType: string) => { const uploadFormRef = ref(); addDialog({ title: $t('update_multilingual'), - draggable: true, fullscreenIcon: true, closeOnClickModal: false, - props: { form: { type: undefined, file: undefined, fileType } }, - contentRenderer: () => h(I18NUploadDialog, { ref: uploadFormRef, form: { type: '', file: undefined, fileType } }), + props: { form: { type: undefined, file: undefined, fileType, isAppend: true } }, + contentRenderer: () => h(I18NUploadDialog, { ref: uploadFormRef, form: { type: '', file: undefined, fileType, isAppend: true } }), beforeSure: async (done, { options }) => { uploadFormRef.value.formRef.validate(async (valid: any) => { if (!valid) return; @@ -51,7 +50,6 @@ export const updateI18nSetting = (fileType: string) => { export const onAdd = () => { addDialog({ title: $t('addMultilingual'), - props: { formInline: { keyName: '', translation: '', typeName: '' } }, draggable: true, fullscreenIcon: true,