feat: 导入成功或失败都关闭dialog (#1955)

TencentBlueKing · Sep 30, 2024 · 6a10e3c · 6a10e3c
1 parent 6acf90c
commit 6a10e3c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/pages/src/hooks/useDataSource.ts b/src/pages/src/hooks/useDataSource.ts
@@ -113,10 +113,10 @@ export const useDataSource = () => {
   };
 
   const stopOperationPollingRule = (data) => {
-    if (data.status === 'success') {
+    if (data.status === 'success' || data.status === 'failed') {
       stopPolling();
     }
-  }
+  };
 
   const importDataTimePolling = ref(null);
 
@@ -135,7 +135,7 @@ export const useDataSource = () => {
   };
 
   const importDataStopRule = (data) => {
-    if (data.status === 'success') {
+    if (data.status === 'success' || data.status === 'failed') {
       stopImportDataTimePolling();
     }
   };

diff --git a/src/pages/src/language/en.json b/src/pages/src/language/en.json
@@ -74,6 +74,8 @@
   "待执行": "Pending",
   "同步状态": "Synchronization status",
   "同步中": "Running",
+  "同步成功": "Synchronization successful",
+  "同步失败": "Synchronization failed",
   "成功": "Success",
   "失败": "Failed",
   "定时": "Scheduled",

diff --git a/src/pages/src/language/zh.json b/src/pages/src/language/zh.json
@@ -74,6 +74,8 @@
   "待执行": "待执行",
   "同步状态": "同步状态",
   "同步中": "同步中",
+  "同步成功": "同步成功",
+  "同步失败": "同步失败",
   "成功": "成功",
   "失败": "失败",
   "定时": "定时",

diff --git a/src/pages/src/utils/index.ts b/src/pages/src/utils/index.ts
@@ -285,12 +285,12 @@ export const dataRecordStatus = {
   },
   success: {
     icon: normalImg,
-    text: t('成功'),
+    text: t('同步成功'),
     theme: 'success',
   },
   failed: {
     icon: abnormalImg,
-    text: t('失败'),
+    text: t('同步失败'),
     theme: 'danger',
   },
 };

diff --git a/src/pages/src/views/setting/data-source/ConfigList.vue b/src/pages/src/views/setting/data-source/ConfigList.vue
@@ -333,12 +333,13 @@ const confirmImportUsers = async () => {
     };
     const url = `${window.AJAX_BASE_URL}/api/v3/web/data-sources/${currentDataSourceId.value}/operations/import/`;
     await axios.post(url, formData, config);
-    importDialog.isShow = false;
+    Message({ theme: 'success', message: t('导入成功') });
     handleImportLocalDataSync();
     initDataSourceList();
   } catch (e) {
     Message({ theme: 'error', message: e.response.data.error.message });
   } finally {
+    importDialog.isShow = false;
     importDialog.loading = false;
   }
 };