fix(frontend): 大数据类型修正 TencentBlueKing#7883

dbm-ui/frontend/src/services/model/doris/doris-detail.ts

@@ -0,0 +1,25 @@
+/*
+ * TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
+ *
+ * Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ * the specific language governing permissions and limitations under the License.
+ */
+
+import ClusterEntryDetailModel from '@services/model/cluster-entry/cluster-entry-details';
+
+import DorisModel from './doris';
+
+export default class DorisDetail extends DorisModel {
+  cluster_entry_details: ClusterEntryDetailModel[];
+
+  constructor(payload = {} as DorisDetail) {
+    super(payload);
+    this.cluster_entry_details = payload.cluster_entry_details.map((item) => new ClusterEntryDetailModel(item));
+  }
+}

dbm-ui/frontend/src/services/model/doris/doris.ts

@@ -13,7 +13,7 @@
 
 import { uniq } from 'lodash';
 
-import type { ClusterEntryDetail, ClusterListNode, ClusterListOperation } from '@services/types';
+import type { ClusterListEntry, ClusterListNode, ClusterListOperation } from '@services/types';
 
 import { TicketTypes } from '@common/const';
 
@@ -60,7 +60,7 @@ export default class Doris {
   bk_cloud_name: string;
   cluster_access_port: number;
   cluster_alias: string;
-  cluster_entry_details: ClusterEntryDetail[];
+  cluster_entry: ClusterListEntry[];
   cluster_name: string;
   cluster_stats: Record<'used' | 'total' | 'in_use', number>;
   cluster_time_zone: string;
@@ -101,7 +101,7 @@ export default class Doris {
     this.bk_cloud_name = payload.bk_cloud_name;
     this.cluster_access_port = payload.cluster_access_port;
     this.cluster_alias = payload.cluster_alias;
-    this.cluster_entry_details = payload.cluster_entry_details;
+    this.cluster_entry = payload.cluster_entry;
     this.cluster_name = payload.cluster_name;
     this.cluster_stats = payload.cluster_stats || {};
     this.cluster_type = payload.cluster_type;

dbm-ui/frontend/src/services/model/es/es.ts

@@ -57,7 +57,7 @@ export default class Es {
   bk_cloud_name: string;
   cluster_access_port: number;
   cluster_alias: string;
-  cluster_entry: ClusterListEntry;
+  cluster_entry: ClusterListEntry[];
   cluster_name: string;
   cluster_stats: Record<'used' | 'total' | 'in_use', number>;
   cluster_time_zone: string;

dbm-ui/frontend/src/services/model/hdfs/hdfs.ts

@@ -57,7 +57,7 @@ export default class Hdfs {
   bk_cloud_name: string;
   cluster_access_port: number;
   cluster_alias: string;
-  cluster_entry: ClusterListEntry;
+  cluster_entry: ClusterListEntry[];
   cluster_name: string;
   cluster_stats: Record<'used' | 'total' | 'in_use', number>;
   cluster_time_zone: string;

dbm-ui/frontend/src/services/model/kafka/kafka.ts

@@ -58,7 +58,7 @@ export default class Kafka {
   broker: Array<ClusterListNode>;
   cluster_access_port: number;
   cluster_alias: string;
-  cluster_entry: ClusterListEntry;
+  cluster_entry: ClusterListEntry[];
   cluster_name: string;
   cluster_stats: Record<'used' | 'total' | 'in_use', number>;
   cluster_time_zone: string;

dbm-ui/frontend/src/services/source/doris.ts

@@ -12,6 +12,7 @@
  */
 
 import DorisModel from '@services/model/doris/doris';
+import DorisDetailModel from '@services/model/doris/doris-detail';
 import DorisInstanceModel from '@services/model/doris/doris-instance';
 import DorisMachineModel from '@services/model/doris/doris-machine';
 import DorisNodeModel from '@services/model/doris/doris-node';
@@ -84,7 +85,7 @@ export function retrieveDorisInstance(params: { bk_biz_id: number }) {
  * 获取集群详情
  */
 export function getDorisDetail(params: { id: number }) {
-  return http.get<DorisModel>(`${getRootPath()}/${params.id}/`).then((data) => new DorisModel(data));
+  return http.get<DorisDetailModel>(`${getRootPath()}/${params.id}/`).then((data) => new DorisDetailModel(data));
 }
 
 /**

dbm-ui/frontend/src/views/db-manage/doris/list/components/detail/components/BaseInfo.vue

@@ -17,12 +17,12 @@
   </div>
 </template>
 <script setup lang="ts">
-  import DorisModel from '@services/model/doris/doris';
+  import DorisDetailModel from '@services/model/doris/doris-detail';
 
   import RenderBaseInfo from '@views/db-manage/common/RenderBaseInfo.vue';
 
   interface Props {
-    data: DorisModel;
+    data: DorisDetailModel;
   }
 
   defineProps<Props>();

dbm-ui/frontend/src/views/db-manage/doris/list/components/detail/components/node-list/Index.vue

@@ -183,7 +183,7 @@
 <script setup lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import DorisModel from '@services/model/doris/doris';
+  import DorisDetailModel from '@services/model/doris/doris-detail';
   import DorisNodeModel from '@services/model/doris/doris-node';
   import {
     getDorisDetail,
@@ -280,7 +280,7 @@
   const isShowDetail = ref(false);
   const isLoading = ref(true);
   const isCopyDropdown = ref(false);
-  const operationData = shallowRef<DorisModel>();
+  const operationData = shallowRef<DorisDetailModel>();
   const operationNodeData = shallowRef<DorisNodeModel>();
   const operationNodeList = shallowRef<Array<DorisNodeModel>>([]);
   const tableData = shallowRef<DorisNodeModel[]>([]);