From 92a11863a75f35c7f579cd17c8f934017dd24fa8 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Tue, 14 Mar 2023 14:03:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=B2=E5=AE=89=E8=A3=85=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=94=B9=E4=B8=BA=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/app_install.go               | 16 +++++++---------
 frontend/src/views/app-store/installed/index.vue |  7 ++++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/backend/app/service/app_install.go b/backend/app/service/app_install.go
index 693097437..a6ef4cf95 100644
--- a/backend/app/service/app_install.go
+++ b/backend/app/service/app_install.go
@@ -275,16 +275,14 @@ func (a AppInstallService) SyncAll() error {
 	if err != nil {
 		return err
 	}
-	go func() {
-		for _, i := range allList {
-			if i.Status == constant.Installing {
-				continue
-			}
-			if err := syncById(i.ID); err != nil {
-				global.LOG.Errorf("sync install app[%s] error,mgs: %s", i.Name, err.Error())
-			}
+	for _, i := range allList {
+		if i.Status == constant.Installing {
+			continue
 		}
-	}()
+		if err := syncById(i.ID); err != nil {
+			global.LOG.Errorf("sync install app[%s] error,mgs: %s", i.Name, err.Error())
+		}
+	}
 	return nil
 }
 
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index 37805063e..10058d099 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <LayoutContent v-loading="loading" :title="activeName" :divider="true">
+    <LayoutContent v-loading="loading || syncLoading" :title="activeName" :divider="true">
         <template #toolbar>
             <el-row :gutter="5">
                 <el-col :span="20">
@@ -203,6 +203,7 @@ import { MsgSuccess } from '@/utils/message';
 
 let data = ref<any>();
 let loading = ref(false);
+let syncLoading = ref(false);
 let timer: NodeJS.Timer | null = null;
 const paginationConfig = reactive({
     currentPage: 1,
@@ -235,14 +236,14 @@ let activeName = ref(i18n.global.t('app.installed'));
 let mode = ref('installed');
 
 const sync = () => {
-    loading.value = true;
+    syncLoading.value = true;
     SyncInstalledApp()
         .then(() => {
             MsgSuccess(i18n.global.t('app.syncSuccess'));
             search();
         })
         .finally(() => {
-            loading.value = false;
+            syncLoading.value = false;
         });
 };