From bbbd86366a092bc079ac6232477cb20348dae4db Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 9 Jan 2025 15:22:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(frontend):=20=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8D=95=E6=8D=AE=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=20#8998=20#=20Reviewed,=20transaction=20id:=2028909?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ticket-center/common/TableModeTable.vue   |  4 ++++
 .../components/list/components/TableMode.vue  | 22 +++----------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
index 5619164403..c9dfbffe93 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
@@ -8,6 +8,10 @@
         :max-height="tableMaxHeight"
         :pagination="pagination"
         :row-class="rowClass"
+        :row-config="{
+          useKey: true,
+          keyField: 'id',
+        }"
         :show-overflow="false"
         @filter-change="handleFilterChange"
         @page-limit-change="handlePageLimitChange"
diff --git a/dbm-ui/frontend/src/views/ticket-center/platform-manage/components/list/components/TableMode.vue b/dbm-ui/frontend/src/views/ticket-center/platform-manage/components/list/components/TableMode.vue
index f2951fe3fa..51e252d192 100644
--- a/dbm-ui/frontend/src/views/ticket-center/platform-manage/components/list/components/TableMode.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/platform-manage/components/list/components/TableMode.vue
@@ -40,9 +40,9 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { getCurrentInstance, onActivated, onDeactivated } from 'vue';
+  import { onActivated } from 'vue';
   import { useI18n } from 'vue-i18n';
-  import { useRoute, useRouter } from 'vue-router';
+  import { useRoute } from 'vue-router';
 
   import TicketModel from '@services/model/ticket/ticket';
   import { getTickets } from '@services/source/ticket';
@@ -57,12 +57,10 @@
 
   type IRowData = TicketModel;
 
-  const router = useRouter();
   const route = useRoute();
   const { t } = useI18n();
-  const currentInstance = getCurrentInstance();
 
-  const { getSearchParams, removeSearchParam } = useUrlSearch();
+  const { removeSearchParam } = useUrlSearch();
 
   const { value: datePickerValue, shortcutsRange } = useDatePicker();
 
@@ -81,20 +79,6 @@
     selectTicketId.value = Number(route.query.selectId);
     removeSearchParam('selectId');
   });
