From f476fe9dade1fd3bf62f8ca55d1edfa716ee2685 Mon Sep 17 00:00:00 2001 From: v_hwweng Date: Mon, 12 Aug 2024 15:52:13 +0800 Subject: [PATCH 1/3] feat: pac codelib #8125 # Reviewed, transaction id: 15008 --- .../devops-codelib/src/components/CodeLibDetail/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue index 8f039028e74..ec535e3ba99 100644 --- a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue +++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue @@ -267,6 +267,9 @@ userId () { return this.$route.query.userId || '' }, + resetType () { + return this.$route.query.resetType || '' + }, scmType () { return this.$route.query.scmType || '' }, @@ -367,8 +370,8 @@ this.errorCode = e.httpStatus || 404 }).finally(() => { if (this.userId) { - this.isLoading = loading - } else { + this.isLoading = this.resetType ? loading : false + } else if (!this.userId) { this.isLoading = false } }) From 3898ec197aa2e9c226c31e98b9d0d0799ba6fbad Mon Sep 17 00:00:00 2001 From: v_hwweng Date: Mon, 12 Aug 2024 17:08:39 +0800 Subject: [PATCH 2/3] feat: pac codelib #8125 --- .../devops-codelib/src/components/CodeLibDetail/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue index ec535e3ba99..8ced4b07686 100644 --- a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue +++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue @@ -371,7 +371,7 @@ }).finally(() => { if (this.userId) { this.isLoading = this.resetType ? loading : false - } else if (!this.userId) { + } else { this.isLoading = false } }) From 986ea2a0be46e4c6b3bb0e532922479228b4df4c Mon Sep 17 00:00:00 2001 From: v_hwweng Date: Mon, 12 Aug 2024 17:09:12 +0800 Subject: [PATCH 3/3] Merge branch 'master' of https://github.com/Tencent/bk-ci into hw_codelib_pac , # Reviewed, transaction id: 15029