diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index da5c20e168..0e4c685776 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -24,7 +24,8 @@ "@blueking/login-modal": "^1.0.5", "@blueking/notice-component": "2.0.5", "@blueking/sub-saas": "0.0.0-beta.6", - "@blueking/table": "^0.0.1-beta.17", + "@blueking/table": "^0.0.1-beta.18", + "@blueking/vxe-table": "^4.8.0-beta.7.7", "@icon-cool/bk-icon-bk-biz-components": "0.0.4", "@vueuse/core": "^11.0.3", "axios": "^1.7.7", diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 3046ec518b..35ca4504db 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3621,7 +3621,6 @@ "变更前": "变更前", "变更后": "变更后", "不变": "不变", - "权限:新增n个,删除m个": "权限 : 新增 {0} 个,删除 {1} 个", "权限类型": "权限类型", "提交失败": "提交失败", "编辑时只能单个,且不能有分隔符": "编辑时只能单个,且不能有分隔符", @@ -3747,7 +3746,6 @@ "共n个_查看更多": "共 {0} 个,查看更多", "待继续": "待继续", "操作:": "操作:", - "冷/热节点": "冷/热节点", "集群 ID": "集群 ID", "指定 DB 名": "指定 DB 名", "变更类型:": "变更类型:", @@ -3777,5 +3775,6 @@ "目标Proxy实例": "目标 Proxy 实例", "全局超时时间:": "全局超时时间:", "回档到指定时间:": "回档到指定时间:", + "权限:新增n个,删除m个": "权限:新增 {0} 个,删除 {1} 个", "这行勿动!新增翻译请在上一行添加!": "" } diff --git a/dbm-ui/frontend/src/services/model/hdfs/hdfs.ts b/dbm-ui/frontend/src/services/model/hdfs/hdfs.ts index a6b4761b95..57cc71a023 100644 --- a/dbm-ui/frontend/src/services/model/hdfs/hdfs.ts +++ b/dbm-ui/frontend/src/services/model/hdfs/hdfs.ts @@ -242,4 +242,8 @@ export default class Hdfs { get isNew() { return isRecentDays(this.create_at, 24); } + + get disasterToleranceLevelName() { + return ClusterAffinityMap[this.disaster_tolerance_level]; + } } diff --git a/dbm-ui/frontend/src/services/model/mysql/tendbha.ts b/dbm-ui/frontend/src/services/model/mysql/tendbha.ts index 260afa7763..3890eda1c7 100644 --- a/dbm-ui/frontend/src/services/model/mysql/tendbha.ts +++ b/dbm-ui/frontend/src/services/model/mysql/tendbha.ts @@ -236,4 +236,8 @@ export default class Tendbha { get isNew() { return isRecentDays(this.create_at, 24); } + + get disasterToleranceLevelName() { + return ClusterAffinityMap[this.disaster_tolerance_level]; + } } diff --git a/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue index 3a393fa5ee..3bf5efe331 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue @@ -53,7 +53,9 @@ releate-url-query :row-class="setRowClass" row-hover="auto" - @clear-search="handleClearSearch" /> + :show-settgings="false" + @clear-search="handleClearSearch" + @refresh="fetchData" /> ( ( ( ( ( ( diff --git a/dbm-ui/frontend/src/views/db-manage/pulsar/list/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/pulsar/list/components/list/Index.vue index d8907af38e..d7e8f3091e 100644 --- a/dbm-ui/frontend/src/views/db-manage/pulsar/list/components/list/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/pulsar/list/components/list/Index.vue @@ -247,9 +247,8 @@ { label: t('访问入口'), field: 'domain', - minWidth: 320, + minWidth: 280, fixed: 'left', - showOverflowTooltip: false, renderHead: () => ( ( {{ @@ -207,7 +206,6 @@ label: t('集群名称'), field: 'cluster_name', minWidth: 200, - showOverflowTooltip: false, render: ({ data }: { data: RedisInstanceModel }) => ( {{ diff --git a/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/list/Index.vue index f1174a5d2e..39f32269ca 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/list/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/list/Index.vue @@ -181,7 +181,6 @@ field: 'instance_address', fixed: 'left', minWidth: 200, - showOverflowTooltip: false, render: ({ data }: { data: RedisInstanceModel }) => ( {{ @@ -212,7 +211,6 @@ label: t('集群名称'), field: 'cluster_name', minWidth: 200, - showOverflowTooltip: false, render: ({ data }: { data: RedisInstanceModel }) => ( {{ diff --git a/dbm-ui/frontend/src/views/db-manage/redis/list-ha/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/list-ha/components/list/Index.vue index e10da02abb..3b8cf348b9 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/list-ha/components/list/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/list-ha/components/list/Index.vue @@ -354,7 +354,7 @@ { label: t('主访问入口'), field: 'master_domain', - minWidth: 320, + minWidth: 280, fixed: 'left', renderHead: () => ( ( ( ( ( {{ @@ -212,7 +211,6 @@ label: t('集群名称'), field: 'cluster_name', minWidth: 200, - showOverflowTooltip: false, render: ({ data }: { data: SqlServerHaInstanceModel }) => ( {{ diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/list/Index.vue index b4e357c7bd..1b6eefff20 100644 --- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/list/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/list/Index.vue @@ -150,7 +150,6 @@ field: 'instance', fixed: 'left', width: 200, - showOverflowTooltip: false, render: ({ data }: IColumn) => ( {{ diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list/components/list/Index.vue index d58d5dc047..b57d69c8ae 100644 --- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list/components/list/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list/components/list/Index.vue @@ -359,8 +359,7 @@ label: t('主访问入口'), field: 'master_domain', fixed: 'left', - minWidth: 320, - showOverflowTooltip: false, + minWidth: 280, renderHead: () => ( ([]); const formattedKeyword = computed(() => props.keyword @@ -126,7 +127,7 @@ { label: t('主访问入口'), field: 'immute_domain', - width: 160, + width: 240, render: ({ data }: { data: QuickSearchClusterDomainModel }) => ( {{ @@ -199,7 +200,7 @@ { label: t('创建时间'), field: 'create_at', - width: 150, + width: 240, sort: true, render: ({ data }: { data: QuickSearchClusterDomainModel }) => data.createAtDisplay || '--', }, @@ -241,6 +242,8 @@ pagination.value = newRenderData.dataList.map(dataItem => ({ count: dataItem.dataList.length, limit: 10, + current: 1, + remote: false, })); }, { immediate: true, diff --git a/dbm-ui/frontend/src/views/quick-search/components/ClusterName.vue b/dbm-ui/frontend/src/views/quick-search/components/ClusterName.vue index b8a48048ef..2c9371e168 100644 --- a/dbm-ui/frontend/src/views/quick-search/components/ClusterName.vue +++ b/dbm-ui/frontend/src/views/quick-search/components/ClusterName.vue @@ -115,7 +115,7 @@ { label: t('主访问入口'), field: 'immute_domain', - width: 160, + width: 240, render: ({ data }: { data: QuickSearchClusterNameModel }) => ( {{ @@ -189,7 +189,7 @@ { label: t('创建时间'), field: 'create_at', - width: 150, + width: 240, sort: true, render: ({ data }: { data: QuickSearchClusterNameModel }) => data.createAtDisplay || '--', }, diff --git a/dbm-ui/frontend/src/views/quick-search/components/Instance.vue b/dbm-ui/frontend/src/views/quick-search/components/Instance.vue index 7047660d98..a03bfe9083 100644 --- a/dbm-ui/frontend/src/views/quick-search/components/Instance.vue +++ b/dbm-ui/frontend/src/views/quick-search/components/Instance.vue @@ -119,7 +119,7 @@ { label: t('主访问入口'), field: 'cluster_domain', - width: 160, + width: 240, render: ({ data }: { data: QuickSearchInstanceModel }) => ( {{