Merge pull request #2842 from lhzzforever/dev/develop_ci

feature: 管理空间角色选择器二级管理空间增加分页
TencentBlueKing · Jan 2, 2025 · ec19e6e · ec19e6e
2 parents ca425dc + 6adf189
commit ec19e6e
Show file tree

Hide file tree

Showing 24 changed files with 1,878 additions and 2,165 deletions.
diff --git a/frontend/src/common/constants.js b/frontend/src/common/constants.js
@@ -130,6 +130,7 @@ export const NEED_CONFIRM_DIALOG_ROUTER = [
   'permTemplateDiff',
   'createUserGroup',
   'gradingAdminCreate',
+  'gradingAdminClone',
   'gradingAdminEdit',
   'myManageSpaceCreate',
   'myManageSpaceClone',
@@ -186,7 +187,7 @@ export const ALL_ROUTES_LIST = new Map([
   // 我的管理空间
   [['myManageSpace', 'myManageSpaceCreate', 'myManageSpaceClone', 'myManageSpaceSubDetail'], 'myManageSpaceNav'],
   // 分级管理员
-  [['ratingManager', 'gradingAdminDetail', 'gradingAdminCreate', 'gradingAdminEdit'], 'gradingAdminNav'],
+  [['ratingManager', 'gradingAdminDetail', 'gradingAdminCreate', 'gradingAdminClone', 'gradingAdminEdit'], 'gradingAdminNav'],
   // 二级管理空间
   [
     [
@@ -240,7 +241,7 @@ export const MANAGE_SPACE_REDIRECT_ROUTES = new Map([
   ],
   // 管理空间
   [
-    ['gradingAdminDetail', 'gradingAdminCreate', 'gradingAdminEdit'],
+    ['gradingAdminDetail', 'gradingAdminCreate', 'gradingAdminClone', 'gradingAdminEdit'],
     'ratingManager'
   ],
   // 授权边界
@@ -393,6 +394,17 @@ export const SEND_DAYS_LIST = [
   }
 ];
 
+// 不需要校验组织架构授权范围的页面
+export const NO_VERIFY_ORG_ROUTES = [
+  'authorBoundaryEditFirstLevel',
+  'authorBoundaryEditSecondLevel',
+  'applyJoinUserGroup',
+  'addMemberBoundary',
+  'gradingAdminCreate',
+  'gradingAdminClone',
+  'gradingAdminEdit'
+];
+
 // 只显示角色名称的审计类型
 export const ONLY_ROLE_TYPE = [
   'template.create',

diff --git a/frontend/src/common/router-handle.js b/frontend/src/common/router-handle.js
@@ -52,6 +52,7 @@ export const getRouterDiff = (payload) => {
       'resourcePermiss',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'secondaryManageSpace',
@@ -82,6 +83,7 @@ export const getRouterDiff = (payload) => {
       'orgPermDetail',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'user',
@@ -123,6 +125,7 @@ export const getRouterDiff = (payload) => {
       'orgPermDetail',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'user',
@@ -163,6 +166,7 @@ export const getRouterDiff = (payload) => {
       'orgPermDetail',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'user',
@@ -196,6 +200,7 @@ export const getRouterDiff = (payload) => {
       'orgPermDetail',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'user',
@@ -254,6 +259,7 @@ export const getRouterDiff = (payload) => {
     'user',
     'ratingManager',
     'gradingAdminCreate',
+    'gradingAdminClone',
     'gradingAdminDetail',
     'gradingAdminEdit',
     'administrator',
@@ -302,6 +308,7 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'resourcePermiss',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'authorBoundary',
@@ -348,6 +355,7 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'user',
       'ratingManager',
       'gradingAdminCreate',
+      'gradingAdminClone',
       'gradingAdminDetail',
       'gradingAdminEdit',
       'administrator',
@@ -435,6 +443,7 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
         'approvalProcess',
         'ratingManager',
         'gradingAdminCreate',
+        'gradingAdminClone',
         'gradingAdminDetail',
         'gradingAdminEdit',
         'renewalNotice'

diff --git a/frontend/src/components/choose-ip/grade/index.vue b/frontend/src/components/choose-ip/grade/index.vue
@@ -1191,7 +1191,6 @@
           name = curChainData.name;
           systemId = curChainData.system_id;
         }
-        console.log(this.isFirstLevelEmpty);
         // 如果是手动输入或者第一次加载resource为空且身份不是超管，代表它的范围只是他本身
         if (this.isManualInput || (this.isFirstLevelEmpty && !this.isSuperManager)) {
           parentChain.push({