feat: 修改部分按钮问题 #2738

TencentBlueKing · Nov 11, 2024 · 4b9d15d · 4b9d15d
1 parent 1b5cef6
commit 4b9d15d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/src/frontend/devops-repository/src/components/Header/index.vue b/src/frontend/devops-repository/src/components/Header/index.vue
@@ -203,7 +203,7 @@
                         uid: this.userInfo.name
                     }
                 }).then(res => {
-                    if (res !== '') {
+                    if (res !== '' && res !== null) {
                         window.open(res, '_blank')
                     }
                 })

diff --git a/src/frontend/devops-repository/src/views/repoGeneric/index.vue b/src/frontend/devops-repository/src/views/repoGeneric/index.vue
@@ -789,7 +789,7 @@
                                 repoName: this.repoName
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,
@@ -966,7 +966,7 @@
                                         path: fullPath
                                     }
                                 }).then(res => {
-                                    if (res !== '') {
+                                    if (res !== '' && res !== null) {
                                         this.showIamDenyDialog = true
                                         this.showData = {
                                             projectId: this.projectId,
@@ -1047,7 +1047,7 @@
                                 path: row.fullPath
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,
@@ -1147,7 +1147,7 @@
                                 repoName: this.repoName
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,
@@ -1223,7 +1223,7 @@
                                 repoName: this.repoName
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,
@@ -1310,7 +1310,7 @@
                                 path: row.fullPath
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,
@@ -1366,7 +1366,7 @@
                                 path: row.fullPath
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,

diff --git a/src/frontend/devops-repository/src/views/repoList/createRepoDialog.vue b/src/frontend/devops-repository/src/views/repoList/createRepoDialog.vue
@@ -292,7 +292,7 @@
                                 uid: this.userInfo.name
                             }
                         }).then(res => {
-                            if (res !== '') {
+                            if (res !== '' && res !== null) {
                                 this.showIamDenyDialog = true
                                 this.showData = {
                                     projectId: this.projectId,

diff --git a/src/frontend/devops-repository/src/views/repoList/index.vue b/src/frontend/devops-repository/src/views/repoList/index.vue
@@ -454,7 +454,7 @@
                         uid: this.userInfo.name
                     }
                 }).then(res => {
-                    if (res !== '') {
+                    if (res !== '' && res !== null) {
                         this.showIamDenyDialog = true
                         this.showData = {
                             projectId: this.projectId,

diff --git a/src/frontend/devops-repository/src/views/repoSearch/index.vue b/src/frontend/devops-repository/src/views/repoSearch/index.vue
@@ -125,7 +125,7 @@
             }
         },
         computed: {
-            ...mapState(['userList']),
+            ...mapState(['userList', 'userInfo']),
             projectId () {
                 return this.$route.params.projectId
             },
@@ -140,7 +140,7 @@
         },
         methods: {
             formatDate,
-            ...mapActions(['searchPackageList', 'searchRepoList']),
+            ...mapActions(['searchPackageList', 'searchRepoList', 'getPermissionUrl']),
             refreshRoute () {
                 this.$router.replace({
                     query: {
@@ -194,6 +194,27 @@
                         this.hasNext = false
                     }
                     scrollLoad ? this.resultList.push(...records) : (this.resultList = records)
+                }).catch(err => {
+                    if (err.status === 403) {
+                        this.getPermissionUrl({
+                            body: {
+                                projectId: this.projectId,
+                                action: 'READ',
+                                resourceType: 'PROJECT',
+                                uid: this.userInfo.name
+                            }
+                        }).then(res => {
+                            if (res !== '' && res !== null) {
+                                this.showIamDenyDialog = true
+                                this.showData = {
+                                    projectId: this.projectId,
+                                    repoName: '',
+                                    action: 'READ',
+                                    url: res
+                                }
+                            }
+                        })
+                    }
                 }).finally(() => {
                     this.isLoading = false
                 })