fix(frontend): 集群授权bug修复 TencentBlueKing#7703

# Reviewed, transaction id: 22890
hLinx · Nov 6, 2024 · 346cd11 · 346cd11
1 parent 6bfeab5
commit 346cd11
Show file tree

Hide file tree

Showing 24 changed files with 376 additions and 438 deletions.
diff --git a/dbm-ui/frontend/src/components/ip-selector/IpSelector.vue b/dbm-ui/frontend/src/components/ip-selector/IpSelector.vue
@@ -152,6 +152,7 @@
     cloudInfo?: { id?: number | string; name?: string };
     disableDialogSubmitMethod?: (hostList: Array<any>) => string | boolean;
     disableHostMethod?: (...args: any) => string | boolean;
+    onlyAliveHost?: boolean;
     serviceMode?: 'all' | 'idle_only';
     panelList?: Array<'staticTopo' | 'manualInput' | 'dbmWhitelist'>;
     disableTips?: string;
@@ -178,6 +179,7 @@
     cloudInfo: () => ({}),
     disableDialogSubmitMethod: () => false,
     disableHostMethod: () => false,
+    onlyAliveHost: true,
     serviceMode: 'idle_only',
     panelList: () => ['staticTopo', 'manualInput'],
     disableTips: '',
@@ -283,7 +285,7 @@
   });
 
   const disableHostMethodHandler = (data: any, selected: any[]) => {
-    if (data.alive === 0) {
+    if (props.onlyAliveHost && data.alive !== 1) {
       return t('Agent异常无法使用');
     }
     if (props.osTypes.length > 0 && !props.osTypes.includes(Number(data.os_type))) {

diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql.ts
@@ -28,12 +28,9 @@ export interface MysqlIpItem extends DetailBase {
 export interface MysqlAuthorizationDetails extends DetailBase {
   authorize_uid: string;
   authorize_data: AuthorizePreCheckData;
+  // 批量导入
   excel_url: string;
-  authorize_plugin_infos: Array<
-    AuthorizePreCheckData & {
-      bk_biz_id: number;
-    }
-  >;
+  authorize_data_list: AuthorizePreCheckData[];
 }
 
 export interface MySQLForceImportSQLFileExecuteSqlFiles {

diff --git a/dbm-ui/frontend/src/services/types/permission.ts b/dbm-ui/frontend/src/services/types/permission.ts
@@ -139,10 +139,12 @@ export type AccountRulePrivilegeKey = keyof AccountRulePrivilege;
  */
 export interface AuthorizePreCheckData {
   access_dbs: string[];
-  source_ips?: {
-    bk_host_id?: number;
-    ip: string;
-  }[];
+  source_ips?:
+    | {
+        bk_host_id?: number;
+        ip: string;
+      }[]
+    | string[];
   target_instances: string[];
   user: string;
   cluster_type: string;

diff --git a/dbm-ui/frontend/src/views/db-manage/common/ExcelAuthorize.vue b/dbm-ui/frontend/src/views/db-manage/common/ExcelAuthorize.vue
@@ -18,7 +18,8 @@
     :is-show="isShow"
     :quick-close="false"
     :title="t('导入授权')"
-    :width="600">
+    :width="600"
+    @closed="handleCloseUpload">
     <div class="excel-authorize">
       <BkAlert
         class="mb-12"

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/Index.vue
@@ -61,10 +61,11 @@
     selected?: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
-    clusterTypes?: ClusterTypes[];
+    clusterTypes?: string[];
     rules?: PermissionRule['rules'];
   }
 

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/RulesPreview.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/RulesPreview.vue
@@ -54,12 +54,29 @@
           </div>
         </template>
       </BkTableColumn>
+      <BkTableColumn
+        :label="t('集群域名')"
+        :width="250">
+        <template #default="{ data }: { data: IDataRow }">
+          <div class="cell-cluster">
+            <p
+              v-for="(item, index) in data.clusterDomains"
+              :key="index">
+              {{ item }}
+              <DbIcon
+                v-if="index === 0"
+                type="copy"
+                @click="handleCopyDomains" />
+            </p>
+          </div>
+        </template>
+      </BkTableColumn>
       <BkTableColumn
         :label="t('账号')"
         prop="account"
         :width="150" />
       <BkTableColumn
-        :label="t('访问的DB')"
+        :label="t('访问DB')"
         :width="150">
         <template #default="{ data }: { data: IDataRow }">
           <div>
@@ -86,23 +103,6 @@
           </div>
         </template>
       </BkTableColumn>
-      <BkTableColumn
-        :label="t('集群域名')"
-        :width="250">
-        <template #default="{ data }: { data: IDataRow }">
-          <div class="cell-cluster">
-            <p
-              v-for="(item, index) in data.clusterDomains"
-              :key="index">
-              {{ item }}
-              <DbIcon
-                v-if="index === 0"
-                type="copy"
-                @click="handleCopyDomains" />
-            </p>
-          </div>
-        </template>
-      </BkTableColumn>
       <BkTableColumn
         :label="t('权限')"
         :width="350">

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/SourceIps.vue
@@ -10,6 +10,7 @@
       button-text="添加 IP"
       :data="selected"
       :is-cloud-area-restrictions="false"
+      :only-alive-host="false"
       :panel-list="['staticTopo', 'manualInput', 'dbmWhitelist']"
       service-mode="all"
       @change="handleChangeIP"

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/components/TargetInstances.vue
@@ -49,10 +49,11 @@
 
   interface Props {
     accountType: AccountTypes;
-    clusterTypes: ClusterTypes[];
+    clusterTypes: string[];
     data: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
@@ -239,11 +240,18 @@
   });
 
   watch(
-    () => [props.clusterTypes, props.data],
+    () => props.data,
     () => {
-      [state.clusterType] = props.clusterTypes;
-      updateTableData(props.data);
+      if (props.data.length > 0) {
+        state.clusterType = props.data[0].cluster_type;
+        nextTick(() => {
+          updateTableData(props.data);
+        })
+      }
     },
+    {
+      immediate: true,
+    }
   );
 
   const handleShowTargetCluster = () => {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Mongo.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Mongo.vue
@@ -30,10 +30,11 @@
     selected?: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
-    clusterTypes?: ClusterTypes[];
+    clusterTypes?: string[];
     rules?: PermissionRule['rules'];
   }
 

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Mysql.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Mysql.vue
@@ -36,10 +36,11 @@
     selected: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
-    clusterTypes: ClusterTypes[];
+    clusterTypes: string[];
   }
 
   interface Exposes {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Sqlserver.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Sqlserver.vue
@@ -30,10 +30,11 @@
     selected?: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
-    clusterTypes?: ClusterTypes[];
+    clusterTypes?: string[];
     rules?: PermissionRule['rules'];
   }
 

diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Tendbcluster.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-authorize/db-form/Tendbcluster.vue
@@ -36,10 +36,11 @@
     selected: {
       master_domain: string;
       cluster_name: string;
+      cluster_type: ClusterTypes;
       db_module_name?: string;
       isMaster?: boolean;
     }[];
-    clusterTypes: ClusterTypes[];
+    clusterTypes: string[];
   }
 
   interface Exposes {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/permission/Index.vue
@@ -135,7 +135,7 @@
     },
     [AccountTypes.TENDBCLUSTER]: {
       ticketType: TicketTypes.TENDBCLUSTER_AUTHORIZE_RULES,
-      clusterTypes: [ClusterTypes.TENDBCLUSTER],
+      clusterTypes: [ClusterTypes.TENDBCLUSTER, 'tendbclusterSlave'],
       dbOperations: mysqlDbOperations[AccountTypes.TENDBCLUSTER].dbOperations,
       dataSource: getMysqlPermissionRules,
       deleteAccount: deleteMysqlAccount,

diff --git a/dbm-ui/frontend/src/views/db-manage/common/permission/components/mysql/create-rule/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/permission/components/mysql/create-rule/Index.vue
@@ -184,33 +184,6 @@
     }
   })
 
