From fee4c0c28f0654bd9a5fa9e165514d59622e1502 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 17 Mar 2022 17:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/2.0.5/AppCodeGeneration/components/Add.vue    | 8 ++++++--
 packages/2.0.5/AppCodeGeneration/components/Detail.vue | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/2.0.5/AppCodeGeneration/components/Add.vue b/packages/2.0.5/AppCodeGeneration/components/Add.vue
index 1820bbf5..6bb416b8 100644
--- a/packages/2.0.5/AppCodeGeneration/components/Add.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/Add.vue
@@ -141,7 +141,7 @@
     </template>
     <template #footer>
       <el-button class="delete-btn footer-btn" @click="onBack">取消</el-button>
-      <el-button class="footer-btn" type="primary" @click="submit('formData')">提交</el-button>
+      <el-button class="footer-btn" type="primary" :loading="isLoading" @click="submit('formData')">提交</el-button>
     </template>
   </ai-detail>
 </template>
@@ -169,6 +169,7 @@ export default {
           return time.getTime() < Date.now() - 8.64e7;
         }
       },
+      isLoading: false,
       girdName: '',
       gridFieldName: '',
       showGrid: false,
@@ -391,7 +392,6 @@ export default {
             }
 
             if (item.type === 'upload' && this.formData[item.fieldDbName]) {
-              console.log(this.formData[item.fieldDbName])
               this.formData[item.fieldDbName] = this.formData[item.fieldDbName].split(',').map(v => {
                 return {
                   url: v
@@ -410,6 +410,7 @@ export default {
     submit() {
       this.$refs.formData?.validate((valid) => {
         if (valid) {
+          this.isLoading = true
           this.formDataList.map((item) => {
             if (item.length) {
               item.map((items) => {
@@ -436,12 +437,15 @@ export default {
             ...this.formData,
             id: this.params.id || ''
           }).then((res) => {
+            this.isLoading = false
             if (res.code == 0) {
               this.$message.success('提交成功')
               setTimeout(() => {
                 this.onBack(true)
               }, 600)
             }
+          }).catch(() => {
+            this.isLoading = false
           })
         }
       })
diff --git a/packages/2.0.5/AppCodeGeneration/components/Detail.vue b/packages/2.0.5/AppCodeGeneration/components/Detail.vue
index 0a51ff89..97647ee3 100644
--- a/packages/2.0.5/AppCodeGeneration/components/Detail.vue
+++ b/packages/2.0.5/AppCodeGeneration/components/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail v-if="pageShow" isHasSidebar>
+  <ai-detail v-loading="pageShow" isHasSidebar>
     <template #title>
       <ai-title :title="colData.applicationName+'详情'" isShowBottomBorder isShowBack @onBackClick="onBack(true)"></ai-title>
     </template>
@@ -82,6 +82,7 @@
     },
 
     mounted () {
+      this.pageShow = true
       this.getDetail()
     },
 
@@ -164,13 +165,17 @@
           if (res?.data) {
             this.formData = res.data
             this.getFormData()
+
+            this.pageShow = false
           }
+        }).catch(() => {
+          this.pageShow = false
         })
       },
 
       getDictList (listName) {
         this.dict.load(listName.join(',')).then(() => {
-          this.pageShow = true
+          
         })
       },