From 675c233bb206a03f772626b111630689e832e672 Mon Sep 17 00:00:00 2001
From: chenwenchang <479999519@qq.com>
Date: Fri, 25 Oct 2024 17:14:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E9=9B=86=E7=BE=A4=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E8=AE=BF=E9=97=AE=E6=BA=90=E9=80=89=E6=8B=A9=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E7=99=BD=E5=90=8D=E5=8D=95ip=20#7597=20#=20Reviewed,?=
 =?UTF-8?q?=20transaction=20id:=2021936?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cluster-authorize/components/SourceIps.vue   | 16 +++++++++++++---
 .../components/TargetInstances.vue               |  3 +++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue
index 125ad01b5a..5a07416878 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue
@@ -12,21 +12,23 @@
       :is-cloud-area-restrictions="false"
       :panel-list="['staticTopo', 'manualInput', 'dbmWhitelist']"
       service-mode="all"
-      @change="handleChangeIP" />
+      @change="handleChangeIP"
+      @change-whitelist="handleChangeWhitelist" />
   </DbFormItem>
 </template>
 
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
 
+  import { getWhitelist } from '@services/source/whitelist';
   import type { HostInfo } from '@services/types';
 
   import IpSelector from '@components/ip-selector/IpSelector.vue';
 
   export interface SourceIp {
     ip: string;
-    bk_host_id: number;
-    bk_biz_id: number;
+    bk_host_id?: number;
+    bk_biz_id?: number;
   }
 
   interface Exposes {
@@ -58,6 +60,14 @@
     }));
   };
 
+  const handleChangeWhitelist = (data: ServiceReturnType<typeof getWhitelist>['results']) => {
+    // 避免与 handleChangeIP 同时修改 source_ips 参数
+    nextTick(() => {
+      const formatData = data.flatMap((item) => item.ips).map((ip) => ({ ip }));
+      sourceIps.value.push(...formatData);
+    });
+  };
+
   defineExpose<Exposes>({
     init(data: HostInfo[]) {
       handleChangeIP(data);
diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue
index 026a4828fc..19c703d953 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue
@@ -1,5 +1,6 @@
 <template>
   <BkFormItem
+    ref="formRef"
     v-model="targetInstances"
     class="cluster-authorize-bold"
     :label="t('目标集群')"
@@ -75,6 +76,7 @@
   const { t } = useI18n();
   const copy = useCopy();
 
+  const formRef = ref();
   const rules = [
     {
       trigger: 'change',
@@ -249,6 +251,7 @@
   };
 
   const updateTableData = (data: ResourceItem[]) => {
+    formRef.value.clearValidate();
     state.tableProps.data = data;
     state.tableProps.pagination.count = data.length;
     targetInstances.value = data.map(item => item.master_domain);