From 4513a08241d51939104873a5b4004f4cd6e958a1 Mon Sep 17 00:00:00 2001
From: chenwenchang <479999519@qq.com>
Date: Fri, 29 Nov 2024 11:05:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E5=A4=8D=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=20#8250?=
 =?UTF-8?q?=20#=20Reviewed,=20transaction=20id:=2025335?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/services/source/permission.ts         |  8 ++---
 dbm-ui/frontend/src/types/auto-imports.d.ts   |  2 +-
 .../index/components/UpdateResult.vue         | 36 +++++++++++--------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/dbm-ui/frontend/src/services/source/permission.ts b/dbm-ui/frontend/src/services/source/permission.ts
index 9d5efd5125..51c285a659 100644
--- a/dbm-ui/frontend/src/services/source/permission.ts
+++ b/dbm-ui/frontend/src/services/source/permission.ts
@@ -91,8 +91,8 @@ export const modifyAdminPassword = (params: {
 }) =>
   http.post<
     | {
-        success: AdminPasswordResultItem[] | null;
-        fail: AdminPasswordResultItem[] | null;
+        success: AdminPasswordResultItem[];
+        fail: AdminPasswordResultItem[];
       }
     | string // 异步修改时返回root_id
   >(`${path}/modify_admin_password/`, params);
@@ -121,8 +121,8 @@ export const queryAsyncModifyResult = (params: { root_id: string }) =>
     status: string;
     error?: string;
     data: {
-      success: AdminPasswordResultItem[] | null;
-      fail: AdminPasswordResultItem[] | null;
+      success: AdminPasswordResultItem[];
+      fail: AdminPasswordResultItem[];
     };
     result?: boolean;
   }>(`${path}/query_async_modify_result/`, params);
diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts
index d0c217f6f1..7021ac5101 100644
--- a/dbm-ui/frontend/src/types/auto-imports.d.ts
+++ b/dbm-ui/frontend/src/types/auto-imports.d.ts
@@ -71,6 +71,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
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
index 57c4878e8c..be587e5291 100644
--- 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
@@ -95,6 +95,7 @@
   </RenderSuccess>
 </template>
 <script setup lang="ts">
+  import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
 
   import { queryAsyncModifyResult } from '@services/source/permission';
@@ -134,31 +135,36 @@
 
   const passwordDisplay = computed(() => (isShowPassword.value ? props.password : '********'));
   const errorMessage = computed(() => {
-    if (props?.submitResult?.status === 'FINISHED' && !props.submitResult?.result) {
+    if (props.submitResult?.status === 'FINISHED' && !props.submitResult?.result) {
       return props.submitResult?.error;
     }
     return '';
   });
   const errorList = computed(() =>
-    (props?.submitResult?.data?.fail || []).reduce((errorPrev, errorItem) => {
-      const { bk_cloud_id, cluster_type } = errorItem;
+    _.flatMap(props.submitResult?.data?.fail || [], (item) => {
+      const { bk_cloud_id, cluster_type } = item;
       const roleMap = props.submitRoleMap;
-      const retryItems = errorItem.instances.reduce((retryItemsPrev, instanceItem) => {
-        const newInstanceItem = instanceItem.addresses.map((addressItem) => ({
+      return _.flatMap(item.instances, (insItem) =>
+        insItem.addresses.map((addressItem) => ({
           ...addressItem,
           bk_cloud_id,
           cluster_type,
           role: roleMap[`${addressItem.ip}:${addressItem.port}`],
-        }));
-
-        return [...retryItemsPrev, ...newInstanceItem];
-      }, [] as RetryItem[]);
-
-      return [...errorPrev, ...retryItems];
-    }, [] as RetryItem[]),
+        })),
+      );
+    }),
+  );
+  const successListLength = computed(() =>
+    _.sumBy(props.submitResult?.data?.success, (item) =>
+      _.sumBy(item.instances, (insItem) => insItem.addresses.length),
+    ),
+  );
+  const errorListLength = computed(
+    () =>
+      _.sumBy(props.submitResult?.data?.fail, (item) =>
+        _.sumBy(item.instances, (insItem) => insItem.addresses.length),
+      ) || props.submitLength - successListLength.value,
   );
-  const errorListLength = computed(() => errorList.value.length);
-  const successListLength = computed(() => props.submitLength - errorListLength.value);
 
   const handleShowPassword = () => {
     isShowPassword.value = !isShowPassword.value;
@@ -169,7 +175,7 @@
   };
 
   const handleCopy = () => {
-    const copyList = errorList.value.map((errorItem) => `${errorItem.ip}:${errorItem.port}`);
+    const copyList = errorList.value.map((item) => `${item.ip}:${item.port}`);
     copy(copyList.join('\n'));
   };