From 96fc1956828fab8d29e8a459fc9f81ad388b17a7 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 3 Apr 2024 17:10:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=89=8D=E7=82=B9=E5=87=BB=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=AF=BC=E8=87=B4=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataFilling/form/save.vue        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/frontend/src/views/dataFilling/form/save.vue b/core/frontend/src/views/dataFilling/form/save.vue
index 356c23de91..a9ff07da7f 100644
--- a/core/frontend/src/views/dataFilling/form/save.vue
+++ b/core/frontend/src/views/dataFilling/form/save.vue
@@ -142,6 +142,7 @@ export default {
     }
   },
   mounted() {
+    this.loading = true
     this.formData = this.form
 
     forEach(this.formData.forms, f => {
@@ -150,23 +151,24 @@ export default {
         f.settings.mapping.type = f.settings.mapping.typeOptions[0].value
       }
     })
+    const p1 = listDatasourceType()
+    const p2 = listDatasource()
+    const p3 = listForm({ nodeType: 'folder' })
 
-    listDatasourceType().then(res => {
-      this.allDatasourceTypes = res.data
-    })
+    Promise.all([p1, p2, p3]).then((val) => {
+      this.allDatasourceTypes = val[0].data
 
-    listDatasource().then(res => {
-      this.allDatasourceList = res.data
-    })
+      this.allDatasourceList = val[1].data
 
-    listForm({ nodeType: 'folder' }).then(res => {
-      this.folders = res.data || []
+      this.folders = val[2].data || []
       if (this.formData.folder) {
         this.$nextTick(() => {
           this.$refs.tree.setCurrentKey(this.formData.folder)
           this.$refs.tree.setCheckedKeys([this.formData.folder])
         })
       }
+    }).finally(() => {
+      this.loading = false
     })
   },
   methods: {