From 0178193d19d80f83d6b982f00d75d7a85f33a1df Mon Sep 17 00:00:00 2001
From: Austin <1344583166@qq.com>
Date: Mon, 2 Sep 2024 14:52:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(frontend):=20redis=20=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=9B=B4=E7=89=88=E6=9C=AC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20#6599?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/page1/components/Row.vue            | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/Row.vue b/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/Row.vue
index 620e7f5af7..4d068db471 100644
--- a/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/Row.vue
+++ b/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/Row.vue
@@ -24,13 +24,13 @@
       <RenderText
         :data="data.clusterTypeName"
         :is-loading="data.isLoading"
-        :placeholder="$t('选择集群后自动生成')" />
+        :placeholder="t('选择集群后自动生成')" />
     </td>
     <td style="padding: 0">
       <RenderText
         :data="data.srcClusterType"
         :is-loading="data.isLoading"
-        :placeholder="$t('选择集群后自动生成')" />
+        :placeholder="t('选择集群后自动生成')" />
     </td>
     <td style="padding: 0">
       <RenderTargetClusterType
@@ -44,7 +44,7 @@
       <RenderText
         :data="data.currentSepc"
         :is-loading="data.isLoading"
-        :placeholder="$t('选择集群后自动生成')" />
+        :placeholder="t('选择集群后自动生成')" />
     </td>
     <td style="padding: 0">
       <RenderDeployPlan
@@ -57,14 +57,14 @@
     <td style="padding: 0">
       <RenderTargetClusterVersion
         ref="versionRef"
-        :cluster-type="data.clusterType"
+        :cluster-type="selectClusterType"
         :data="data.dbVersion" />
     </td>
     <td style="padding: 0">
       <RenderText
         :data="data.switchMode"
         :is-loading="data.isLoading"
-        :placeholder="$t('选择集群后自动生成')" />
+        :placeholder="t('选择集群后自动生成')" />
     </td>
     <OperateColumn
       :removeable="removeable"
@@ -199,6 +199,8 @@
   });
 </script>
 <script setup lang="ts">
+  import { useI18n } from 'vue-i18n';
+
   interface Props {
     data: IDataRow;
     removeable: boolean;
@@ -221,12 +223,24 @@
 
   const emits = defineEmits<Emits>();
 
+  const { t } = useI18n();
+
   const clusterRef = ref<InstanceType<typeof RenderTargetCluster>>();
   const deployPlanRef = ref<InstanceType<typeof RenderDeployPlan>>();
   const targetClusterTypeRef = ref<InstanceType<typeof RenderTargetClusterType>>();
   const versionRef = ref<InstanceType<typeof RenderTargetClusterVersion>>();
   const selectClusterType = ref('');
 
+  watch(
+    () => props.data.clusterType,
+    (clusterType) => {
+      selectClusterType.value = clusterType;
+    },
+    {
+      immediate: true,
+    },
+  );
+
   const handleClusterTypeChange = (value: string) => {
     selectClusterType.value = value;
   };

From 24be77b34beda1aa6a63345ccc2197ab60cd1eb7 Mon Sep 17 00:00:00 2001
From: Austin <1344583166@qq.com>
Date: Mon, 2 Sep 2024 15:57:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(frontend):=20redis=20=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=9B=B4=E7=9B=AE=E6=A0=87=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9E=20redisCluster=20?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=20#6609?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/src/locales/zh-cn.json                 |  1 +
 .../pages/page1/components/RenderTargetClusterType.vue | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
index 4f273f3083..18ed5fd000 100644
--- a/dbm-ui/frontend/src/locales/zh-cn.json
+++ b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3461,5 +3461,6 @@
     "内置策略为平台预设的审批规则，不可修改。根据业务需求，您可对全部或部分集群应用免审批策略。": "内置策略为平台预设的审批规则，不可修改。根据业务需求，您可对全部或部分集群应用免审批策略。",
     "% 或 ? 不允许单独使用": "% 或 ? 不允许单独使用",
     "不允许为 *": "不允许为 *",
+    "RedisCluster集群": "RedisCluster 集群",
     "这行勿动！新增翻译请在上一行添加！": ""
 }
