feat(frontend): 单据管理迭代_1205 TencentBlueKing#7190

# Reviewed, transaction id: 25949
JustaCattt · Dec 5, 2024 · 2950347 · 2950347
1 parent 31f4244
commit 2950347
Show file tree

Hide file tree

Showing 23 changed files with 234 additions and 416 deletions.
diff --git a/dbm-ui/frontend/src/components/render-table/columns/input/index.vue b/dbm-ui/frontend/src/components/render-table/columns/input/index.vue
@@ -72,7 +72,7 @@
     pasteFn?: (value: string) => string;
   }
 
-  type ValueType = string | number;
+  export type ValueType = string | number;
 
   interface Emits {
     (e: 'blur', value: ValueType): void;

diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3747,5 +3747,8 @@
   "不一致时间范围:": "不一致时间范围:",
   "变更信息:": "变更信息:",
   "是否强制切换:": "是否强制切换:",
+  "替换类型：": "替换类型：",
+  "目标Proxy实例": "目标 Proxy 实例",
+  "全局超时时间:": "全局超时时间:",
   "这行勿动！新增翻译请在上一行添加！": ""
 }
diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts
@@ -6,11 +6,9 @@ import type { DetailBase, DetailClusters } from '../common';
 export interface HaFullBackup extends DetailBase {
   clusters: DetailClusters;
   infos: {
-    backup_type: string;
-    clusters: {
-      backup_local: string;
-      cluster_id: number;
-    }[];
-    file_tag: string;
-  };
+    cluster_id: number;
+    backup_local: 'master' | 'slave';
+  }[];
+  file_tag: 'DBFILE1M' | 'DBFILE6M' | 'DBFILE1Y' | 'DBFILE3Y';
+  backup_type: 'logical' | 'physical';
 }
diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts
@@ -9,6 +9,11 @@ export interface ProxySwitch extends DetailBase {
   force: boolean;
   infos: {
     cluster_ids: number[];
+    display_info: {
+      type: 'INSTANCE_REPLACE' | 'HOST_REPLACE';
+      related_clusters: string[];
+      related_instances: string[];
+    };
     origin_proxy: {
       bk_biz_id: number;
       bk_cloud_id: number;

diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts
@@ -5,7 +5,7 @@ import type { DetailBase, DetailClusters } from '../common';
  */
 
 export interface RestoreLocalSlave extends DetailBase {
-  backup_source: string;
+  backup_source: 'local' | 'remote';
   clusters: DetailClusters;
   force: boolean;
   infos: {

diff --git a/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts b/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts
@@ -3,9 +3,8 @@ import type { DetailBase, DetailClusters } from '../common';
 /**
  * TenDB Cluster Slave重建
  */
-
 export interface RestoreSlave extends DetailBase {
-  backup_source: string;
+  backup_source: 'local' | 'remote';
   clusters: DetailClusters;
   infos: {
     cluster_id: number;

diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue
@@ -247,13 +247,12 @@
 
       await createTicket({
         bk_biz_id: currentBizId,
-        ticket_type: 'MYSQL_HA_FULL_BACKUP',
+        ticket_type: TicketTypes.MYSQL_HA_FULL_BACKUP,
         remark: formData.remark,
         details: {
-          infos: {
-            ...formData,
-            clusters: infos,
-          },
+          backup_type: formData.backup_type,
+          file_tag: formData.file_tag,
+          infos,
         },
       }).then((data) => {
         window.changeConfirm = false;

diff --git a/...c/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue b/...c/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue
@@ -39,7 +39,9 @@
   }
 
   interface Exposes {
-    getValue: () => Promise<Record<string, string>>;
+    getValue: () => Promise<{
+      backup_local: string;
+    }>;
   }
 
   const props = defineProps<Props>();
@@ -97,7 +99,7 @@
     () => {
       if (props.clusterData) {
         fetchClusterList({
-          cluster_ids: props.clusterData.id,
+          cluster_ids: [props.clusterData.id],
         });
       }
     },

diff --git a/...d/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue b/...d/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue
@@ -46,7 +46,9 @@
   }
 
   interface Exposes {
-    getValue: () => Array<number>;
+    getValue: () => Promise<{
+      cluster_id: number;
+    }>;
   }
 
   const props = defineProps<Props>();

diff --git a/...ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue b/...ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue
@@ -56,13 +56,16 @@
   });
 </script>
 <script setup lang="ts">
+  import { type Mysql } from '@services/model/ticket/ticket';
+
   import RenderBackupLocal from './RenderBackupLocal.vue';
   import RenderCluster from './RenderCluster.vue';
 
   interface Props {
     data: IDataRow;
     removeable: boolean;
   }
+
   interface Emits {
     (e: 'add', params: Array<IDataRow>): void;
     (e: 'remove'): void;
@@ -71,7 +74,7 @@
   }
 
   interface Exposes {
-    getValue: () => Promise<any>;
+    getValue: () => Promise<Mysql.HaFullBackup['infos'][number]>;
   }
 
   const props = defineProps<Props>();

diff --git a/...ge/mysql/proxy-replace/pages/page1/components/ReplaceHost/components/RenderData/Index.vue b/...ge/mysql/proxy-replace/pages/page1/components/ReplaceHost/components/RenderData/Index.vue
@@ -31,13 +31,13 @@
       :min-width="200"
       :required="false"
       :width="240">
-      {{ t('同机关联实例') }}
+      {{ t('关联实例') }}
     </RenderTableHeadColumn>
     <RenderTableHeadColumn
       :min-width="200"
       :required="false"
       :width="240">
-      {{ t('同机关联集群') }}
+      {{ t('关联集群') }}
     </RenderTableHeadColumn>
     <RenderTableHeadColumn
       :min-width="200"

diff --git a/...ysql/proxy-replace/pages/page1/components/ReplaceInstance/components/RenderData/Index.vue b/...ysql/proxy-replace/pages/page1/components/ReplaceInstance/components/RenderData/Index.vue
@@ -17,7 +17,7 @@
       fixed="left"
       :min-width="200"
       :width="240">
-      {{ t('目标实例') }}
+      {{ t('目标Proxy实例') }}
       <template #append>
         <span
           v-bk-tooltips="t('批量选择')"

diff --git a/...er/common/ticket-detail/components/task-info/com-factory/common/BatchClusterOperation.vue b/...er/common/ticket-detail/components/task-info/com-factory/common/BatchClusterOperation.vue
@@ -15,38 +15,12 @@
   <BkTable
     :data="tableData"
     show-overflow-tooltip>
-    <BkTableColumn
-      field="cluster_ids"
-      :label="t('集群ID')">
+    <BkTableColumn :label="t('集群')">
       <template #default="{ data }: { data: RowData }">
-        {{ data.id }}
+        {{ ticketDetails.details.clusters[data.id].immute_domain }}
       </template>
     </BkTableColumn>
-    <BkTableColumn
-      field="immute_domain"
-      :label="t('集群名称')">
-      <template #default="{ data }: { data: RowData }">
-        <div
-          v-bk-tooltips="{
-            content: `${t('域名')}：${ticketDetails.details.clusters[data.id].immute_domain}
-            ${ticketDetails.details.clusters[data.id].name ? `${'集群别名'}：${ticketDetails.details.clusters[data.id].name}` : null}
-          `,
-            allowHTML: true,
-          }"
-          class="cluster-name">
-          <span>{{ ticketDetails.details.clusters[data.id].immute_domain }}</span>
-          <br />
-          <span
-            v-if="ticketDetails.details.clusters[data.id].name"
-            class="cluster-name-alias">
-            {{ ticketDetails.details.clusters[data.id].name }}
-          </span>
-        </div>
-      </template>
-    </BkTableColumn>
-    <BkTableColumn
-      field="cluster_type_name"
-      :label="t('集群类型')">
+    <BkTableColumn :label="t('集群类型')">
       <template #default="{ data }: { data: RowData }">
         {{ ticketDetails.details.clusters[data.id].cluster_type_name }}
       </template>
@@ -76,14 +50,3 @@
 
   type RowData = UnwrapRef<typeof tableData>[number];
 </script>
-
-<style lang="less" scoped>
-  .cluster-name {
-    padding: 8px 0;
-    line-height: 16px;
-
-    .cluster-name-alias {
-      color: @light-gray;
-    }
-  }
-</style>
diff --git a/...-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue b/...-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue
@@ -15,38 +15,12 @@
   <BkTable
     :data="tableData"
     show-overflow-tooltip>
-    <BkTableColumn
-      field="cluster_ids"
-      :label="t('集群ID')">
+    <BkTableColumn :label="t('集群')">
       <template #default="{ data }: { data: RowData }">
-        {{ data.id }}
+        {{ ticketDetails.details.clusters[data.id].immute_domain }}
       </template>
     </BkTableColumn>
-    <BkTableColumn
-      field="immute_domain"
-      :label="t('集群名称')">
-      <template #default="{ data }: { data: RowData }">
-        <div
-          v-bk-tooltips="{
-            content: `${t('域名')}：${ticketDetails.details.clusters[data.id].immute_domain}
-            ${ticketDetails.details.clusters[data.id].name ? `${'集群别名'}：${ticketDetails.details.clusters[data.id].name}` : null}
-          `,
-            allowHTML: true,
-          }"
-          class="cluster-name">
-          <span>{{ ticketDetails.details.clusters[data.id].immute_domain }}</span>
-          <br />
-          <span
-            v-if="ticketDetails.details.clusters[data.id].name"
-            class="cluster-name-alias">
-            {{ ticketDetails.details.clusters[data.id].name }}
-          </span>
-        </div>
-      </template>
-    </BkTableColumn>
-    <BkTableColumn
-      field="cluster_type_name"
-      :label="t('集群类型')">
+    <BkTableColumn :label="t('集群类型')">
       <template #default="{ data }: { data: RowData }">
         {{ ticketDetails.details.clusters[data.id].cluster_type_name }}
       </template>
@@ -80,14 +54,3 @@
 
   type RowData = UnwrapRef<typeof tableData>[number];
 </script>
-
-<style lang="less" scoped>
-  .cluster-name {
-    padding: 8px 0;
-    line-height: 16px;
-
-    .cluster-name-alias {
-      color: @light-gray;
-    }
-  }
-</style>
diff --git a/...ail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue b/...ail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue
@@ -15,7 +15,7 @@
   <BkTable
     :data="ticketDetails.details.infos"
     show-overflow-tooltip>
-    <BkTableColumn :label="t('集群名称')">
+    <BkTableColumn :label="t('集群')">
       <template #default="{ data }: { data: RowData }">
         {{ ticketDetails.details.clusters[data.cluster_id].immute_domain }}
       </template>