fix(frontend): 集群拓扑、实例视图基本信息补充 #8830

TencentBlueKing · Dec 26, 2024 · 18a8959 · 18a8959
1 parent a0c85fe
commit 18a8959
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 21 deletions.
diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json
@@ -28,7 +28,7 @@
     "@icon-cool/bk-icon-bk-biz-components": "^0.0.4",
     "@vueuse/core": "^12.0.0",
     "axios": "^1.7.9",
-    "bkui-vue": "2.0.1-beta.78",
+    "bkui-vue": "2.0.1-beta.89",
     "date-fns": "^4.1.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue
@@ -116,7 +116,7 @@
     boundary: 'body',
     disableOutsideClick: sideSliderShow.value,
     clickContentAutoHide: true,
-    renderType: 'auto',
+    renderDirective: 'show',
   }));
 
   watch(sideSliderShow, () => {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx b/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx
@@ -62,6 +62,7 @@ interface InstanceDetails {
   bk_idc_city_name: string;
   bk_mem: number;
   bk_os_name: string;
+  bk_sub_zone: string;
   cluster_id: number;
   cluster_type: string;
   create_at: string;
@@ -137,11 +138,11 @@ export const detailColumns: DetailColumns<any> = [
     key: 'bk_host_innerip',
   },
   {
-    label: t('所在机房'),
-    key: 'bk_idc_name',
+    label: t('园区'),
+    key: 'bk_sub_zone',
   },
   {
-    label: t('所在城市'),
+    label: t('地域'),
     key: 'bk_idc_city_name',
   },
   {

diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue
@@ -86,15 +86,19 @@
         key: 'bk_cloud_name',
       },
       {
-        label: t('所在城市'),
+        label: t('地域'),
         key: 'bk_idc_city_name',
       },
       {
         label: t('所在园区'),
-        key: 'bk_idc_name',
+        key: 'bk_sub_zone',
       },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署架构'),
         key: 'clusterTypeName',

diff --git a/...tend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue b/...tend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue
@@ -98,7 +98,7 @@
         key: 'bk_cloud_name',
       },
       {
-        label: t('所在城市'),
+        label: t('地域'),
         key: 'bk_idc_city_name',
       },
       {
@@ -107,6 +107,10 @@
       },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署架构'),
         key: 'clusterTypeName',

diff --git a/...tend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue b/...tend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue
@@ -98,15 +98,19 @@
         key: 'bk_cloud_name',
       },
       {
-        label: t('所在城市'),
+        label: t('地域'),
         key: 'bk_idc_city_name',
       },
       {
-        label: t('所在机房'),
-        key: 'bk_idc_name',
+        label: t('所在园区'),
+        key: 'bk_sub_zone',
       },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署架构'),
         key: 'clusterTypeName',

diff --git a/...rontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue b/...rontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue
@@ -98,7 +98,7 @@
         key: 'bk_cloud_name',
       },
       {
-        label: t('所在城市'),
+        label: t('地域'),
         key: 'bk_idc_city_name',
       },
       {
@@ -107,6 +107,10 @@
       },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署架构'),
         key: 'clusterTypeName',

diff --git a/.../src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue b/.../src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue
@@ -91,11 +91,19 @@
         key: 'bk_cloud_name',
       },
       {
-        label: t('所在城市'),
+        label: t('地域'),
         key: 'bk_idc_city_name',
       },
+      {
+        label: t('所在园区'),
+        key: 'bk_sub_zone',
+      },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署架构'),
         key: 'clusterTypeName',

diff --git a/...src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue b/...src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue
@@ -79,8 +79,20 @@
         label: t('管控区域'),
         key: 'bk_cloud_name',
       },
+      {
+        label: t('地域'),
+        key: 'bk_idc_city_name',
+      },
+      {
+        label: t('所在园区'),
+        key: 'bk_sub_zone',
+      },
     ],
     [
+      {
+        label: t('版本'),
+        key: 'version',
+      },
       {
         label: t('部署角色'),
         key: 'role',
@@ -119,14 +131,6 @@
           return `${props.data.bk_disk}GB`;
         },
       },
-      {
-        label: t('所在城市'),
-        key: 'bk_idc_city_name',
-      },
-      {
-        label: t('所在机房'),
-        key: 'bk_idc_name',
-      },
     ],
   ];