Merge pull request #6895 from lockiechen/hotfix_release-1.8

bug: 流水线列表页面Loading遮罩未消失问题 issue #6893
TencentBlueKing · Jun 1, 2022 · 0100af3 · 0100af3
2 parents 98106ee + 44d98ed
commit 0100af3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/frontend/devops-pipeline/src/views/list/newlist.vue b/src/frontend/devops-pipeline/src/views/list/newlist.vue
@@ -265,7 +265,7 @@
                 if (val) {
                     this.filter = {}
                     this.currentFilter = {}
-                    this.initPage()
+                    // this.initPage()
                     this.$nextTick(() => {
                         if (this.$refs.infiniteScroll) {
                             this.$refs.infiniteScroll.fetchData()
@@ -363,7 +363,11 @@
                 this.slideShow = val
             },
             togglePageLoading (val) {
-                this.$store.commit('pipelines/showPageLoading', val)
+                if (this.pageLoading !== val) {
+                    this.$nextTick(() => {
+                        this.$store.commit('pipelines/showPageLoading', val)
+                    })
+                }
             },
             calcLatestStartBuildTime (row) {
                 if (row.latestBuildStartTime) {
@@ -422,12 +426,8 @@
             },
 
             async initPage () {
-                performance.mark('initList:start')
                 this.togglePageLoading(true)
                 await this.init()
-
-                performance.mark('initList:end')
-                performance.measure('initList', 'initList:start', 'initList:end')
                 this.togglePageLoading(false)
             },