diff --git a/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/RenderTargetClusterType.vue b/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/RenderTargetClusterType.vue
index 68e8f7eaac..3e1179615a 100644
--- a/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/RenderTargetClusterType.vue
+++ b/dbm-ui/frontend/src/views/redis/cluster-type-update/pages/page1/components/RenderTargetClusterType.vue
@@ -62,15 +62,19 @@
   const selectList = [
     {
       value: ClusterTypes.TWEMPROXY_REDIS_INSTANCE,
-      label: t('TendisCache'),
+      label: 'TendisCache',
     },
     {
       value: ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE,
-      label: t('TendisSSD'),
+      label: 'TendisSSD',
     },
     {
       value: ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER,
-      label: t('Tendisplus'),
+      label: 'Tendisplus',
+    },
+    {
+      value: ClusterTypes.PREDIXY_REDIS_CLUSTER,
+      label: t('RedisCluster集群'),
     },
   ];
 

From 0dd21f763b69773af441f13371f6dc8530cb3931 Mon Sep 17 00:00:00 2001
From: Austin <1344583166@qq.com>
Date: Tue, 3 Sep 2024 10:22:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(frontend):=20po=E7=8E=AF=E5=A2=83sql?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=9C=89=E5=85=B3=E7=9A=84=E9=9D=9E=E6=B3=95?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B0=E5=A2=9E=E5=BC=80=E5=85=B3=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20#6625?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/src/App.vue                   |   7 +-
 .../views/mysql/common/hooks/useTaskCount.ts  |  28 ++--
 .../mysql/ha-cluster-list/components/List.vue |   2 +-
 .../redis/list/components/list/Index.vue      |  26 ++--
 .../toolbox-side/components/MenuGroup.vue     |   5 -
 .../toolbox-side/components/TaskCount.vue     | 133 ------------------
 .../list/components/list/Index.vue            |  26 ++--
 7 files changed, 44 insertions(+), 183 deletions(-)
 delete mode 100644 dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/TaskCount.vue

diff --git a/dbm-ui/frontend/src/App.vue b/dbm-ui/frontend/src/App.vue
index d5cbda6495..463954d91c 100644
--- a/dbm-ui/frontend/src/App.vue
+++ b/dbm-ui/frontend/src/App.vue
@@ -64,7 +64,7 @@
 
   import { useSQLTaskNotify } from '@hooks';
 
-  import { useFunController, useUserProfile } from '@stores';
+  import { useUserProfile } from '@stores';
 
   import DbRouterView from '@components/db-router-view/Index.vue';
   import LocaleSwitch from '@components/locale-switch/Index.vue';
@@ -72,6 +72,8 @@
   import SystemSearch from '@components/system-search/Index.vue';
   import SystemVersionLog from '@components/system-version-log/Index.vue';
 
+  import { checkDbConsole } from '@utils';
+
   import NoticeComponent from '@blueking/notice-component';
 
   import Layout from './layout/Index.vue';
@@ -81,7 +83,6 @@
   const userProfileStore = useUserProfile();
   userProfileStore.fetchProfile();
   const { t, locale } = useI18n();
