From 4b7bc8fd962a0e5141df7278bca962cdbd8be5ee Mon Sep 17 00:00:00 2001 From: Tinhone Date: Tue, 12 Sep 2023 22:30:44 +0800 Subject: [PATCH 01/27] =?UTF-8?q?fix:=20=E6=9E=81=E7=AE=80=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=9C=A8=E9=AB=98=E5=88=86=E5=B1=8F=E5=92=8C=E4=BD=8E?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=AF=94=E4=BE=8B=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A7=A6=E5=BA=95=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home-redesign/minimal/tabs/Feeds.vue | 8 ++- src/ui/ScrollTrigger.vue | 68 ++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/registry/lib/components/style/home-redesign/minimal/tabs/Feeds.vue b/registry/lib/components/style/home-redesign/minimal/tabs/Feeds.vue index 297821f43e..81eb1a60f0 100644 --- a/registry/lib/components/style/home-redesign/minimal/tabs/Feeds.vue +++ b/registry/lib/components/style/home-redesign/minimal/tabs/Feeds.vue @@ -4,7 +4,7 @@ - + @@ -43,6 +43,7 @@ export default Vue.extend({ try { this.error = false this.loading = true + this.$refs.scrollTrigger.setLoadState('loading') this.cards = lodash.uniqBy( [...this.cards, ...(await getVideoFeeds('video', this.lastID))], it => it.id, @@ -50,12 +51,17 @@ export default Vue.extend({ } catch (error) { logError(error) this.error = true + this.$refs.scrollTrigger.setLoadState('error') } finally { this.loading = false + if (this.loaded) { + this.$refs.scrollTrigger.setLoadState('loaded') + } } }, async refresh() { this.cards = [] + this.$refs.scrollTrigger.resetIsFirstLoad() }, }, }) diff --git a/src/ui/ScrollTrigger.vue b/src/ui/ScrollTrigger.vue index 8886aefe6e..16379e374f 100644 --- a/src/ui/ScrollTrigger.vue +++ b/src/ui/ScrollTrigger.vue @@ -7,23 +7,89 @@