From 0565bff352959a411655477485af1789cf792499 Mon Sep 17 00:00:00 2001 From: chenwenchang <479999519@qq.com> Date: Wed, 27 Nov 2024 14:15:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20redis=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E8=AE=B0=E5=BD=95=E5=88=A0=E9=99=A4=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E5=AE=9E=E4=BE=8B=E5=B1=95=E7=A4=BA=20#8219=20#=20Rev?= =?UTF-8?q?iewed,=20transaction=20id:=2025052?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/model/ticket/details/redis.ts | 3 ++ dbm-ui/frontend/src/types/auto-imports.d.ts | 2 +- .../structure-instance/pages/page1/Index.vue | 6 ++++ .../demand-factory/redis/StructureDelete.vue | 30 +++++++++---------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dbm-ui/frontend/src/services/model/ticket/details/redis.ts b/dbm-ui/frontend/src/services/model/ticket/details/redis.ts index 0a5d736f04..422c0d17db 100644 --- a/dbm-ui/frontend/src/services/model/ticket/details/redis.ts +++ b/dbm-ui/frontend/src/services/model/ticket/details/redis.ts @@ -402,6 +402,9 @@ export interface RedisStructureDeleteDetails extends DetailBase { related_rollback_bill_id: number; prod_cluster: string; bk_cloud_id: number; + display_info: { + temp_cluster_proxy: string; + }; }[]; } diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts index d0c217f6f1..7021ac5101 100644 --- a/dbm-ui/frontend/src/types/auto-imports.d.ts +++ b/dbm-ui/frontend/src/types/auto-imports.d.ts @@ -71,6 +71,6 @@ declare global { // for type re-export declare global { // @ts-ignore - export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' + export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue' import('vue') } diff --git a/dbm-ui/frontend/src/views/db-manage/redis/structure-instance/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/structure-instance/pages/page1/Index.vue index ca7624df04..487a1f386e 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/structure-instance/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/structure-instance/pages/page1/Index.vue @@ -407,6 +407,9 @@ related_rollback_bill_id, cluster_id: item.prod_cluster_id, bk_cloud_id, + display_info: { + temp_cluster_proxy: item.temp_cluster_proxy, + }, }; return obj; }); @@ -417,6 +420,9 @@ related_rollback_bill_id: rowData.related_rollback_bill_id, cluster_id: rowData.prod_cluster_id, bk_cloud_id: rowData.bk_cloud_id, + display_info: { + temp_cluster_proxy: rowData.temp_cluster_proxy, + }, }, ]; }; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/StructureDelete.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/StructureDelete.vue index e6a6fa70dd..0d3b1fa98c 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/StructureDelete.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/StructureDelete.vue @@ -12,9 +12,21 @@ -->