-  /**
-   * 创建时检验是否已存在规则
-   */
-  const { run: preCheckAddAccountRuleRun } = useRequest(preCheckAddAccountRule, {
-    manual: true,
-    onSuccess: async ({ warning }) => {
-      if (warning) {
-        precheckWarnTip.value = (
-          <div class="pre-check-content">
-            {warning.split('\n').map(line => <div>{line}</div>)}
-          </div>
-        );
-        showPopConfirm.value = true;
-        return;
-      }
-      const params = await generateRequestParam();
-      createAccountRuleRun(params);
-    },
-    onError() {
-      messageError(t('提交失败'));
-    },
-    onAfter() {
-      isSubmitting.value = false;
-      handleClose();
-    }
-  });
-
   /**
    * 规则变更（有权限被删除）时走单据
    */
@@ -317,7 +290,22 @@
         });
       }
     } else {
-      preCheckAddAccountRuleRun(params)
+      preCheckAddAccountRule(params)
+        .then((result) => {
+          if (result.warning) {
+            precheckWarnTip.value = (
+              <div class="pre-check-content">
+                {result.warning.split('\n').map(line => <div>{line}</div>)}
+              </div>
+            );
+            showPopConfirm.value = true;
+            return;
+          }
+          createAccountRuleRun(params);
+        })
+        .finally(() => {
+          isSubmitting.value = false;
+        });
     }
   };
 </script>

diff --git a/...ui/frontend/src/views/db-manage/mysql/openarea/create/components/target-cluster/Index.vue b/...ui/frontend/src/views/db-manage/mysql/openarea/create/components/target-cluster/Index.vue
@@ -40,7 +40,7 @@
       :biz-id="currentBizId"
       button-text=""
       :data="localHostList"
