feat(frontend): 临时密码修改结果页优化 TencentBlueKing#7031

# Reviewed, transaction id: 23352
JustaCattt · Nov 8, 2024 · 8990d34 · 8990d34
1 parent 7647439
commit 8990d34
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 23 deletions.
diff --git a/dbm-ui/frontend/src/views/temporary-paassword-modify/index/Index.vue b/dbm-ui/frontend/src/views/temporary-paassword-modify/index/Index.vue
@@ -16,15 +16,26 @@
     <div class="password-temporary-modify">
       <template v-if="submitted">
         <div
-          v-if="queryLoading"
+          v-if="isActive"
           class="submitting-mask">
           <DbIcon
             class="submitting-icon"
             svg
             type="sync-pending" />
-          <p class="submitting-text">
+          <p class="submitting-text mt16">
             {{ t('密码正在修改中，请稍等') }}
           </p>
+          <RouterLink
+            class="mt16 mb16"
+            target="_blank"
+            :to="{
+              name: 'taskHistoryDetail',
+              params: {
+                root_id: rootId,
+              },
+            }">
+            {{ t('查看详情') }}
+          </RouterLink>
         </div>
         <UpdateResult
           v-else
@@ -33,7 +44,19 @@
           :submit-res="modifyResult"
           :submit-role-map="submitRoleMap"
           @refresh="handleRefresh"
-          @retry="handleSubmit" />
+          @retry="handleSubmit">
+          <RouterLink
+            class="mt16 mb16"
+            target="_blank"
+            :to="{
+              name: 'taskHistoryDetail',
+              params: {
+                root_id: rootId,
+              },
+            }">
+            {{ t('查看详情') }}
+          </RouterLink>
+        </UpdateResult>
       </template>
       <DbForm
         v-else
@@ -136,33 +159,34 @@
     },
   );
 
-  const currentScope = getCurrentScope();
   const rootId = ref('');
-  const modifyResult = ref<ModifyAdminPassword>();
+  const modifyResult = ref<ModifyAdminPassword>('');
 
-  const { run: queryAsyncModifyResultRun, loading: queryLoading } = useRequest(queryAsyncModifyResult, {
+  // 轮询
+  const { isActive, resume, pause } = useTimeoutPoll(() => {
+    queryAsyncModifyResultRun({
+      root_id: rootId.value,
+    });
+  }, 2000);
+
+  const { run: queryAsyncModifyResultRun } = useRequest(queryAsyncModifyResult, {
     manual: true,
     onSuccess({ data, status }) {
-      modifyResult.value = data;
-      // 设置轮询
-      if (currentScope?.active) {
-        !isActive.value && ['PENDING', 'RUNNING', 'FINISHED'].includes(status) && resume();
-      } else {
+      /**
+       * 设置轮询
+       * FINISHED: 完成态
+       * FAILED: 失败态
+       * REVOKED: 取消态
+       */
+      if (['FINISHED', 'FAILED', 'REVOKED'].includes(status)) {
+        modifyResult.value = data;
         pause();
+      } else if (!isActive.value) {
+        resume();
       }
     },
-    onError() {
-      modifyResult.value = {} as ModifyAdminPassword;
-    },
   });
 
-  // 轮询
-  const { isActive, resume, pause } = useTimeoutPoll(() => {
-    queryAsyncModifyResultRun({
-      root_id: rootId.value,
-    });
-  }, 10000);
-
   const { run: modifyAdminPasswordRun, loading: submitting } = useRequest(modifyAdminPassword, {
     manual: true,
     onSuccess(data) {
@@ -229,6 +253,10 @@
     handleReset();
     submitted.value = false;
   };
+
+  onBeforeUnmount(() => {
+    pause();
+  });
 </script>
 
 <style lang="less" scoped>
@@ -238,8 +266,10 @@
     border-radius: 2px;
 
     .submitting-mask {
+      display: flex;
       padding: 90px 0 138px;
-      text-align: center;
+      flex-direction: column;
+      align-items: center;
 
       .submitting-icon {
         font-size: 64px;
@@ -248,7 +278,6 @@
       }
 
       .submitting-text {
-        margin-top: 36px;
         font-size: 24px;
         color: #313238;
       }

diff --git a/dbm-ui/frontend/src/views/temporary-paassword-modify/index/components/UpdateResult.vue b/dbm-ui/frontend/src/views/temporary-paassword-modify/index/components/UpdateResult.vue
@@ -23,6 +23,7 @@
         <span class="title-error">{{ errorListLength }}</span>
       </I18nT>
     </template>
+    <slot />
     <div class="password-display">
       {{ t('当前密码') }} : {{ passwordDisplay }}
       <BkButton