From d9ee2a9224f19647a97cd2f541a7e49622914994 Mon Sep 17 00:00:00 2001
From: Austin <1344583166@qq.com>
Date: Tue, 24 Sep 2024 09:22:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=20mysql=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=AE=B1=E6=94=AF=E6=8C=81=E6=A0=BC=E5=AD=90=E5=86=85=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=9B=86=E7=BE=A4/=E5=AE=9E=E4=BE=8B/IP=20#6997=20#?=
 =?UTF-8?q?=20Reviewed,=20transaction=20id:=2019172?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/common/edit-field/InstanceWithSelector.vue  | 11 +++++------
 .../mysql/common/edit-field/IpInputWithIpSelector.vue |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/InstanceWithSelector.vue b/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/InstanceWithSelector.vue
index cfbd672f98..db7b74cfdf 100644
--- a/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/InstanceWithSelector.vue
+++ b/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/InstanceWithSelector.vue
@@ -49,15 +49,14 @@
     @change="handleInstancesChange" />
 </template>
 <script lang="ts">
-  type InstanceInfo = ServiceReturnType<typeof checkMysqlInstances>[number];
-
   const instanceWithSelectorMemo: { [key: string]: Record<string, boolean> } = {};
 </script>
 <script setup lang="ts">
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
 
-  import { checkMysqlInstances } from '@services/source/instances';
+  import { checkInstance } from '@services/source/dbbase';
+  import type { InstanceInfos } from '@services/types/clusters';
 
   import { ClusterTypes } from '@common/const';
   import { ipPort, ipv4 } from '@common/regex';
@@ -83,7 +82,7 @@
     db_module_name?: string;
     master_domain?: string;
     cluster_type?: string;
-    related_clusters?: InstanceInfo['related_clusters'];
+    related_clusters?: InstanceInfos['related_clusters'];
     related_instances?: {
       cluster_id: number;
       instance_address: string;
@@ -151,8 +150,8 @@
     },
     {
       validator: (value: string) =>
-        checkMysqlInstances({
-          bizId: window.PROJECT_CONFIG.BIZ_ID,
+        checkInstance<InstanceInfos>({
+          bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
           instance_addresses: [value],
         }).then((data) => {
           if (data.length < 1) {
diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/IpInputWithIpSelector.vue b/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/IpInputWithIpSelector.vue
index bf26b98745..b93082f7f0 100644
--- a/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/IpInputWithIpSelector.vue
+++ b/dbm-ui/frontend/src/views/db-manage/mysql/common/edit-field/IpInputWithIpSelector.vue
@@ -58,7 +58,7 @@
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
 
-  import { checkMysqlInstances } from '@services/source/instances';
+  import { checkInstance } from '@services/source/dbbase';
   import type { HostDetails } from '@services/types';
 
   import { OSTypes } from '@common/const';
@@ -150,8 +150,8 @@
         if (props.type === 'cloud-ip') {
           ip = value.split(':')[1];
         }
-        return checkMysqlInstances({
-          bizId: window.PROJECT_CONFIG.BIZ_ID,
+        return checkInstance<Required<IpBasicInfo>>({
+          bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
           instance_addresses: [ip],
         }).then((data) => {
           if (data.length < 1) {