Skip to content

Commit 8058d61

Browse files
committed
fix(Data Source): A prompt will appear when the import is complete.
1 parent ad0b747 commit 8058d61

1 file changed

Lines changed: 29 additions & 2 deletions

File tree

frontend/src/views/system/excel-upload/UploaderRemark.vue

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const onError = (err: Error) => {
134134
infoMessage.value = msg
135135
hasError.value = true
136136
close()
137-
showResult()
137+
ElMessage.error(err.toString())
138138
}
139139
140140
const dialogShow = ref<boolean>(false)
@@ -144,7 +144,13 @@ const resultShow = ref(false)
144144
function showResult() {
145145
resultShow.value = true
146146
}
147-
147+
function closeResult() {
148+
resultShow.value = false
149+
}
150+
function backToUpload() {
151+
closeResult()
152+
open()
153+
}
148154
function open() {
149155
dialogShow.value = true
150156
errorFileName.value = ''
@@ -253,6 +259,27 @@ const submitUpload = () => {
253259
</span>
254260
</template>
255261
</el-dialog>
262+
263+
<el-dialog
264+
v-model="resultShow"
265+
:title="t('user.notes_import_completed')"
266+
width="600px"
267+
class="user-import-class"
268+
@close="closeResult"
269+
>
270+
<div class="down-template-content">
271+
{{ infoMessage }}
272+
</div>
273+
274+
<template #footer>
275+
<span class="dialog-footer">
276+
<el-button @click="closeResult">{{ t('common.cancel') }}</el-button>
277+
<el-button type="primary" @click="backToUpload">
278+
{{ t('common.continue_to_upload') }}
279+
</el-button>
280+
</span>
281+
</template>
282+
</el-dialog>
256283
</template>
257284

258285
<style lang="less">

0 commit comments

Comments
 (0)