diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 5b9e7f6b7e..53830a40e5 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -65,14 +65,19 @@ margin-top: 16px; } } -.ms-modal-weak { +.ms-usemodal { + .arco-modal-body { + @apply p-0; + } +} +.ms-usemodal-weak { .arco-modal-footer { .arco-btn:first-child { color: var(--color-text-1) !important; } } } -.ms-modal-warning { +.ms-usemodal-warning { .arco-modal-title-icon { .arco-icon { color: rgb(var(--danger-6)); @@ -93,12 +98,27 @@ } } .ms-modal-medium { - width: 680px; + .arco-modal { + width: 680px; + } } .ms-modal-large { - width: 960px; + .arco-modal { + width: 960px; + } } .ms-modal-small { + .arco-modal { + width: 480px; + } +} +.ms-usemodal-medium { + width: 680px; +} +.ms-usemodal-large { + width: 960px; +} +.ms-usemodal-small { width: 480px; } diff --git a/frontend/src/hooks/useModal.ts b/frontend/src/hooks/useModal.ts index 19344aa352..b12a949031 100644 --- a/frontend/src/hooks/useModal.ts +++ b/frontend/src/hooks/useModal.ts @@ -28,9 +28,9 @@ export default function useModal() { simple: false, ...options, titleAlign: 'start', - modalClass: `ms-modal-${options.mode || 'default'} ms-modal-${options.size || 'small'} ms-modal-${ - options.type - }`, + modalClass: `ms-usemodal ms-usemodal-${options.mode || 'default'} ms-usemodal-${ + options.size || 'small' + } ms-usemodal-${options.type}`, }), }; } diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue index df872aa289..23bdba7523 100644 --- a/frontend/src/views/setting/system/user/index.vue +++ b/frontend/src/views/setting/system/user/index.vue @@ -861,14 +861,14 @@ const importSuccessCount = ref(0); const importFailCount = ref(0); const importErrorFileUrl = ref(''); - const importResult = ref<'success' | 'allFail' | 'fail'>('success'); + const importResult = ref<'success' | 'allFail' | 'fail'>('allFail'); const importResultTitle = ref(t('system.user.importSuccessTitle')); function showImportModal() { importVisible.value = true; importFailCount.value = 0; importSuccessCount.value = 0; - importResult.value = 'success'; + importResult.value = 'allFail'; } function cancelImport() {