From 5d865bd068a80f730d037eb85720cb1ac8421340 Mon Sep 17 00:00:00 2001
From: Austin <1344583166@qq.com>
Date: Mon, 25 Nov 2024 20:15:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E8=B5=84=E6=BA=90=E6=B1=A0?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=88=97=E8=A1=A8=E4=BA=A4=E4=BA=92=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20#8149=20#=20Reviewed,=20transaction=20id:=2024766?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource-manage/pool/host-list/Index.vue  |  2 +-
 .../host-list/components/search-box/Index.vue | 24 ++++++++++++-------
 .../com-factory/components/ForBiz.vue         |  8 +++++--
 .../com-factory/components/SpecId.vue         | 10 ++++----
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue
index 6148e0a580..6c7ec84780 100644
--- a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue
+++ b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue
@@ -126,7 +126,7 @@
   const isShowBatchSetting = ref(false);
   const isShowImportHost = ref(false);
 
-  let searchParams = {};
+  let searchParams: Record<string, any> = {};
   let selectionListWholeDataMemo: DbResourceModel[] = [];
   const tableColumn = [
     {
diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/Index.vue
index 49c6396f23..20efa6d0a1 100644
--- a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/Index.vue
+++ b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/Index.vue
@@ -13,13 +13,11 @@
 
 <template>
   <div class="resource-pool-search-box">
-    <KeepAlive>
-      <Component
-        :is="renderCom"
-        :key="renderKey"
-        v-model="searchParams"
-        @submit="handleSubmit" />
-    </KeepAlive>
+    <Component
+      :is="renderCom"
+      :key="renderKey"
+      v-model="searchParams"
+      @submit="handleSubmit" />
     <div
       class="toggle-btn"
       @click="handleToggle">
@@ -28,6 +26,7 @@
   </div>
 </template>
 <script setup lang="ts">
+  import _ from 'lodash';
   import { computed, onMounted, ref } from 'vue';
 
   import fieldConfig from './components/field-config';
@@ -57,6 +56,8 @@
 
   const renderCom = computed(() => comMap[renderStatus.value]);
 
+  let localSearchParams: Record<string, any> = {};
+
   // 切换搜索展示样式
   const handleToggle = () => {
     renderStatus.value = renderStatus.value === 'input' ? 'tag' : 'input';
@@ -107,7 +108,14 @@
 
       return acc;
     }, {});
-
+    if (
+      localSearchParams.resource_type &&
+      searchParams.value?.resource_type &&
+      localSearchParams.resource_type !== searchParams.value.resource_type
+    ) {
+      delete params.spec_id;
+    }
+    localSearchParams = _.cloneDeep(params);
     emits('change', params);
   };
 
diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue
index 25b4d31b16..c3cb4dbea3 100644
--- a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue
+++ b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue
@@ -13,17 +13,21 @@
 
 <template>
   <BkSelect
+    display-key="display_name"
+    enable-virtual-render
     filterable
+    id-key="bk_biz_id"
     :input-search="false"
+    :list="bizList"
     :model-value="defaultValue"
     :placeholder="t('请选择所属业务')"
     show-selected-icon
     @change="handleChange">
-    <BkOption
+    <!-- <BkOption
       v-for="bizItem in bizList"
       :key="bizItem.bk_biz_id"
       :label="bizItem.display_name"
-      :value="bizItem.bk_biz_id" />
+      :value="bizItem.bk_biz_id" /> -->
     <template
       v-if="simple"
       #extension>
diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/SpecId.vue b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/SpecId.vue
index de937daf9e..be2e9f91f9 100644
--- a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/SpecId.vue
+++ b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/components/search-box/components/com-factory/components/SpecId.vue
@@ -17,7 +17,6 @@
       <BkSelect
         v-model="currentDbType"
         :clearable="false"
-        :disabled="isDbTypeDisabled"
         filterable
         :input-search="false"
         style="width: 150px"
@@ -102,8 +101,6 @@
   const currentMachine = ref('');
   const clusterMachineList = shallowRef<InfoItem['machineList']>([]);
 
-  const isDbTypeDisabled = computed(() => props.model.resource_type && props.model.resource_type !== 'PUBLIC');
-
   const { loading: isResourceSpecLoading, run: fetchResourceSpecDetail } = useRequest(getResourceSpec, {
     manual: true,
     onSuccess(data) {
@@ -157,14 +154,13 @@
     () => props.model,
     () => {
       const dbType = props.model.resource_type;
-      if (dbType && currentDbType.value && dbType !== currentDbType.value && dbType !== 'PUBLIC') {
+      if (dbType && dbType !== currentDbType.value) {
         currentDbType.value = dbType;
         clusterMachineList.value = DBTypeInfos[dbType as DBTypes]?.machineList || [];
         currentMachine.value = '';
         defaultValue.value = '';
         return;
       }
-      defaultValue.value = props.model.spec_id;
     },
     {
       immediate: true,
@@ -182,6 +178,10 @@
     emits('change', value);
   };
 
+  onMounted(() => {
+    defaultValue.value = props.model.spec_id || '';
+  });
+
   defineExpose<Expose>({
     reset() {
       rerenderKey.value = Date.now();