From fd0f3e2b5a69e27797a793cf961d63eb77c80a03 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Wed, 13 Nov 2024 13:17:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=90=8E=E6=BB=9A=E5=8A=A8=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88#1590=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/infinite-scroll/index.vue | 11 ++++++++++-
 ui/src/views/application/index.vue          |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/infinite-scroll/index.vue b/ui/src/components/infinite-scroll/index.vue
index a562c5c28..c1a472e41 100644
--- a/ui/src/components/infinite-scroll/index.vue
+++ b/ui/src/components/infinite-scroll/index.vue
@@ -12,7 +12,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
 
 defineOptions({ name: 'InfiniteScroll' })
 const props = defineProps({
@@ -47,6 +47,15 @@ const props = defineProps({
 const emit = defineEmits(['update:current_page', 'load'])
 const current = ref(props.current_page)
 
+watch(
+  () => props.current_page,
+  (val) => {
+    if (val === 1) {
+      current.value = 1
+    }
+  }
+)
+
 const noMore = computed(
   () =>
     props.size > 0 && props.size === props.total && props.total > props.page_size && !props.loading
diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue
index dd46a7b95..849fbf8e6 100644
--- a/ui/src/views/application/index.vue
+++ b/ui/src/views/application/index.vue
@@ -223,9 +223,9 @@ function searchHandle() {
   if (user.userInfo) {
     localStorage.setItem(user.userInfo.id + 'application', selectUserId.value)
   }
-  paginationConfig.total = 0
-  paginationConfig.current_page = 1
   applicationList.value = []
+  paginationConfig.current_page = 1
+  paginationConfig.total = 0
   getList()
 }
 function getAccessToken(id: string) {