From edbd800f454cf275d7587a89b44d86b8bb5fe7e0 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 28 Feb 2024 16:10:21 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=20=20-=20[=E5=85=B3=E8=81=94]#[1081086489?=
 =?UTF-8?q?100288]=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86-=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BC=82=E5=B8=B8=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1081?=
 =?UTF-8?q?086489100288?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../complexUploadDialog.vue                   | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue
index 30079f4b..c3f8c3b1 100644
--- a/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue
+++ b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue
@@ -6,7 +6,17 @@
       @on-close="closeDialog"
     >
       <template v-slot>
-        <div>
+        <template v-if="!$utils.isEmpty(errorMessageList)">
+          <Alert type="error" show-icon>
+            {{ $t('message.importfailed') }}：
+            <div slot="desc">
+              <div v-for="(item, index) in errorMessageList" :key="index" class="mb-xs">
+                {{ item }}
+              </div>
+            </div>
+          </Alert>
+        </template>
+        <div v-else>
           <Alert show-icon>
             {{ $t('page.importoverdescrition') }}
           </Alert>
@@ -76,9 +86,11 @@ export default {
   data() {
     return {
       isEmit: false, // 二次弹窗，导入数据是不需要分发方法
+      errorMessageList: [],
       defaultSelectedConfig: {}, // 默认选中的config
       selectedConfig: {},
       configDialog: {
+        hasFooter: true,
         isShow: false,
         type: 'slider',
         width: 'large',
@@ -180,14 +192,22 @@ export default {
         contentType: 'multipart/form-data'
       }).then(res => {
         if (res.Status == 'OK') {
-          this.$Message.success(this.$t(this.$t('message.importsuccess')));
-          this.configDialog.isShow = false;
-          this.$emit('close', true);
+          let {messageList = []} = res.Return || {};
+          if (this.$utils.isEmpty(messageList)) {
+            this.$Message.success(this.$t(this.$t('message.importsuccess')));
+            this.configDialog.isShow = false;
+            this.$emit('close', true);
+          } else {
+            this.errorMessageList = messageList;
+            this.configDialog.hasFooter = false;
+          }
         }
       });
     },
     closeDialog() {
+      this.errorMessageList = [];
       this.configDialog.isShow = false;
+      this.configDialog.hasFooter = true;
       this.$emit('close');
     },
     closeUploadDialog() {
-- 
Gitee