diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index 6fc3c4b0a5..4ee8daefec 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -20,7 +20,7 @@ "@blueking/bk-weweb": "0.0.24", "@blueking/bkflow.js": "0.1.10", "@blueking/date-picker": "0.0.72", - "@blueking/ip-selector": "0.0.1-beta.138", + "@blueking/ip-selector": "0.3.0-beta.23", "@blueking/notice-component": "2.0.4", "@blueking/sub-saas": "^0.0.0-beta.6", "@icon-cool/bk-icon-bk-biz-components": "0.0.4", diff --git a/dbm-ui/frontend/src/components/instance-selector/Index.vue b/dbm-ui/frontend/src/components/instance-selector/Index.vue index c38951dae4..a36911bd4e 100644 --- a/dbm-ui/frontend/src/components/instance-selector/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/Index.vue @@ -98,18 +98,21 @@ export interface IValue { [key: string]: any; - bk_host_id: number; bk_cloud_id: number; bk_cloud_name: string; + bk_host_id: number; + cluster_id: number; + cluster_name: string; + cluster_type: string; + db_module_id: number; + db_module_name: string; + id: number; ip: string; port: number; instance_address: string; - cluster_id: number; - cluster_type: string; status?: string; host_info?: any; - id?: number; - master_domain?: string; + master_domain: string; related_instances?: { instance: string; status: string; @@ -254,7 +257,7 @@ } interface Emits { - (e: 'change', value: Props['selected']): void; + (e: 'change', value: NonNullable): void; } const props = withDefaults(defineProps(), { diff --git a/dbm-ui/frontend/src/components/instance-selector/components/RenderManualHost.vue b/dbm-ui/frontend/src/components/instance-selector/components/RenderManualHost.vue index d5a0d61c2f..b354bfbef8 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/RenderManualHost.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/RenderManualHost.vue @@ -73,6 +73,8 @@ bk_cloud_id: data.host_info.cloud_id, port: data.port, ip: data.ip, + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const search = ref(''); diff --git a/dbm-ui/frontend/src/components/instance-selector/components/RenderTopoHost.vue b/dbm-ui/frontend/src/components/instance-selector/components/RenderTopoHost.vue index 3a94832c53..a51a64c766 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/RenderTopoHost.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/RenderTopoHost.vue @@ -94,6 +94,8 @@ ip: data.ip || '', port: data.port, cluster_type: data.cluster_type as MySQLClusterTypes, + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const { t } = useI18n(); diff --git a/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content-host/table/Index.vue b/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content-host/table/Index.vue index cc5282f2cf..f18be4fdee 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content-host/table/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content-host/table/Index.vue @@ -107,7 +107,9 @@ related_instances: (data.related_instances || []).map(instanceItem => ({ instance: instanceItem.instance, status: instanceItem.status - })) + })), + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const { t } = useI18n(); diff --git a/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content/table/Index.vue b/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content/table/Index.vue index 0927ea9ea3..5e1f38a9aa 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content/table/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/common/manual-content/table/Index.vue @@ -82,6 +82,8 @@ ip: data.ip || '', port: data.port, cluster_type: data.cluster_type, + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const { t } = useI18n(); @@ -286,7 +288,6 @@ checkedMap.value = lastCheckMap; triggerChange(); }; - diff --git a/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster-host/table/Index.vue b/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster-host/table/Index.vue index bd5f8d45dc..d7078e4832 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster-host/table/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster-host/table/Index.vue @@ -101,7 +101,9 @@ instance: instanceItem.instance, status: instanceItem.status })), - spec_config: data.spec_config + spec_config: data.spec_config, + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const { t } = useI18n(); diff --git a/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster/table/Index.vue b/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster/table/Index.vue index 88a505a843..b989be306f 100644 --- a/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster/table/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/components/tendb-cluster/table/Index.vue @@ -29,7 +29,7 @@ :pagination="pagination.count < 10 ? false : pagination" :remote-pagination="isRemotePagination" :settings="tableSetting" - style="margin-top: 12px;" + style="margin-top: 12px" @clear-search="clearSearchValue" @column-filter="columnFilterChange" @page-limit-change="handeChangeLimit" @@ -106,7 +106,9 @@ cluster_type: data.cluster_type, id: data.id, master_domain: data.master_domain, - bk_cloud_name: data.bk_cloud_name + bk_cloud_name: data.bk_cloud_name, + db_module_id: data.db_module_id, + db_module_name: data.db_module_name, }); const { t } = useI18n(); @@ -342,7 +344,6 @@ checkedMap.value = lastCheckMap; triggerChange(); }; -