diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index 0bdf00bc1e..f8fd441ad8 100644 --- 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 index a0c7d96a5f..06c00501df 100644 --- 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 index 7138e0d320..15707c45d9 100644 --- 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 = [ 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 index 7bf7dc4d8b..201d1e5be9 100644 --- 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/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue index f6cf572191..7671fc8ad8 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/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/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue index 53a37bbca4..3aaacce74f 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/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/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue index 1e0e8dab4c..ac0c21905c 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/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/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue index 1fb707f8c2..d2549e7ea9 100644 --- a/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/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/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue index e4f7334a0e..6f6338f964 100644 --- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/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', - }, ], ];