-  const { funControllerData } = useFunController();
 
   const documentTitles: Record<string, string> = {
     en: 'DBM | Tencent BlueKing',
@@ -123,7 +124,7 @@
   };
 
   onMounted(() => {
-    if (funControllerData.getFlatData('mysql').toolbox) {
+    if (checkDbConsole('mysql.toolbox.sqlExecute') || checkDbConsole('tendbCluster.toolbox.sqlExecute')) {
       useSQLTaskNotify();
     }
   });
diff --git a/dbm-ui/frontend/src/views/mysql/common/hooks/useTaskCount.ts b/dbm-ui/frontend/src/views/mysql/common/hooks/useTaskCount.ts
index 0f36dd9293..ffba1bf118 100644
--- a/dbm-ui/frontend/src/views/mysql/common/hooks/useTaskCount.ts
+++ b/dbm-ui/frontend/src/views/mysql/common/hooks/useTaskCount.ts
@@ -19,6 +19,8 @@ import { deleteUserSemanticTasks, getUserSemanticTasks } from '@services/source/
 
 import { useSQLTaskCount } from '@stores';
 
+import { checkDbConsole } from '@utils';
+
 import { useTimeoutPoll } from '@vueuse/core';
 
 export const useTaskCount = (clusterType: string) => {
@@ -60,19 +62,21 @@ export const useTaskCount = (clusterType: string) => {
   };
 
   const fetchData = () => {
-    getUserSemanticTasks({
-      cluster_type: clusterType,
-    }).then((data) => {
-      if (taskCountStore.isPolling === false) {
-        resume();
-        taskCountStore.isPolling = true;
-      }
-
-      taskCountStore.taskList = data;
-      nextTick(() => {
-        initPopover();
+    if (checkDbConsole('mysql.toolbox.sqlExecute') || checkDbConsole('tendbCluster.toolbox.sqlExecute')) {
+      getUserSemanticTasks({
+        cluster_type: clusterType,
+      }).then((data) => {
+        if (taskCountStore.isPolling === false) {
+          resume();
+          taskCountStore.isPolling = true;
+        }
+
+        taskCountStore.taskList = data;
+        nextTick(() => {
+          initPopover();
+        });
       });
-    });
+    }
   };
 
   fetchData();
diff --git a/dbm-ui/frontend/src/views/mysql/ha-cluster-list/components/List.vue b/dbm-ui/frontend/src/views/mysql/ha-cluster-list/components/List.vue
index 4eab1fbb51..011c252cdb 100644
--- a/dbm-ui/frontend/src/views/mysql/ha-cluster-list/components/List.vue
+++ b/dbm-ui/frontend/src/views/mysql/ha-cluster-list/components/List.vue
@@ -766,7 +766,7 @@
             action-id="mysql_webconsole"
             resource={data.id}
             permission={data.permission.mysql_webconsole}
-            disabled={data.operationDisabled}
+            disabled={data.isOffline}
             text
             theme="primary"
             class="mr-8"
diff --git a/dbm-ui/frontend/src/views/redis/list/components/list/Index.vue b/dbm-ui/frontend/src/views/redis/list/components/list/Index.vue
index 0b45632945..c72f303bd4 100644
--- a/dbm-ui/frontend/src/views/redis/list/components/list/Index.vue
+++ b/dbm-ui/frontend/src/views/redis/list/components/list/Index.vue
@@ -858,21 +858,17 @@
       render: ({ data }: ColumnRenderData) => {
         const getOperations = (theme = 'primary') => {
           const baseOperations = [
-            <OperationBtnStatusTips
-              v-db-console="redis.clusterManage.webconsole"
-              data={data}>
-              <auth-button
-                action-id="redis_webconsole"
-                resource={data.id}
-                permission={data.permission.redis_webconsole}
-                disabled={data.operationDisabled}
-                text
-                theme="primary"
-                class="mr-8"
-                onClick={() => handleGoWebconsole(data.id)}>
-                Webconsole
-              </auth-button>
-            </OperationBtnStatusTips>,
+            <auth-button
+              action-id="redis_webconsole"
+              resource={data.id}
+              permission={data.permission.redis_webconsole}
+              disabled={data.isOffline}
+              text
+              theme="primary"
+              class="mr-8"
+              onClick={() => handleGoWebconsole(data.id)}>
+              Webconsole
+            </auth-button>,
             <OperationBtnStatusTips
               v-db-console="redis.clusterManage.backup"
               data={data}
diff --git a/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/MenuGroup.vue b/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/MenuGroup.vue
index 7659f8763a..0386e4ca62 100644
--- a/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/MenuGroup.vue
+++ b/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/MenuGroup.vue
@@ -38,9 +38,6 @@
                 class="text-overflow">
                 {{ item.name }}
               </span>
-              <TaskCount
-                v-if="item.id === 'MySQLExecute'"
-                class="count" />
             </div>
             <DbIcon
               v-bk-tooltips="favorMap[item.id] ? t('从导航移除') : t('收藏至导航')"
@@ -68,8 +65,6 @@
 
   import { encodeRegexp, messageSuccess } from '@utils';
 
-  import TaskCount from './TaskCount.vue';
-
   interface Props {
     id: string;
     draggable: boolean;
diff --git a/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/TaskCount.vue b/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/TaskCount.vue
deleted file mode 100644
index 279d872ea7..0000000000
--- a/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/components/TaskCount.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
- * TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
- *
- * Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License athttps://opensource.org/licenses/MIT
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- * the specific language governing permissions and limitations under the License.
--->
-
-<template>
-  <div v-show="taskCount > 0">
-    <div
-      ref="rootRef"
-      class="task-count">
-      <DbStatus theme="loading" />
-      <strong>{{ taskCount }}</strong>
-    </div>
-    <div
-      ref="popRef"
-      class="sql-execute-task-popover-list">
-      <div
-        v-for="item in taskList"
-        :key="item.root_id"
-        class="task-item">
-        <div>
-          <DbIcon
-            v-if="item.isPending"
-            type="loading" />
-          <DbIcon
-            v-else-if="item.isSucceeded"
-            style="color: #2dcb56"
-            type="check-circle-fill" />
-          <DbIcon
-            v-else
-            style="color: #ea3636"
-            type="delete-fill" />
-        </div>
-        <div class="task-create-time">
-          {{ item.created_at }}
-        </div>
-        <div class="task-create-action">
-          <BkPopover>
-            <DbIcon
-              type="delete"
-              @click="handleRevokeTask(item)" />
-            <template #content>
-              <span>{{ $t('移除') }}</span>
-            </template>
-          </BkPopover>
-          <BkPopover>
-            <DbIcon
-              class="ml8"
-              type="link"
-              @click="handleGoTaskLog(item)" />
-            <template #content>
-              <span>{{ $t('执行日志') }}</span>
-            </template>
-          </BkPopover>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { useTaskCount } from '@hooks';
-
-  import DbStatus from '@components/db-status/index.vue';
-
-  const { rootRef, popRef, taskList, taskCount, handleRevokeTask, handleGoTaskLog } = useTaskCount('mysql');
-</script>
-<style lang="less" scoped>
-  .task-count {
-    height: 16px;
-    padding-right: 8px;
-    padding-left: 4px;
-    margin-left: 4px;
-    font-size: 12px;
-    line-height: 16px;
-    color: @primary-color;
-    background-color: white;
-    border-radius: 20px;
-
-    :deep(.bk-loading-size-mini) {
-      margin-right: 0;
-    }
-
-    :deep(.db-status) {
-      margin-top: -2px;
-      transform: scale(0.6);
-    }
-  }
-
-  .sql-execute-task-popover-list {
-    max-height: 280px;
-    padding: 12px 16px 12px 12px;
-    margin: -5px -9px;
-    overflow: auto;
-    font-size: 12px;
-    line-height: 24px;
-    color: #63656e;
-
-    .task-item {
-      display: flex;
-      align-items: center;
-      height: 24px;
-
-      &:hover {
-        color: #3a84ff;
-      }
-    }
-
-    .task-create-time {
-      padding-right: 16px;
-      padding-left: 8px;
-    }
-
-    .task-create-action {
-      display: flex;
-      font-size: 12px;
-      color: #3a84ff;
-      align-items: center;
-
-      & > * {
-        cursor: pointer;
-      }
-    }
-  }
-</style>
diff --git a/dbm-ui/frontend/src/views/spider-manage/list/components/list/Index.vue b/dbm-ui/frontend/src/views/spider-manage/list/components/list/Index.vue
index fbab2b6806..2eac6e2bb4 100644
--- a/dbm-ui/frontend/src/views/spider-manage/list/components/list/Index.vue
+++ b/dbm-ui/frontend/src/views/spider-manage/list/components/list/Index.vue
@@ -903,20 +903,18 @@
               onClick={() => handleShowAuthorize([data])}>
               { t('授权') }
             </bk-button>,
-            <OperationBtnStatusTips data={data}>
-              <auth-button
-                v-db-console="tendbCluster.clusterManage.webconsole"
-                action-id="tendbcluster_webconsole"
-                resource={data.id}
-                permission={data.permission.tendbcluster_webconsole}
-                disabled={data.operationDisabled}
-                text
-                theme="primary"
-                class="mr-8"
-                onClick={() => handleGoWebconsole(data.id)}>
-                Webconsole
-              </auth-button>
-            </OperationBtnStatusTips>,
+            <auth-button
+              v-db-console="tendbCluster.clusterManage.webconsole"
+              action-id="tendbcluster_webconsole"
+              resource={data.id}
+              permission={data.permission.tendbcluster_webconsole}
+              disabled={data.isOffline}
+              text
+              theme="primary"
+              class="mr-8"
+              onClick={() => handleGoWebconsole(data.id)}>
+              Webconsole
+            </auth-button>,
             <OperationBtnStatusTips
               data={data}
               v-db-console="tendbCluster.clusterManage.exportData">