fix(frontend): 临时密码修改实例选择时参数过滤错误 TencentBlueKing#6872

# Reviewed, transaction id: 18170
zfrendo · Sep 12, 2024 · c7c0266 · c7c0266
1 parent 90edeb8
commit c7c0266
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/dbm-ui/frontend/src/components/instance-selector/Index.vue b/dbm-ui/frontend/src/components/instance-selector/Index.vue
@@ -214,7 +214,7 @@
   import MysqlContent from './components/mysql/Index.vue';
   import RedisContent from './components/redis/Index.vue';
   import RenderRedisHost from './components/redis-host/Index.vue';
-  import SqlServerContent from './components/sql-server/Index.vue';
+  import SqlServerContent from './components/sqlserver/Index.vue';
   import TendbClusterContent from './components/tendb-cluster/Index.vue';
   import TendbClusterHostContent from './components/tendb-cluster-host/Index.vue';
 

diff --git a/...-selector/components/sql-server/Index.vue → ...e-selector/components/sqlserver/Index.vue b/...-selector/components/sql-server/Index.vue → ...e-selector/components/sqlserver/Index.vue
@@ -158,7 +158,6 @@
     },
   ) => {
     selectClusterId.value = node.obj === 'cluster' ? node.payload.id : 0;
-    console.log('selectClusterId.value = ', selectClusterId.value);
     const rawNode = treeRef.value.getData().data.find((item: { id: number }) => item.id === node.id);
     if (!isOpen && !isSelected) {
       treeRef.value.setNodeOpened(rawNode, true);

diff --git a/...tor/components/sql-server/table/Index.vue → ...ctor/components/sqlserver/table/Index.vue b/...tor/components/sql-server/table/Index.vue → ...ctor/components/sqlserver/table/Index.vue
@@ -305,11 +305,7 @@
   }, { immediate: true, deep: true });
 
   watch(() => props.clusterId, () => {
-      setTimeout(() => {
         fetchResources();
-      })
-  }, {
-    immediate: true,
   });
 
   const triggerChange = () => {

diff --git a/...mponents/sql-server/table/useTableData.ts → ...omponents/sqlserver/table/useTableData.ts b/...mponents/sql-server/table/useTableData.ts → ...omponents/sqlserver/table/useTableData.ts
diff --git a/...ctor/components/sql-server/useTopoData.ts → ...ector/components/sqlserver/useTopoData.ts b/...ctor/components/sql-server/useTopoData.ts → ...ector/components/sqlserver/useTopoData.ts
diff --git a/...frontend/src/views/temporary-paassword-modify/index/components/form-item/InstanceList.vue b/...frontend/src/views/temporary-paassword-modify/index/components/form-item/InstanceList.vue
@@ -49,6 +49,8 @@
   import SqlServerHaInstanceModel from '@services/model/sqlserver/sqlserver-ha-instance';
   import SqlServerSingleInstanceModel from '@services/model/sqlserver/sqlserver-single-instance';
   import { queryAdminPassword } from '@services/source/permission';
+  import { getSpiderInstanceList } from '@services/source/spider';
+  import { getTendbhaInstanceList } from '@services/source/tendbha';
 
   import { clusterTypeInfos,ClusterTypes } from '@common/const';
 
@@ -63,31 +65,39 @@
     `${instance.bk_cloud_id}:${instance.ip}:${instance.port}`;
 
   const tabListConfig = {
-    [ClusterTypes.TENDBCLUSTER]: [
+    [ClusterTypes.TENDBHA]: [
       {
-        name: 'TendbCluster',
+        id: 'tendbha',
+        name: t('Mysql 主从'),
         tableConfig: {
+          getTableList: (params: ServiceParameters<typeof getTendbhaInstanceList>) => getTendbhaInstanceList({
+            ...params,
+            role_exclude: 'proxy',
+          }),
           firsrColumn: {
-            label: 'instance_address',
+            label: t('实例'),
             field: 'instance_address',
             role: '',
           },
         },
-      },
+      }
     ],
-    [ClusterTypes.TENDBHA]: [
+    [ClusterTypes.TENDBCLUSTER]: [
       {
-        id: 'tendbha',
-        name: t('Mysql 主从'),
+        name: 'TendbCluster',
         tableConfig: {
+          getTableList: (params: ServiceParameters<typeof getSpiderInstanceList>) => getSpiderInstanceList({
+            ...params,
+            spider_ctl: true,
+          }),
           firsrColumn: {
             label: t('实例'),
             field: 'instance_address',
             role: '',
           },
         },
-      }
-    ]
+      },
+    ],
   } as unknown as Record<ClusterTypes, PanelListType>;