-
-  onDeactivated(() => {
-    setTimeout(() => {
-      if (currentInstance!.isUnmounted) {
-        return;
-      }
-      router.replace({
-        params: {
-          ticketId: selectTicketId.value,
-        },
-        query: getSearchParams(),
-      });
-    });
-  });
 </script>
 <style lang="less">
   .ticket-list-table-mode {

From 73f2ccb53b9a9ab1486440dd5ea8293b3556a64a Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 9 Jan 2025 21:15:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(frontend):=20=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20#9015?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/src/locales/zh-cn.json        |  4 +-
 .../ClusterNameColumn.vue                     |  3 +-
 .../SlaveDomainColumn.vue                     | 22 +++++-----
 .../redis/list/components/list/Index.vue      | 44 ++++++++++++-------
 .../list/components/MasterSlaveRoleColume.vue |  5 ++-
 .../list/components/list/Index.vue            |  2 +-
 .../views/quick-search/components/Entry.vue   | 25 ++++++++---
 .../ticket-center/common/TableModeTable.vue   |  4 +-
 .../flow-type-common/StatusFailed.vue         |  7 ++-
 .../flow-type-inner-flow/StatusFailed.vue     |  7 ++-
 .../self-todo/components/AssistTab.vue        |  2 +-
 11 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
index ed793fbab3..3fa9f99e73 100644
--- a/dbm-ui/frontend/src/locales/zh-cn.json
+++ b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3907,7 +3907,7 @@
   "单据中心": "单据中心",
   "待我处理": "待我处理",
   "待我协助": "待我协助",
-  "待我处理：通常是我提交的单据，或者我是业务主DB": "待我处理：通常是我提交的单据，或者我是业务主DB",
+  "待我处理：通常是我提交的单据，或者我是业务主DBA": "待我处理：通常是我提交的单据，或者我是业务主DBA",
   "待我协助：通常是我被设定为单据协助人，或者我是业务的备DBA、二线 DBA": "待我协助：通常是我被设定为单据协助人，或者我是业务的备DBA、二线 DBA",
   "Proxy存储资源规格：": "Proxy存储资源规格：",
   "集群：": "集群：",
@@ -3924,7 +3924,7 @@
   "单据协作人": "单据协作人",
   "集群标识，支持小写字母、数字、连字符 -（连字符不可打头）": "集群标识，支持小写字母、数字、连字符 -（连字符不可打头）",
   "当前协助人": "当前协助人",
-  "c实例预览r_n": "【{0}】实例预览 {1}（共{2}组）",
+  "c实例预览r_n": "【{0}】实例预览 {1}（共 {2} 组）",
   "排除业务": "排除业务",
   "1. 群聊添加群机器人: 蓝鲸监控(上云)": "1. 群聊添加群机器人: 蓝鲸监控(上云)",
   "2. 手动蓝鲸监控(上云) 并输入关键字n": "2. 手动 {'@'}蓝鲸监控(上云) 并输入关键字 {n}",
diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/ClusterNameColumn.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/ClusterNameColumn.vue
index 2e38501020..fdc4ef56d7 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/ClusterNameColumn.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/ClusterNameColumn.vue
@@ -3,7 +3,8 @@
     class-name="cluster-table-cluster-name-column"
     field="cluster_name"
     :label="t('集群名称')"
-    :min-width="200">
+    :min-width="200"
+    :show-overflow="false">
     <template #header>
       <RenderHeadCopy
         :config="[
diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/SlaveDomainColumn.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/SlaveDomainColumn.vue
index f03926d40e..766d72c1fb 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/SlaveDomainColumn.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-table-column/SlaveDomainColumn.vue
@@ -34,11 +34,18 @@
           <template
             v-if="index === 0"
             #append>
-            <DbIcon
+            <RenderCellCopy
               v-if="data.slave_domain"
-              v-bk-tooltips="t('复制从访问入口')"
-              type="copy"
-              @click="() => handleCopySlaveDomain(data.slaveDomainDisplayName)" />
+              :copy-items="[
+                {
+                  value: data.slave_domain,
+                  label: t('域名'),
+                },
+                {
+                  value: data.slaveDomainDisplayName,
+                  label: t('域名:端口'),
+                },
+              ]" />
             <span v-db-console="accessEntryDbConsole">
               <EditEntryConfig
                 :id="data.id"
@@ -83,10 +90,9 @@
   import TextOverflowLayout from '@components/text-overflow-layout/Index.vue';
 
   import EditEntryConfig from '@views/db-manage/common/cluster-entry-config/Index.vue';
+  import RenderCellCopy from '@views/db-manage/common/render-cell-copy/Index.vue';
   import RenderHeadCopy from '@views/db-manage/common/render-head-copy/Index.vue';
 
-  import { execCopy } from '@utils';
-
   import useColumnCopy from './hooks/useColumnCopy';
   import type { ClusterModel } from './types';
 
@@ -126,10 +132,6 @@
 
   const { handleCopySelected, handleCopyAll } = useColumnCopy(props);
 
-  const handleCopySlaveDomain = (clusterName: string) => {
-    execCopy(clusterName);
-  };
-
   const fetchTableData = () => {
     emits('refresh');
   };
diff --git a/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/Index.vue
index 3b755b43d5..c03ee71ceb 100644
--- a/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/Index.vue
+++ b/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/Index.vue
@@ -124,6 +124,14 @@
           label="Slave"
           :search-ip="batchSearchIpInatanceList"
           :selected-list="selected" />
+        <BkTableColumn
+          field="cluster_type_name"
+          :label="t('架构版本')"
+          :min-width="150">
+          <template #default="{ data }: { data: RedisModel }">
+            {{ data.cluster_type_name || '--' }}
+          </template>
+        </BkTableColumn>
         <CommonColumn :cluster-type="ClusterTypes.REDIS" />
         <BkTableColumn
           :fixed="isStretchLayoutOpen ? false : 'right'"
@@ -132,29 +140,31 @@
           :show-overflow="false">
           <template #default="{data}: {data: RedisModel}">
             <OperationBtnStatusTips
-              v-bk-tooltips="{
-                content: t('暂不支持跨管控区域提取Key'),
-                disabled: data.bk_cloud_id === undefined,
-              }"
               v-db-console="'redis.clusterManage.extractKey'"
               :data="data"
               :disabled="!data.isOffline">
