Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-项目管理_rxd

# Conflicts:
#	src/api/all/common.ts
#	src/components/_base/navbar/index.vue
#	src/hooks/useTableSelectionWithPagination.ts
#	src/router/routes/modules/propertyMarketing.ts
#	src/stores/modules/side-bar/constants.ts
#	src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
#	src/views/property-marketing/put-account/account-data/components/filter-block/index.vue
#	src/views/property-marketing/put-account/account-manage/components/account-table/index.vue
#	src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue
#	src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue
#	src/views/property-marketing/put-account/components/status-select/constants.ts

src/views/property-marketing/media-account/account-manage/index.vue

@@ -70,7 +70,7 @@
       </template>
       <div v-else>
         <a-space v-if="isAbNormalStatus" class="flex items-center">
-          <a-button class="w-96px err-btn" size="mini" @click="handleOpenAbnormalAccount">
+          <a-button type="primary" status="danger" size="mini" @click="handleOpenAbnormalAccount">
             <template #default>查看异常账号</template>
           </a-button>
         </a-space>
@@ -87,6 +87,7 @@
         @delete="handleDelete"
         @openEdit="handleOpenEdit"
         @update="getData"
+        @updateSyncStatus="handleUpdateSyncStatus"
       />
       <NoData v-else />
 
@@ -108,7 +109,7 @@
 
     <GroupManageModal ref="groupManageModalRef" @update="filterBlockRef?.getGroups" />
     <TagsManageModal ref="tagsManageModalRef" @update="filterBlockRef?.getTags" />
-    <AddAccountModal ref="addAccountModalRef" @update="getData" />
+    <AddAccountModal ref="addAccountModalRef" @update="getData" @startQueryTaskStatus="handleGetImportTaskStatus" />
 
     <DeleteAccountModal ref="deleteAccountRef" @update="getData" @batchUpdate="onBatchSuccess" />
     <BatchTagModal ref="batchTagModalRef" @update="onBatchSuccess" />
@@ -118,6 +119,7 @@
 
 <script setup>
 import { ref, provide } from 'vue';
+import { Notification } from '@arco-design/web-vue';
 
 import FilterBlock from './components/filter-block';
 import AccountTable from './components/account-table';
@@ -127,10 +129,11 @@ import AddAccountModal from './components/add-account-modal';
 import DeleteAccountModal from './components/account-table/delete-account';
 import BatchTagModal from './components/batch-tag-modal';
 import BatchGroupModal from './components/batch-group-modal';
-import { Notification } from '@arco-design/web-vue';
 
 import { INITIAL_QUERY, INITIAL_PAGE_INFO } from './constants';
+import { showImportResultNotification } from '@/utils/arcoD';
 import { EnumStatus } from '@/views/property-marketing/media-account/components/status-select/constants';
+import { getTaskStatus } from '@/api/all/common';
 import {
   getMediaAccounts,
   getMediaAccountsHealth,
@@ -147,6 +150,7 @@ import icon5 from '@/assets/img/media-account/icon-warn.png';
 import icon6 from '@/assets/img/media-account/icon-close.png';
 
 let syncDataTimer = null;
+let queryTaskTimer = null;
 
 const groupManageModalRef = ref(null);
 const tagsManageModalRef = ref(null);
@@ -294,6 +298,13 @@ const getAsyncStatus = async () => {
     }
   }
 };
+const handleUpdateSyncStatus = (item) => {
+  const target = syncMediaAccounts.value.find((v) => v.id === item.id);
+  // 点击取消，设置状态为成功
+  if (target) {
+    target.status = 1;
+  }
+};
 
 const startSyncDataPolling = () => {
   isLoadingTaskStatus.value = true;
@@ -339,18 +350,43 @@ const handleOpenAbnormalAccount = () => {
   query.value.status = 2;
   reload();
 };
+
+// 查询导入账号任务状态
+const getSyncTaskStatus = async (id, notificationId) => {
+  const { code, data } = await getTaskStatus(id);
+  if (code === 200) {
+    if (data?.status !== 0) {
+      clearQueryTaskTimer();
+      notificationId && Notification.remove(notificationId);
+      showImportResultNotification(data);
+      getData();
+    }
+  }
+};
+const handleGetImportTaskStatus = (id, notificationId) => {
+  clearQueryTaskTimer();
+  getSyncTaskStatus(id, notificationId);
+  queryTaskTimer = setInterval(() => getSyncTaskStatus(id, notificationId), 3000);
+};
 const clearSyncDataTimer = () => {
   if (syncDataTimer) {
     clearInterval(syncDataTimer);
     syncDataTimer = null;
   }
 };
+const clearQueryTaskTimer = () => {
+  if (queryTaskTimer) {
+    clearInterval(queryTaskTimer);
+    queryTaskTimer = null;
+  }
+};
 
 onMounted(() => {
   getData();
 });
 onUnmounted(() => {
   clearSyncDataTimer();
+  clearQueryTaskTimer();
 });
 
 provide('handleSyncData', handleSyncData);