From a7e67bccf7299316b5e31edd58eb199dd9bc730e Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 17 Oct 2024 22:39:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20tendbCluster=20=E6=89=A9?=
 =?UTF-8?q?=E5=AE=B9/=E7=BC=A9=E5=AE=B9=E6=8E=A5=E5=85=A5=E5=B1=82?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E5=BC=82=E5=B8=B8=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=20#7354=20#=20Reviewed,=20transaction=20id:=2021189?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy-scale-down/pages/page1/Index.vue    |  4 --
 .../proxy-scale-up/pages/page1/Index.vue      |  8 +--
 .../ticket-detail/components/BaseInfo.vue     | 67 +++++++++++++++++++
 .../details/components/BaseInfo.vue           | 52 +++++++-------
 dbm-ui/frontend/vite.config.mts               |  2 +-
 5 files changed, 97 insertions(+), 36 deletions(-)
 create mode 100644 dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/BaseInfo.vue

diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-down/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-down/pages/page1/Index.vue
index 6ba8e379b9..c1b2e5b57f 100644
--- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-down/pages/page1/Index.vue
+++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-down/pages/page1/Index.vue
@@ -132,10 +132,6 @@
   const tabListConfig = {
     [ClusterTypes.TENDBCLUSTER]: {
       disabledRowConfig: [
-        {
-          handler: (data: TendbClusterModel) => data.status !== 'normal',
-          tip: t('集群异常'),
-        },
         {
           handler: (data: TendbClusterModel) => data.spider_master.length <= 2 && data.spider_slave.length <= 1,
           tip: t('Master 至少保留 2 台 ，Slave 至少 保留 1台'),
diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-up/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-up/pages/page1/Index.vue
index 4397c3ed93..4c0d528fae 100644
--- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-up/pages/page1/Index.vue
+++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/proxy-scale-up/pages/page1/Index.vue
@@ -116,12 +116,8 @@
 
   const tabListConfig = {
     [ClusterTypes.TENDBCLUSTER]: {
-      disabledRowConfig: [
-        {
-          handler: (data: TendbClusterModel) => data.status !== 'normal',
-          tip: t('集群异常'),
-        },
-      ],
+      id: ClusterTypes.TENDBCLUSTER,
+      name: t('集群选择'),
     },
   };
 
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/BaseInfo.vue
new file mode 100644
index 0000000000..48a6922a8e
--- /dev/null
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/BaseInfo.vue
@@ -0,0 +1,67 @@
+<template>
+  <DbCard
+    mode="collapse"
+    :title="t('基本信息')">
+    <table class="ticket-base-info">
+      <tbody>
+        <tr>
+          <td>{{ t('单号') }}:</td>
+          <td>{{ ticketData.id }}</td>
+          <td>{{ t('单据状态') }}:</td>
+          <td>
+            <BkTag :theme="ticketData.tagTheme">
+              {{ t(ticketData.statusText) }}
+            </BkTag>
+          </td>
+          <td>{{ t('已耗时') }}:</td>
+          <td>
+            <CostTimer
+              :is-timing="ticketData?.status === 'RUNNING'"
+              :start-time="utcTimeToSeconds(ticketData?.create_at)"
+              :value="ticketData?.cost_time || 0" />
+          </td>
+        </tr>
+        <tr>
+          <td>{{ t('单据类型') }}:</td>
+          <td>{{ ticketData.ticket_type_display }}</td>
+          <td>{{ t('申请人') }}:</td>
+          <td>{{ ticketData.creator }}</td>
+          <td>{{ t('申请时间') }}:</td>
+          <td>{{ utcDisplayTime(ticketData.create_at) }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </DbCard>
+</template>
+<script setup lang="ts">
+  import { useI18n } from 'vue-i18n';
+
+  import TicketModel from '@services/model/ticket/ticket';
+
+  import CostTimer from '@components/cost-timer/CostTimer.vue';
+
+  import { utcDisplayTime, utcTimeToSeconds } from '@utils';
+
+  interface Props {
+    ticketData: TicketModel<unknown>;
+  }
+
+  defineProps<Props>();
+
+  const { t } = useI18n();
+</script>
+<style lang="less">
+  .ticket-base-info {
+    td {
+      width: 18%;
+      line-height: 32px;
+      color: #313238;
+
+      &:nth-child(2n + 1) {
+        width: 12%;
+        padding-right: 8px;
+        text-align: right;
+      }
+    }
+  }
+</style>
diff --git a/dbm-ui/frontend/src/views/tickets/my-tickets/components/details/components/BaseInfo.vue b/dbm-ui/frontend/src/views/tickets/my-tickets/components/details/components/BaseInfo.vue
index d08fa33aa3..48a6922a8e 100644
--- a/dbm-ui/frontend/src/views/tickets/my-tickets/components/details/components/BaseInfo.vue
+++ b/dbm-ui/frontend/src/views/tickets/my-tickets/components/details/components/BaseInfo.vue
@@ -3,31 +3,33 @@
     mode="collapse"
     :title="t('基本信息')">
     <table class="ticket-base-info">
-      <tr>
-        <td>{{ t('单号') }}:</td>
-        <td>{{ ticketData.id }}</td>
-        <td>{{ t('单据状态') }}:</td>
-        <td>
-          <BkTag :theme="ticketData.tagTheme">
-            {{ t(ticketData.statusText) }}
-          </BkTag>
-        </td>
-        <td>{{ t('已耗时') }}:</td>
-        <td>
-          <CostTimer
-            :is-timing="ticketData?.status === 'RUNNING'"
-            :start-time="utcTimeToSeconds(ticketData?.create_at)"
-            :value="ticketData?.cost_time || 0" />
-        </td>
-      </tr>
-      <tr>
-        <td>{{ t('单据类型') }}:</td>
-        <td>{{ ticketData.ticket_type_display }}</td>
-        <td>{{ t('申请人') }}:</td>
-        <td>{{ ticketData.creator }}</td>
-        <td>{{ t('申请时间') }}:</td>
-        <td>{{ utcDisplayTime(ticketData.create_at) }}</td>
-      </tr>
+      <tbody>
+        <tr>
+          <td>{{ t('单号') }}:</td>
+          <td>{{ ticketData.id }}</td>
+          <td>{{ t('单据状态') }}:</td>
+          <td>
+            <BkTag :theme="ticketData.tagTheme">
+              {{ t(ticketData.statusText) }}
+            </BkTag>
+          </td>
+          <td>{{ t('已耗时') }}:</td>
+          <td>
+            <CostTimer
+              :is-timing="ticketData?.status === 'RUNNING'"
+              :start-time="utcTimeToSeconds(ticketData?.create_at)"
+              :value="ticketData?.cost_time || 0" />
+          </td>
+        </tr>
+        <tr>
+          <td>{{ t('单据类型') }}:</td>
+          <td>{{ ticketData.ticket_type_display }}</td>
+          <td>{{ t('申请人') }}:</td>
+          <td>{{ ticketData.creator }}</td>
+          <td>{{ t('申请时间') }}:</td>
+          <td>{{ utcDisplayTime(ticketData.create_at) }}</td>
+        </tr>
+      </tbody>
     </table>
   </DbCard>
 </template>
diff --git a/dbm-ui/frontend/vite.config.mts b/dbm-ui/frontend/vite.config.mts
index fd96c78a5b..819379e6b5 100644
--- a/dbm-ui/frontend/vite.config.mts
+++ b/dbm-ui/frontend/vite.config.mts
@@ -96,7 +96,7 @@ export default defineConfig(({ mode }) => {
       }),
     ].concat(isHttps ? [basicSsl()] : []),
     optimizeDeps: {
-      exclude: ['@blueking/ip-selector/dist/vue3.x.js', 'lib/'],
+      exclude: ['@blueking/ip-selector/dist/vue3.x.js'],
     },
     server: {
       strictPort: true,