fix(frontend): mongodb集群容量变更问题修复 #3427

TencentBlueKing · Mar 6, 2024 · aeab65f · aeab65f
1 parent 0ac8e0f
commit aeab65f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/dbm-ui/frontend/src/views/mongodb-manage/components/MongoConfigSpec.vue b/dbm-ui/frontend/src/views/mongodb-manage/components/MongoConfigSpec.vue
@@ -75,6 +75,8 @@
     MachineTypes,
   } from '@common/const';
 
+  import MiniTag from '@components/mini-tag/index.vue';
+
   import SpecTip from '@images/spec-tip.png';
 
   type RedisClusterSpecRow = RedisClusterSpecModel & {
@@ -93,6 +95,7 @@
     bizId: number | string,
     cloudId: number | string,
     shardNum?: number,
+    shardNodeCount?: number,
     isApply?: boolean
     originSpecId?: number | string
   }
@@ -102,7 +105,8 @@
   }
 
   const props = withDefaults(defineProps<Props>(), {
-    shardNum: undefined,
+    shardNum: 0,
+    shardNodeCount: 0,
     isApply: true,
     originSpecId: undefined,
   });
@@ -139,19 +143,17 @@
         let tag;
         if (props.originSpecId === data.spec_id) {
           tag = (
-            <bk-tag
-                class='ml-2'
-                theme="info">
-                { t('当前方案') }
-            </bk-tag>
+            <MiniTag
+              class='ml-2'
+              theme="info"
+              content={t('当前方案')} />
           );
         } else if (data.machine_num > data.count) {
           tag = (
-            <bk-tag
+            <MiniTag
               class='ml-2'
-              theme="danger">
-              { t('资源不足') }
-            </bk-tag>
+              theme="danger"
+              content={t('资源不足')} />
           );
         }
 
@@ -262,11 +264,12 @@
   } = useRequest(getFilterClusterSpec, {
     manual: true,
     onSuccess(res) {
+      const shardNodeNum = props.isApply ? 3 : props.shardNodeCount; // 节点数，部署时固定，容量变更取自集群信息
       specList.value = res.map(item => Object.assign(item, {
-        shard_node_num: 3, // 节点数，固定值
+        shard_node_num: shardNodeNum,
         shard_num: props.isApply ? item.shard_recommend.shard_num : props.shardNum,
         shard_node_spec: '',
-        machine_num: item.machine_pair * 3, // 机组数 * 节点数
+        machine_num: item.machine_pair * shardNodeNum, // 机器组数 x 每个Shard节点数
         count: 0,
       } as RedisClusterSpecRow));
       getSpecResourceCountRun({

diff --git a/...end/src/views/mongodb-manage/shared-cluster-list/components/components/CapacityChange.vue b/...end/src/views/mongodb-manage/shared-cluster-list/components/components/CapacityChange.vue
@@ -29,7 +29,7 @@
     </div>
     <DbForm
       form-type="vertical"
-      model="specInfo">
+      :model="specInfo">
       <MongoConfigSpec
         v-model="specInfo"
         :biz-id="data.bizId"
@@ -40,6 +40,7 @@
           capacity: 'capacity',
           specId: 'spec_id'
         }"
+        :shard-node-count="data.shardNodeCount"
         :shard-num="data.shardNum"
         @current-change="handleMongoConfigSpecChange" />
     </DbForm>
@@ -68,6 +69,7 @@
       bizId: number,
       cloudId: number,
       shardNum: number;
+      shardNodeCount: number;
     },
   }
 

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/shared-cluster-list/components/detail/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/shared-cluster-list/components/detail/Index.vue
@@ -166,7 +166,8 @@
     specName: string
     bizId: number,
     cloudId: number,
-    shardNum: number
+    shardNum: number,
+    shardNodeCount: number,
   }>();
   const monitorPanelList = ref<{
     label: string,
@@ -189,6 +190,7 @@
         bk_biz_id: bizId,
         bk_cloud_id: cloudId,
         shard_num: shardNum,
+        shard_node_count: shardNodeCount,
         mongodb,
       } = result;
       const {
@@ -204,6 +206,7 @@
         bizId,
         cloudId,
         shardNum,
+        shardNodeCount,
       };
     },
   });

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/shared-cluster-list/components/list/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/shared-cluster-list/components/list/Index.vue
@@ -180,7 +180,8 @@
     specName: string
     bizId: number,
     cloudId: number,
-    shardNum: number
+    shardNum: number,
+    shardNodeCount: number,
   }>();
   const clusterAuthorizeShow = ref(false);
   const excelAuthorizeShow = ref(false);
@@ -455,6 +456,7 @@
       bk_biz_id: bizId,
       bk_cloud_id: cloudId,
       shard_num: shardNum,
+      shard_node_count: shardNodeCount,
       mongodb,
     } = row;
     const {
@@ -470,6 +472,7 @@
       bizId,
       cloudId,
       shardNum,
+      shardNodeCount
     };
     capacityChangeShow.value = true;
   };