fix(backend): 权限体验问题修复 #3605

TencentBlueKing · Apr 10, 2024 · c8cc9f0 · c8cc9f0
1 parent 66fb5f1
commit c8cc9f0
Show file tree

Hide file tree

Showing 46 changed files with 916 additions and 715 deletions.
diff --git a/dbm-ui/frontend/src/components/apply-items/BusinessItems.vue b/dbm-ui/frontend/src/components/apply-items/BusinessItems.vue
@@ -16,39 +16,41 @@
     :label="t('所属业务')"
     property="bk_biz_id"
     required>
-    <AppSelect
-      :data="withFavorBizList"
-      :generate-key="(item: IAppItem) => item.bk_biz_id"
-      :generate-name="(item: IAppItem) => item.display_name"
-      style="width: 435px"
-      :value="currentBiz"
-      @change="handleAppChange">
-      <template #default="{ data }">
-        <AuthTemplate
-          :action-id="perrmisionActionId"
-          :biz-id="data.bk_biz_id"
-          :permission="data.permission.db_manage"
-          :resource="data.bk_biz_id"
-          style="width: 100%">
-          <div class="db-app-select-item">
-            <div>{{ data.name }} (#{{ data.bk_biz_id }})</div>
-            <div style="margin-left: auto">
-              <DbIcon
-                v-if="favorBizIdMap[data.bk_biz_id]"
-                class="unfavor-btn"
-                style="color: #ffb848"
-                type="star-fill"
-                @click.stop="handleUnfavor(data.bk_biz_id)" />
-              <DbIcon
-                v-else
-                class="favor-btn"
-                type="star"
-                @click.stop="handleFavor(data.bk_biz_id)" />
+    <BkLoading :loading="isBizLoading">
+      <AppSelect
+        :data="withFavorBizList"
+        :generate-key="(item: IAppItem) => item.bk_biz_id"
+        :generate-name="(item: IAppItem) => item.display_name"
+        style="width: 435px"
+        :value="currentBiz"
+        @change="handleAppChange">
+        <template #default="{ data }">
+          <AuthTemplate
+            :action-id="perrmisionActionId"
+            :biz-id="data.bk_biz_id"
+            :permission="data.permission[perrmisionActionId]"
+            :resource="data.bk_biz_id"
+            style="width: 100%">
+            <div class="db-app-select-item">
+              <div>{{ data.name }} (#{{ data.bk_biz_id }})</div>
+              <div style="margin-left: auto">
+                <DbIcon
+                  v-if="favorBizIdMap[data.bk_biz_id]"
+                  class="unfavor-btn"
+                  style="color: #ffb848"
+                  type="star-fill"
+                  @click.stop="handleUnfavor(data.bk_biz_id)" />
+                <DbIcon
+                  v-else
+                  class="favor-btn"
+                  type="star"
+                  @click.stop="handleFavor(data.bk_biz_id)" />
+              </div>
             </div>
-          </div>
-        </AuthTemplate>
-      </template>
-    </AppSelect>
+          </AuthTemplate>
+        </template>
+      </AppSelect>
+    </BkLoading>
   </BkFormItem>
   <BkFormItem
     ref="appAbbrRef"
@@ -74,12 +76,13 @@
 <script setup lang="ts">
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
+  import { useRequest } from 'vue-request';
   import { useRoute } from 'vue-router';
 
   import { getBizs } from '@services/source/cmdb';
   import type { BizItem } from '@services/types';
 
-  import { useGlobalBizs, useUserProfile } from '@stores';
+  import { useUserProfile } from '@stores';
 
   import { UserPersonalSettings } from '@common/const';
   import { nameRegx } from '@common/regex';
@@ -94,7 +97,7 @@
     perrmisionActionId: string;
   }
 
-  defineProps<Props>();
+  const props = defineProps<Props>();
 
   const emits = defineEmits<Emits>();
 
@@ -113,14 +116,15 @@
   const { t } = useI18n();
 
   const route = useRoute();
-  const { bizs: bizList } = useGlobalBizs();
   const userProfile = useUserProfile();
 
+  const bizList = shallowRef<IAppItem[]>([]);
   const currentBiz = shallowRef<IAppItem>();
   const favorBizIdMap = shallowRef(makeMap(userProfile.profile[UserPersonalSettings.APP_FAVOR] || []));
   const hasEnglishName = ref(false);
+  const appAbbrRef = ref();
 
-  const withFavorBizList = computed(() => _.sortBy(bizList, (item) => favorBizIdMap.value[item.bk_biz_id]));
+  const withFavorBizList = computed(() => _.sortBy(bizList.value, (item) => favorBizIdMap.value[item.bk_biz_id]));
 
   const dbAppAbbrPlaceholder = t('以小写英文字母开头_且只能包含英文字母_数字_连字符');
 
@@ -142,7 +146,16 @@
     },
   ];
 
