Merge pull request #2749 from lhzzforever/dev/develop_ci

Dev/develop ci
TencentBlueKing · Jul 9, 2024 · 62d987d · 62d987d
2 parents d619ac4 + a71986e
commit 62d987d
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 120 deletions.
diff --git a/frontend/src/common/router-handle.js b/frontend/src/common/router-handle.js
@@ -50,11 +50,17 @@ export const getRouterDiff = (payload) => {
       'permTemplateDiff',
       'addGroupPerm',
       'resourcePermiss',
-      'firstManageSpace',
       'ratingManager',
+      'gradingAdminCreate',
+      'gradingAdminDetail',
+      'gradingAdminEdit',
+      'gradingAdminUpdateTemplate',
       'secondaryManageSpace',
-      'authorBoundary',
       'secondaryManageSpaceCreate',
+      'secondaryManageSpaceDetail',
+      'authorBoundary',
+      'authorBoundaryEditFirstLevel',
+      'authorBoundaryEditSecondLevel',
       'userGroupSetting',
       'sensitivityLevel',
       'memberTemplate',
@@ -76,6 +82,8 @@ export const getRouterDiff = (payload) => {
       'ratingManager',
       'gradingAdminCreate',
       'gradingAdminDetail',
+      'gradingAdminEdit',
+      'gradingAdminUpdateTemplate',
       'user',
       'gradingAdminUpdateTemplate',
       'administrator',
@@ -89,10 +97,10 @@ export const getRouterDiff = (payload) => {
       'systemAccessOptimize',
       'systemAccessComplete',
       'resourcePermiss',
-      'userGroupDetail',
-      'firstManageSpace',
       'secondaryManageSpace',
       'authorBoundary',
+      'authorBoundaryEditFirstLevel',
+      'authorBoundaryEditSecondLevel',
       'myManageSpace',
       'myManageSpaceCreate',
       'permTransfer',
@@ -116,8 +124,9 @@ export const getRouterDiff = (payload) => {
       'ratingManager',
       'gradingAdminCreate',
       'gradingAdminDetail',
-      'user',
+      'gradingAdminEdit',
       'gradingAdminUpdateTemplate',
+      'user',
       'approval',
       'permRenewal',
       'audit',
@@ -127,10 +136,14 @@ export const getRouterDiff = (payload) => {
       'systemAccessRegistry',
       'systemAccessOptimize',
       'systemAccessComplete',
-      'firstManageSpace',
       'secondaryManageSpace',
+      'secondaryManageSpaceCreate',
+      'secondaryManageSpaceDetail',
       'authorBoundary',
+      'authorBoundaryEditFirstLevel',
+      'authorBoundaryEditSecondLevel',
       'myManageSpace',
+      'myManageSpaceCreate',
       'renewalNotice',
       'userOrgPerm'
     ];
@@ -148,8 +161,9 @@ export const getRouterDiff = (payload) => {
       'ratingManager',
       'gradingAdminCreate',
       'gradingAdminDetail',
-      'user',
+      'gradingAdminEdit',
       'gradingAdminUpdateTemplate',
+      'user',
       'administrator',
       'approval',
       'permRenewal',
@@ -162,7 +176,6 @@ export const getRouterDiff = (payload) => {
       'systemAccessComplete',
       'myManageSpace',
       'resourcePermiss',
-      'firstManageSpace',
       'sensitivityLevel',
       'resourcePermManage',
       'renewalNotice'
@@ -181,8 +194,9 @@ export const getRouterDiff = (payload) => {
       'ratingManager',
       'gradingAdminCreate',
       'gradingAdminDetail',
-      'user',
+      'gradingAdminEdit',
       'gradingAdminUpdateTemplate',
+      'user',
       'administrator',
       'approval',
       'permRenewal',
@@ -197,7 +211,6 @@ export const getRouterDiff = (payload) => {
       'secondaryManageSpace',
       'secondaryManageSpaceCreate',
       'secondaryManageSpaceDetail',
-      'firstManageSpace',
       'myManageSpace',
       'permTemplate',
       'userGroupSetting',
@@ -281,10 +294,17 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'permTemplateDiff',
       'addGroupPerm',
       'resourcePermiss',
-      'firstManageSpace',
       'ratingManager',
+      'gradingAdminCreate',
+      'gradingAdminDetail',
+      'gradingAdminEdit',
+      'gradingAdminUpdateTemplate',
       'authorBoundary',
+      'authorBoundaryEditFirstLevel',
+      'authorBoundaryEditSecondLevel',
       'secondaryManageSpace',
+      'secondaryManageSpaceCreate',
+      'secondaryManageSpaceDetail',
       'userGroupSetting',
       'sensitivityLevel',
       'memberTemplate',
@@ -333,10 +353,12 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'permTemplateDiff',
       'addGroupPerm',
       'resourcePermiss',
-      'firstManageSpace',
       'authorBoundary',
-      'secondaryManageSpace',
+      'authorBoundaryEditFirstLevel',
+      'authorBoundaryEditSecondLevel',
       'myManageSpace',
+      'myManageSpaceCreate',
+      'secondaryManageSpace',
       'secondaryManageSpaceCreate',
       'secondaryManageSpaceDetail',
       'userGroupSetting',
@@ -375,12 +397,12 @@ export const getNavRouterDiff = (navIndex, managerPerm = '') => {
       'permTemplate',
       'permTemplateDetail',
       'permTemplateCreate',
-      'authorBoundary',
-      'secondaryManageSpace',
       'myManageSpace',
       'myManageSpaceCreate',
+      'secondaryManageSpace',
       'secondaryManageSpaceCreate',
       'secondaryManageSpaceDetail',
+      'authorBoundary',
       'authorBoundaryEditFirstLevel',
       'authorBoundaryEditSecondLevel',
       'permTemplateEdit',

diff --git a/frontend/src/components/header-nav/index.vue b/frontend/src/components/header-nav/index.vue
@@ -319,7 +319,6 @@
       },
       appLogo () {
         // 如果未获取到配置，使用默认logo
-        console.log(this.globalConfig.appLogo);
         const src = this.globalConfig.appLogo || logoSvg;
         return src;
       }
@@ -640,13 +639,7 @@
         // this.curHeight = document.getElementsByClassName('user-dropdown')[0].offsetHeight
         this.isShowGradingWrapper = !this.isShowGradingWrapper;
       },
-
-      handleBack () {
-        this.isShowUserDropdown = false;
-        this.isShowGradingWrapper = false;
-        this.handleSwitchRole({ id: 0, type: 'staff', name: this.user.role.name });
-      },
-
+      
       handleLogout () {
         window.localStorage.removeItem('iam-header-title-cache');
         window.localStorage.removeItem('iam-header-name-cache');

diff --git a/frontend/src/components/nav/index.vue b/frontend/src/components/nav/index.vue
@@ -250,8 +250,6 @@
     [['myManageSpace', 'myManageSpaceCreate', 'gradingAdminDetail', 'gradingAdminEdit', 'gradingAdminCreate', 'myManageSpaceSubDetail', 'secondaryManageSpaceEdit'], 'myManageSpaceNav'],
     // 分级管理员
     [['ratingManager', 'gradingAdminDetail', 'gradingAdminCreate', 'gradingAdminEdit'], 'gradingAdminNav'],
-    // 管理空间
-    [['firstManageSpace', 'firstManageSpaceCreate'], 'firstManageSpaceNav'],
     // 二级管理空间
     [['secondaryManageSpace', 'secondaryManageSpaceCreate', 'secondaryManageSpaceDetail'], 'secondaryManageSpaceNav'],
     // 授权边界