-              <AuthButton
-                action-id="redis_keys_extract"
-                class="mr-8"
-                :disabled="data.isOffline"
-                :permission="data.permission.redis_keys_extract"
-                :resource="data.id"
-                text
-                theme="primary"
-                @click="handleShowExtract([data])">
-                {{ t('提取Key') }}
-              </AuthButton>
+              <span
+                v-bk-tooltips="{
+                  content: t('暂不支持跨管控区域提取Key'),
+                  disabled: data.bk_cloud_id === 0,
+                }">
+                <AuthButton
+                  action-id="redis_keys_extract"
+                  class="mr-8"
+                  :disabled="data.isOffline || data.bk_cloud_id !== 0"
+                  :permission="data.permission.redis_keys_extract"
+                  :resource="data.id"
+                  text
+                  theme="primary"
+                  @click="handleShowExtract([data])">
+                  {{ t('提取Key') }}
+                </AuthButton>
+              </span>
             </OperationBtnStatusTips>
             <OperationBtnStatusTips
               v-bk-tooltips="{
                 content: t('暂不支持跨管控区域删除Key'),
-                disabled: data.bk_cloud_id === undefined,
+                disabled: data.bk_cloud_id === 0,
               }"
               v-db-console="'redis.clusterManage.deleteKey'"
               :data="data"
@@ -162,7 +172,7 @@
               <AuthButton
                 action-id="redis_keys_delete"
                 class="mr-8"
-                :disabled="data.isOffline"
+                :disabled="data.isOffline || data.bk_cloud_id !== 0"
                 :permission="data.permission.redis_keys_delete"
                 :resource="data.id"
                 text
diff --git a/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/components/MasterSlaveRoleColume.vue b/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/components/MasterSlaveRoleColume.vue
index 5af5754f4f..4219ff9951 100644
--- a/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/components/MasterSlaveRoleColume.vue
+++ b/dbm-ui/frontend/src/views/db-manage/redis/list/components/list/components/MasterSlaveRoleColume.vue
@@ -2,7 +2,10 @@
   <BaseRoleColumn
     v-bind="props"
     :min-width="280">
-    <template #default="{ data }"> {{ data.ip }}:{{ data.port }}({{ data.seg_range }}) </template>
+    <template #default="{ data }">
+      {{ data.ip }}:{{ data.port }}
+      <template v-if="data.seg_range">({{ data.seg_range }})</template>
+    </template>
     <template #instanceListTitle="{ data }">
       <I18nT keypath="c实例预览r_n">
         <span>{{ data.master_domain }}</span>
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 3593ad50e7..65255e2f5b 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
@@ -227,7 +227,7 @@
                 <OperationBtnStatusTips :data="data">
                   <AuthButton
                     action-id="tendbcluster_enable_disable"
-                    :disabled="data.operationDisabled"
+                    :disabled="data.operationTicketId"
                     :permission="data.permission.tendbcluster_enable_disable"
                     :resource="data.id"
                     text
diff --git a/dbm-ui/frontend/src/views/quick-search/components/Entry.vue b/dbm-ui/frontend/src/views/quick-search/components/Entry.vue
index ab27959296..8162346155 100644
--- a/dbm-ui/frontend/src/views/quick-search/components/Entry.vue
+++ b/dbm-ui/frontend/src/views/quick-search/components/Entry.vue
@@ -31,7 +31,11 @@
         <BkTable
           class="search-result-table mt-14 mb-8"
           :data="item.dataList"
-          :pagination="pagination[index]">
+          :pagination="pagination[index]"
+          :row-config="{
+            useKey: true,
+            keyField: 'id',
+          }">
           <BkTableColumn
             field="entry"
             :label="t('访问入口（域名、CLB、北极星）')"
@@ -85,7 +89,8 @@
           </BkTableColumn>
           <BkTableColumn
             field="cluster_status"
-            :label="t('状态')">
+            :label="t('状态')"
+            :width="100">
             <template #default="{data: rowData}: {data: QuickSearchEntryModel}">
               <RenderClusterStatus :data="rowData.cluster_status" />
             </template>
@@ -100,28 +105,32 @@
           </BkTableColumn>
           <BkTableColumn
             field="cluster_type"