-  const appAbbrRef = ref();
+  const { loading: isBizLoading } = useRequest(getBizs, {
+    defaultParams: [
+      {
+        action: props.perrmisionActionId,
+      },
+    ],
+    onSuccess(result) {
+      bizList.value = result;
+    },
+  });
 
   watch(
     route,
@@ -160,7 +173,7 @@
   watch(
     bizId,
     () => {
-      currentBiz.value = _.find(bizList, (item) => item.bk_biz_id === bizId.value);
+      currentBiz.value = _.find(bizList.value, (item) => item.bk_biz_id === bizId.value);
       const englishName = currentBiz.value?.english_name;
       hasEnglishName.value = !!englishName;
       appAbbr.value = englishName ?? '';

diff --git a/dbm-ui/frontend/src/components/apply-permission/render-result.vue b/dbm-ui/frontend/src/components/apply-permission/render-result.vue
@@ -25,8 +25,8 @@
       <table>
         <thead>
           <tr>
-            <th>{{ t('系统') }}</th>
-            <th>{{ t('需要申请的权限') }}</th>
+            <th style="min-width: 120px">{{ t('系统') }}</th>
+            <th style="min-width: 150px">{{ t('需要申请的权限') }}</th>
             <th>{{ t('关联的资源实例') }}</th>
           </tr>
         </thead>
@@ -41,7 +41,7 @@
                 <p
                   v-for="(resourceItem, rindex) in permissionItem.relatedResources"
                   :key="rindex">
-                  {{ resourceItem.type }}-{{ resourceItem.instances.join('，') }}
+                  {{ resourceItem.type }}:{{ resourceItem.instances.join('，') }}
                 </p>
                 <p v-if="permissionItem.relatedResources.length < 1">--</p>
               </td>

diff --git a/dbm-ui/frontend/src/components/auth-component/button.vue b/dbm-ui/frontend/src/components/auth-component/button.vue
@@ -4,19 +4,16 @@
     v-bind="attrs">
     <slot />
   </BkButton>
-  <span
+  <BkButton
     v-else
-    disabled>
-    <BkButton
-      v-cursor
-      class="auth-button-disable"
-      v-bind="inheritAttrs"
-      :disabled="false"
-      :loading="loading"
-      @click.stop="handleRequestPermission">
-      <slot />
-    </BkButton>
-  </span>
+    v-cursor
+    class="auth-button-disable"
+    v-bind="inheritAttrs"
+    :disabled="false"
+    :loading="loading"
+    @click.stop="handleRequestPermission">
+    <slot />
+  </BkButton>
 </template>
 <script setup lang="ts">
   import { useAttrs } from 'vue';
@@ -38,6 +35,7 @@
     resource: '',
     bizId: undefined,
   });
+
   defineOptions({
     inheritAttrs: false,
   });
@@ -63,7 +61,7 @@
       background-color: transparent !important;
       border-color: transparent !important;
 
-      .bk-button-text {
+      * {
         color: #c4c6cc !important;
       }
     }

diff --git a/dbm-ui/frontend/src/layout/Index.vue b/dbm-ui/frontend/src/layout/Index.vue
@@ -135,7 +135,7 @@
       'PlatformDbConfigure',
       'PlatformWhitelist',
       'PlatGlobalStrategy',
-      'PlatRotateSet',
+      'dutyRuleManange',
       // 'PlatMonitorAlarmGroup',
       'passwordManage',
       'PlatformTicketFlowSetting',

diff --git a/dbm-ui/frontend/src/layout/components/PlatformManage.vue b/dbm-ui/frontend/src/layout/components/PlatformManage.vue
@@ -69,7 +69,7 @@
             <FunController
               controller-id="duty_rule"
               module-id="monitor">
-              <BkMenuItem key="PlatRotateSet">
+              <BkMenuItem key="dutyRuleManange">
                 <template #icon>
                   <DbIcon type="db-config" />
                 </template>

diff --git a/dbm-ui/frontend/src/router/index.ts b/dbm-ui/frontend/src/router/index.ts
@@ -34,6 +34,7 @@ import {
 import BizPermission from '@views/BizPermission.vue';
 import getDbConfRoutes from '@views/db-configure/routes';
 import getDbhaSwitchEventsRouters from '@views/dbha-switch-events/routes';
+import getDutyRuleManageRoutes from '@views/duty-rule-manage/routes'
 import getESRoutes from '@views/es-manage/routes';
 import getHDFSRoutes from '@views/hdfs-manage/routes';
 import getInfluxDBRoutes from '@views/influxdb-manage/routes';
@@ -131,6 +132,7 @@ export default () => {
         ...getServiceApplyRoutes(),
         ...getQuickSearchRoutes(),
         ...getTicketsRoutes(),
+        ...getDutyRuleManageRoutes()
       ],
     },
     {

diff --git a/dbm-ui/frontend/src/services/model/es/es.ts b/dbm-ui/frontend/src/services/model/es/es.ts
@@ -107,14 +107,14 @@ export default class Es {
     title: string;
   }>;
   permission: {
-    es_view: boolean;
-    es_enable_disable: boolean;
+    access_entry_edit: boolean;
     es_destroy: boolean;
+    es_enable_disable: boolean;
+    es_reboot: boolean;
+    es_replace: boolean;
     es_scale_up: boolean;
     es_shrink: boolean;
-    es_replace: boolean;
-    es_reboot: boolean;
-    access_entry_edit: boolean;
+    es_view: boolean;
   };
   phase: 'online' | 'offline';
   region: string;

diff --git a/dbm-ui/frontend/src/services/model/function-controller/functionController.ts b/dbm-ui/frontend/src/services/model/function-controller/functionController.ts
@@ -80,7 +80,7 @@ export default class FunctionController {
     const item = this[key] as ControllerItem<T>;
 
     if (!item) {
-      return {};
+      return {} as Record<T | K, boolean>;
     }
 
     const flatData = {

diff --git a/dbm-ui/frontend/src/services/model/monitor/duty-rule.ts b/dbm-ui/frontend/src/services/model/monitor/duty-rule.ts
@@ -41,6 +41,11 @@ export default class DutyRule {
   is_enabled: boolean;
   is_show_edit: boolean;
   name: string;
+  permission: {
+    duty_rule_create: boolean;
+    duty_rule_destroy: boolean;
+    duty_rule_update: boolean;
+  };
   priority: number;
   status: string;
   updater: string;
@@ -58,6 +63,7 @@ export default class DutyRule {
     this.is_show_edit = false;
     this.end_time = payload.end_time;
     this.name = payload.name;
+    this.permission = payload.permission;
     this.priority = payload.priority;
     this.updater = payload.updater;
     this.update_at = payload.update_at;

diff --git a/dbm-ui/frontend/src/services/model/mysql/tendbha.ts b/dbm-ui/frontend/src/services/model/mysql/tendbha.ts
@@ -77,11 +77,10 @@ export default class Tendbha {
     title: string;
   }>;
   permission: {
-    mysql_authorize_rules: boolean;
+    access_entry_edit: boolean;
     mysql_destroy: boolean;
     mysql_enable_disable: boolean;
     mysql_view: boolean;
-    access_entry_edit: boolean;
     tbinlogdumper_install: boolean;
   };
   phase: string;

diff --git a/dbm-ui/frontend/src/services/model/mysql/tendbsingle.ts b/dbm-ui/frontend/src/services/model/mysql/tendbsingle.ts
@@ -76,7 +76,6 @@ export default class Tendbsingle {
     title: string;
   }>;
   permission: {
-    mysql_authorize_rules: boolean;
     mysql_destroy: boolean;
     mysql_enable_disable: boolean;
     mysql_view: boolean;

diff --git a/dbm-ui/frontend/src/services/model/notice-group/notice-group.ts b/dbm-ui/frontend/src/services/model/notice-group/notice-group.ts
@@ -32,8 +32,6 @@ export default class NoticGroup {
   updater: string;
   used_count: number;
   permission: {
-    global_notify_group_create: boolean;
-    global_notify_group_delete: boolean;
     global_notify_group_update: boolean;
     notify_group_create: boolean;
     notify_group_delete: boolean;

diff --git a/dbm-ui/frontend/src/services/model/partition/partition.ts b/dbm-ui/frontend/src/services/model/partition/partition.ts
@@ -49,6 +49,7 @@ export default class Partition {
     mysql_partition_delete: boolean;
     mysql_partition_enable_disable: boolean;
     mysql_partition_update: boolean;
+    tendbcluster_partition: boolean;
     tendb_partition_enable_disable: boolean;
     tendbcluster_partition_create: boolean;
     tendbcluster_partition_delete: boolean;

diff --git a/dbm-ui/frontend/src/services/model/spider/tendbCluster.ts b/dbm-ui/frontend/src/services/model/spider/tendbCluster.ts
@@ -114,9 +114,14 @@ export default class TendbCluster {
     operationDisabled: boolean;
   }>;
   permission: {
-    tendbcluster_enable_disable: boolean;
     tendbcluster_destroy: boolean;
+    tendbcluster_enable_disable: boolean;
+    tendbcluster_node_rebalance: boolean;
+    tendbcluster_spider_add_nodes: boolean;
+    tendbcluster_spider_mnt_destroy: boolean;
+    tendbcluster_spider_reduce_nodes: boolean;
     tendbcluster_view: boolean;
+    tendb_spider_slave_destroy: boolean;
     access_entry_edit: boolean;
   };
   phase: 'online' | 'offline';

diff --git a/dbm-ui/frontend/src/services/permission.ts b/dbm-ui/frontend/src/services/permission.ts
@@ -27,7 +27,6 @@ import type {
   PermissionCloneRes,
   PermissionRule,
   PermissionRulesParams,
-  PermissionRulesResult,
 } from './types/permission';
 
 // 密码随机化周期
@@ -159,16 +158,34 @@ export const verifyPasswordStrength = (params: { password: string }) =>
 /**
  * 查询账号规则列表
  */
-export const getPermissionRules = (params: PermissionRulesParams) =>
+export const getPermissionRules = (params: PermissionRulesParams, payload = {} as IRequestPayload) =>
   http
-    .get<PermissionRulesResult>(`/apis/mysql/bizs/${params.bk_biz_id}/permission/account/list_account_rules/`, params)
-    .then((data) => ({
-      ...data,
-      results: data.results.map((item) => ({
-        ...item,
-        permission: data.permission || {},
-      })),
-    }));
+    .get<{
+      count: number;
+      results: {
+        account: {
+          account_id: number;
+          bk_biz_id: number;
+          create_time: string;
+          creator: string;
+          user: string;
+        };
+        permission: {
+          mysql_account_delete: boolean;
+          mysql_add_account_rule: boolean;
+        };
+        rules: {
+          access_db: string;
+          account_id: number;
+          bk_biz_id: number;
+          create_time: string;
+          creator: string;
+          privilege: string;
+          rule_id: number;
+        }[];
+      }[];
+    }>(`/apis/mysql/bizs/${params.bk_biz_id}/permission/account/list_account_rules/`, params, payload)
+    .then((data) => data);
 
 /**
  * 创建账户