fix(frontend): 大数据节点操作提单数据异常修复 #6321

TencentBlueKing · Aug 19, 2024 · 608d66a · 608d66a
1 parent 8ccb4d1
commit 608d66a
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 42 deletions.
diff --git a/...ntend/src/components/cluster-common/es-host-expansion/components/ResourcePoolSelector.vue b/...ntend/src/components/cluster-common/es-host-expansion/components/ResourcePoolSelector.vue
@@ -164,6 +164,11 @@
         role: props.data.role,
       },
     ],
+    onSuccess(recommendSpecList) {
+      if (recommendSpecList.length > 0) {
+        specId.value = recommendSpecList[0].spec_id;
+      }
+    },
   });
 
   const handleSpecChange = (value: number) => {

diff --git a/...rontend/src/components/cluster-common/es-host-replace/components/ResourcePoolSelector.vue b/...rontend/src/components/cluster-common/es-host-replace/components/ResourcePoolSelector.vue
@@ -109,7 +109,12 @@
     ],
     onSuccess(recommendSpecList) {
       if (recommendSpecList.length > 0) {
-        modelValue.value.spec_id = recommendSpecList[0].spec_id;
+        const [currentSpec] = recommendSpecList;
+        modelValue.value = {
+          spec_id: currentSpec.spec_id,
+          count: props.data.nodeList.length,
+          instance_num: currentSpec.instance_num,
+        };
       }
     },
   });

diff --git a/...frontend/src/components/cluster-common/host-expansion/components/ResourcePoolSelector.vue b/...frontend/src/components/cluster-common/host-expansion/components/ResourcePoolSelector.vue
@@ -152,6 +152,11 @@
         role: props.data.role,
       },
     ],
+    onSuccess(recommendSpecList) {
+      if (recommendSpecList.length > 0) {
+        specId.value = recommendSpecList[0].spec_id;
+      }
+    },
   });
 
   const triggerChange = () => {

diff --git a/...i/frontend/src/components/cluster-common/host-replace/components/ResourcePoolSelector.vue b/...i/frontend/src/components/cluster-common/host-replace/components/ResourcePoolSelector.vue
@@ -49,9 +49,7 @@
   setup
   lang="ts"
   generic="T extends EsNodeModel | HdfsNodeModel | KafkaNodeModel | PulsarNodeModel | InfluxdbInstanceModel">
-  import {
-    shallowRef,
-  } from 'vue';
+  import { shallowRef } from 'vue';
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
 
@@ -61,22 +59,19 @@
   import type KafkaNodeModel from '@services/model/kafka/kafka-node';
   import type PulsarNodeModel from '@services/model/pulsar/pulsar-node';
   import { getSpecResourceCount } from '@services/source/dbresourceResource';
-  import {
-    fetchRecommendSpec,
-    getResourceSpecList,
-  } from '@services/source/dbresourceSpec';
+  import { fetchRecommendSpec, getResourceSpecList } from '@services/source/dbresourceSpec';
 
   import SpecDetail from '@components/cluster-common/SpecDetailForPopover.vue';
 
   import type { TReplaceNode } from '../Index.vue';
 
   interface Props {
-    data: TReplaceNode<T>,
-    error: boolean,
+    data: TReplaceNode<T>;
+    error: boolean;
     cloudInfo: {
-      id: number,
-      name: string
-    },
+      id: number;
+      name: string;
+    };
   }
 
   const props = defineProps<Props>();
@@ -89,19 +84,14 @@
 
   const specCountMap = shallowRef<Record<number, number>>({});
 
