diff --git a/src/views/register.vue b/src/views/register.vue index 5b841b8..2a004f1 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -152,9 +152,7 @@ const handleRegister = () => { const [err] = await to(register(registerForm.value)); if (!err) { const username = registerForm.value.username; - await ElMessageBox.alert('' + t('register.registerSuccess', { username }) + '', '系统提示', { - app: undefined, - dangerouslyUseHTMLString: true, + await ElMessageBox.alert(t('register.registerSuccess', { username }), '系统提示', { type: 'success' }); await router.push('/login'); diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index a05579c..4d0deec 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -596,13 +596,21 @@ const importTemplate = () => { const handleFileUploadProgress = () => { upload.isUploading = true; }; + +const formatImportResultMessage = (message: unknown) => { + return String(message ?? '') + .replace(//gi, '\n') + .replace(/ /gi, ' ') + .replace(/<[^>]+>/g, ''); +}; + /** 文件上传成功处理 */ const handleFileSuccess = (response: any, file: UploadFile) => { upload.open = false; upload.isUploading = false; uploadRef.value?.handleRemove(file); - ElMessageBox.alert("
" + response.msg + '
', '导入结果', { - dangerouslyUseHTMLString: true + ElMessageBox.alert(formatImportResultMessage(response.msg), '导入结果', { + customClass: 'import-result-box' }); getList(); }; @@ -708,4 +716,13 @@ async function handleDeptChange(value: number | string) { @use '@/assets/styles/components/page-shell' as pageShell; @include pageShell.tree-table-crud-page; + +:global(.import-result-box .el-message-box__message) { + max-height: 70vh; + overflow-y: auto; + overflow-x: hidden; + padding: 10px 20px 0; + white-space: pre-wrap; + word-break: break-word; +}