-      :os-types="[OSTypes.Linux]"
+      :only-alive-host="false"
       :panel-list="['staticTopo', 'dbmWhitelist', 'manualInput']"
       service-mode="all"
       :show-view="false"
@@ -55,7 +55,7 @@
   import TendbhaModel from '@services/model/mysql/tendbha';
   import type { HostInfo } from '@services/types/ip';
 
-  import { ClusterTypes, OSTypes } from '@common/const';
+  import { ClusterTypes } from '@common/const';
 
   import ClusterSelector from '@components/cluster-selector/Index.vue';
   import IpSelector, { type IPSelectorResult } from '@components/ip-selector/IpSelector.vue';

diff --git a/...views/db-manage/mysql/openarea/create/components/target-cluster/components/ColumnHost.vue b/...views/db-manage/mysql/openarea/create/components/target-cluster/components/ColumnHost.vue
@@ -83,7 +83,7 @@
       name: clusterData.bk_cloud_name,
     }"
     :data="localHostList"
-    :os-types="[OSTypes.Linux]"
+    :only-alive-host="false"
     :panel-list="['staticTopo', 'dbmWhitelist', 'manualInput']"
     service-mode="all"
     :show-view="false"
@@ -95,9 +95,7 @@
   import { useI18n } from 'vue-i18n';
 
   import { checkHost } from '@services/source/ipchooser';
-  import type { HostInfo } from '@services/types/ip';
-
-  import { OSTypes } from '@common/const';
+  import type { HostInfo } from '@services/types';
 
   import IpSelector, { type IPSelectorResult } from '@components/ip-selector/IpSelector.vue';
   import RenderHost from '@components/render-table/columns/select-disable/index.vue';

diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/privilege-clone-client/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/privilege-clone-client/pages/page1/Index.vue
@@ -46,7 +46,7 @@
         :biz-id="currentBizId"
         button-text=""
         :data="selectedIps"
-        :os-types="[OSTypes.Linux]"
+        :only-alive-host="false"
         service-mode="all"
         :show-view="false"
         @change="handleHostChange" />
@@ -84,7 +84,7 @@
 
   import { useGlobalBizs } from '@stores';
 
-  import { OSTypes, TicketTypes } from '@common/const';
+  import { TicketTypes } from '@common/const';
 
   import IpSelector from '@components/ip-selector/IpSelector.vue';
   import TicketRemark from '@components/ticket-remark/Index.vue';

diff --git a/...ws/db-manage/tendb-cluster/master-slave-clone/pages/page1/components/RenderNewInstace.vue b/...ws/db-manage/tendb-cluster/master-slave-clone/pages/page1/components/RenderNewInstace.vue
@@ -132,7 +132,7 @@
   import { useI18n } from 'vue-i18n';
 
   import { checkHost, getHostTopoInfos } from '@services/source/ipchooser';
-  import type { HostInfo } from '@services/types/ip';
+  import type { HostInfo } from '@services/types';
 
   import { useGlobalBizs } from '@stores';
 

diff --git a/...end/src/views/db-manage/tendb-cluster/openarea-create/components/target-cluster/Index.vue b/...end/src/views/db-manage/tendb-cluster/openarea-create/components/target-cluster/Index.vue
@@ -40,7 +40,7 @@
       :biz-id="currentBizId"
       button-text=""
       :data="localHostList"
-      :os-types="[OSTypes.Linux]"
+      :only-alive-host="false"
       :panel-list="['staticTopo', 'dbmWhitelist', 'manualInput']"
       service-mode="all"
       :show-view="false"
@@ -56,7 +56,7 @@
   import TendbClusterModel from '@services/model/tendbcluster/tendbcluster';
   import type { HostInfo } from '@services/types';
 
-  import { ClusterTypes, OSTypes } from '@common/const';
+  import { ClusterTypes } from '@common/const';
 
   import ClusterSelector from '@components/cluster-selector/Index.vue';
   import IpSelector, { type IPSelectorResult } from '@components/ip-selector/IpSelector.vue';

diff --git a/...-manage/tendb-cluster/openarea-create/components/target-cluster/components/ColumnHost.vue b/...-manage/tendb-cluster/openarea-create/components/target-cluster/components/ColumnHost.vue
@@ -83,7 +83,7 @@
       name: clusterData.bk_cloud_name,
     }"
     :data="localHostList"
-    :os-types="[OSTypes.Linux]"
+    :only-alive-host="false"
     :panel-list="['staticTopo', 'dbmWhitelist', 'manualInput']"
     service-mode="all"
     :show-view="false"
@@ -94,9 +94,7 @@
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
 
-  import type { HostInfo } from '@services/types/ip';
-
-  import { OSTypes } from '@common/const';
+  import type { HostInfo } from '@services/types';
 
   import IpSelector, { type IPSelectorResult } from '@components/ip-selector/IpSelector.vue';
   import RenderHost from '@components/render-table/columns/select-disable/index.vue';