-  const {
-    run: fetchSpecResourceCount,
-  } = useRequest(getSpecResourceCount, {
+  const { run: fetchSpecResourceCount } = useRequest(getSpecResourceCount, {
     manual: true,
     onSuccess(data) {
       specCountMap.value = data;
     },
   });
 
-  const {
-    loading: isResourceSpecLoading,
-    data: resourceSpecList,
-  } = useRequest(getResourceSpecList, {
+  const { loading: isResourceSpecLoading, data: resourceSpecList } = useRequest(getResourceSpecList, {
     defaultParams: [
       {
         spec_cluster_type: props.data.specClusterType,
@@ -113,18 +103,20 @@
       fetchSpecResourceCount({
         bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
         bk_cloud_id: props.cloudInfo.id,
-        spec_ids: data.results.map(item => item.spec_id),
+        spec_ids: data.results.map((item) => item.spec_id),
       });
     },
   });
 
-  const getDefaultParams = ():{
-    role: string,
-    instance_id: number,
-  }|{
-    role: string,
-    cluster_id: number,
-  } => {
+  const getDefaultParams = ():
+    | {
+        role: string;
+        instance_id: number;
+      }
+    | {
+        role: string;
+        cluster_id: number;
+      } => {
     // influxdb 没有 cluster_id 需要通过 instance_id 查询
     if (props.data.role === 'influxdb') {
       // eslint-disable-next-line vue/no-setup-props-destructure
@@ -147,7 +139,10 @@
     defaultParams: [getDefaultParams()],
     onSuccess(recommendSpecList) {
       if (recommendSpecList.length > 0) {
-        modelValue.value.spec_id = recommendSpecList[0].spec_id;
+        modelValue.value = {
+          spec_id: recommendSpecList[0].spec_id,
+          count: props.data.nodeList.length,
+        };
       }
     },
   });

diff --git a/dbm-ui/frontend/src/components/cluster-common/host-shrink/Index.vue b/dbm-ui/frontend/src/components/cluster-common/host-shrink/Index.vue
@@ -27,10 +27,10 @@
       </template>
     </BkAlert>
     <BkForm form-type="vertical">
-      <BkFormItem :label="$t('目标容量')">
+      <BkFormItem :label="t('目标容量')">
         <div class="target-content-box">
           <div class="content-label">
-            {{ $t('缩容至') }}
+            {{ t('缩容至') }}
           </div>
           <div class="content-value">
             <div>
@@ -40,13 +40,13 @@
                 :max="data.totalDisk"
                 :min="1"
                 :model-value="localTargetDisk > 0 ? localTargetDisk : undefined"
-                :placeholder="$t('请输入')"
+                :placeholder="t('请输入')"
                 style="width: 156px; margin-right: 8px"
                 type="number"
                 @change="handleTargetDiskChange" />
               <span>GB</span>
               <template v-if="localTargetDisk > 0">
-                <span> , {{ $t('共缩容') }} </span>
+                <span> , {{ t('共缩容') }} </span>
                 <span
                   class="strong-num"
                   style="color: #2dcb56">
@@ -57,12 +57,12 @@
             </div>
             <div class="content-tips">
               <span>
-                {{ $t('当前容量') }}:
+                {{ t('当前容量') }}:
                 <span class="strong-num">{{ data.totalDisk }}</span>
                 GB
               </span>
               <span style="margin-left: 65px">
-                <span>{{ $t('缩容后') }}:</span>
+                <span>{{ t('缩容后') }}:</span>
                 <span v-if="data.targetDisk">
                   <span class="strong-num">{{ localTargetDisk }}</span>
                   GB

diff --git a/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue b/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue
@@ -382,6 +382,9 @@
                     },
                     ...nodeData,
                   },
+                }).then(() => {
+                  emits('change');
+                  resolve('success');
                 });
               },
             });

diff --git a/dbm-ui/frontend/src/views/hdfs-manage/common/replace/Index.vue b/dbm-ui/frontend/src/views/hdfs-manage/common/replace/Index.vue
@@ -18,10 +18,10 @@
         v-model="ipSource"
         class="ip-srouce-box">
         <BkRadioButton label="resource_pool">
-          {{ $t('资源池自动匹配') }}
+          {{ t('资源池自动匹配') }}
         </BkRadioButton>
         <BkRadioButton label="manual_input">
-          {{ $t('手动选择') }}
+          {{ t('手动选择') }}
         </BkRadioButton>
       </BkRadioGroup>
       <div

diff --git a/dbm-ui/frontend/src/views/kafka-manage/common/replace/Index.vue b/dbm-ui/frontend/src/views/kafka-manage/common/replace/Index.vue
@@ -18,10 +18,10 @@
         v-model="ipSource"
         class="ip-srouce-box">
         <BkRadioButton label="resource_pool">
-          {{ $t('资源池自动匹配') }}
+          {{ t('资源池自动匹配') }}
         </BkRadioButton>
         <BkRadioButton label="manual_input">
-          {{ $t('手动选择') }}
+          {{ t('手动选择') }}
         </BkRadioButton>
       </BkRadioGroup>
       <div

diff --git a/dbm-ui/frontend/src/views/pulsar-manage/common/expansion/Index.vue b/dbm-ui/frontend/src/views/pulsar-manage/common/expansion/Index.vue
@@ -18,15 +18,15 @@
     <BkAlert
       class="mb16"
       theme="warning"
-      :title="$t('Bookkeeper，Broker 至少扩容一种类型')" />
+      :title="t('Bookkeeper，Broker 至少扩容一种类型')" />
     <BkRadioGroup
       v-model="ipSource"
       class="ip-srouce-box">
       <BkRadioButton label="resource_pool">
-        {{ $t('资源池自动匹配') }}
+        {{ t('资源池自动匹配') }}
       </BkRadioButton>
       <BkRadioButton label="manual_input">
-        {{ $t('手动选择') }}
+        {{ t('手动选择') }}
       </BkRadioButton>
     </BkRadioGroup>
     <div class="wrapper">