-            :label="t('架构类型')">
+            :label="t('架构类型')"
+            :width="150">
             <template #default="{data: rowData}: {data: QuickSearchEntryModel}">
               {{ rowData.cluster_type || '--' }}
             </template>
           </BkTableColumn>
           <BkTableColumn
             field="major_version"
-            :label="t('版本')">
+            :label="t('版本')"
+            :width="150">
             <template #default="{data: rowData}: {data: QuickSearchEntryModel}">
               {{ rowData.major_version || '--' }}
             </template>
           </BkTableColumn>
           <BkTableColumn
             field="region"
-            :label="t('地域')">
+            :label="t('地域')"
+            :width="150">
             <template #default="{data: rowData}: {data: QuickSearchEntryModel}">
               {{ rowData.region || '--' }}
             </template>
           </BkTableColumn>
           <BkTableColumn
             field="bk_biz_id"
-            :label="t('所属业务')">
+            :label="t('所属业务')"
+            :width="150">
             <template #default="{data: rowData}: {data: QuickSearchEntryModel}">
               {{ rowData.bk_biz_id ? bizIdNameMap[rowData.bk_biz_id] : '--' }}
             </template>
@@ -238,8 +247,12 @@
       [t('访问入口（域名、CLB、北极星）')]: dataItem.entry,
       [t('所属集群')]: dataItem.immute_domain,
       [t('架构类型')]: dataItem.cluster_type,
+      [t('版本')]: dataItem.major_version,
+      [t('地域')]: dataItem.region,
       [t('所属业务')]: String(dataItem.bk_biz_id),
       [t('业务名称')]: props.bizIdNameMap[dataItem.bk_biz_id],
+      [t('容灾要求')]: dataItem.disaster_tolerance_level,
+      [t('主 DBA')]: dataItem.dba,
     }));
     const colsWidths = [{ width: 10 }, { width: 16 }, { width: 16 }, { width: 24 }, { width: 24 }, { width: 16 }];
 
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
index c9dfbffe93..dd6a73d48b 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
@@ -332,8 +332,8 @@
   const isSearching = computed(
     () =>
       Object.keys(formatSearchValue.value).length > 0 ||
-      formatDateValue.value.create_at__gte !== '' ||
-      formatDateValue.value.create_at__lte !== '',
+      Boolean(formatDateValue.value.create_at__gte) ||
+      Boolean(formatDateValue.value.create_at__lte),
   );
 
   const fetchData = () => {
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
index 5503e27da4..bb5405b438 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
@@ -98,6 +98,11 @@
   const { t } = useI18n();
   const { username, isSuperuser } = useUserProfile();
 
-  const isCanOperation = computed(() => isSuperuser || props.ticketDetail.todo_operators.includes(username));
+  const isCanOperation = computed(
+    () =>
+      isSuperuser ||
+      props.ticketDetail.todo_operators.includes(username) ||
+      props.ticketDetail.todo_helpers.includes(username),
+  );
   const isNeedOperation = computed(() => [0, 2].includes(props.data.err_code));
 </script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
index a0e09157b2..fdeb0a9992 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
@@ -99,6 +99,11 @@
   const { t } = useI18n();
   const { username, isSuperuser } = useUserProfile();
 
-  const isCanOperation = computed(() => isSuperuser || props.ticketDetail.todo_operators.includes(username));
+  const isCanOperation = computed(
+    () =>
+      isSuperuser ||
+      props.ticketDetail.todo_operators.includes(username) ||
+      props.ticketDetail.todo_helpers.includes(username),
+  );
   const isNeedOperation = computed(() => props.data.err_msg || [0, 2].includes(props.data.err_code));
 </script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/AssistTab.vue b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/AssistTab.vue
index cb2eae9ec9..fd3bdf0e5f 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/AssistTab.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/AssistTab.vue
@@ -4,7 +4,7 @@
       <BkPopover placement="top">
         <DbIcon type="attention" />
         <template #content>
-          <div>{{ t('待我处理：通常是我提交的单据，或者我是业务主DB') }}</div>
+          <div>{{ t('待我处理：通常是我提交的单据，或者我是业务主DBA') }}</div>
           <div>{{ t('待我协助：通常是我被设定为单据协助人，或者我是业务的备DBA、二线 DBA') }}</div>
         </template>
       </BkPopover>