From ade1accd3fa3ceaf935353c31028817dbf44ac7d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 9 Oct 2026 15:20:00 +0800
Subject: [PATCH] fix(frontend): reset search filters and pagination on page
 visits

---
 frontend/src/components/table/TableSearch.vue |  6 +-
 .../components/table/complex/ComplexTable.vue |  4 +-
 frontend/src/composables/usePageState.ts      |  9 +--
 .../src/composables/useSearchPersistence.ts   | 63 -------------------
 frontend/src/composables/useSearchReset.ts    | 24 +++++++
 frontend/src/store/modules/process.ts         | 10 +--
 frontend/src/utils/search-reset.ts            | 12 ++++
 .../ai/agents/agent/config/tabs/plugins.vue   | 14 +++--
 .../agent/config/tabs/skills/hermes.vue       | 13 ++--
 .../agent/config/tabs/skills/openclaw.vue     | 13 ++--
 frontend/src/views/ai/agents/agent/index.vue  |  6 +-
 frontend/src/views/ai/agents/model/index.vue  |  6 +-
 frontend/src/views/ai/model/ollama/index.vue  |  6 +-
 frontend/src/views/app-store/apps/index.vue   |  7 ++-
 .../src/views/app-store/installed/index.vue   |  7 ++-
 .../src/views/container/compose/index.vue     |  4 +-
 .../src/views/container/container/index.vue   |  6 +-
 frontend/src/views/container/image/index.vue  |  7 ++-
 .../src/views/container/network/index.vue     |  6 +-
 frontend/src/views/container/repo/index.vue   |  6 +-
 .../src/views/container/template/index.vue    |  6 +-
 frontend/src/views/container/volume/index.vue |  6 +-
 frontend/src/views/cronjob/cronjob/index.vue  |  6 +-
 frontend/src/views/cronjob/library/index.vue  |  6 +-
 frontend/src/views/database/mongodb/index.vue |  6 +-
 .../views/database/mongodb/remote/index.vue   |  6 +-
 frontend/src/views/database/mysql/index.vue   |  6 +-
 .../src/views/database/mysql/remote/index.vue |  6 +-
 .../src/views/database/postgresql/index.vue   |  6 +-
 .../database/postgresql/remote/index.vue      |  6 +-
 .../src/views/database/redis/remote/index.vue |  6 +-
 .../src/views/host/file-management/index.vue  |  7 ++-
 .../src/views/host/firewall/docker/index.vue  | 11 +++-
 .../src/views/host/firewall/forward/index.vue |  6 +-
 .../src/views/host/firewall/rule/index.vue    |  6 +-
 frontend/src/views/host/ssh/log/log.vue       |  6 +-
 frontend/src/views/host/ssh/session/index.vue |  4 +-
 frontend/src/views/log/host-system/index.vue  | 10 +--
 frontend/src/views/log/login/index.vue        |  6 +-
 frontend/src/views/log/operation/index.vue    |  6 +-
 .../views/setting/backup-account/index.vue    |  7 ++-
 frontend/src/views/setting/snapshot/index.vue |  6 +-
 frontend/src/views/terminal/command/index.vue |  6 +-
 frontend/src/views/terminal/host/index.vue    |  6 +-
 frontend/src/views/toolbox/clam/index.vue     |  6 +-
 frontend/src/views/toolbox/ftp/index.vue      |  6 +-
 .../php/extension-management/index.vue        |  4 +-
 frontend/src/views/website/ssl/index.vue      |  7 ++-
 frontend/src/views/website/template/index.vue |  6 +-
 frontend/src/views/website/website/index.vue  |  7 ++-
 50 files changed, 220 insertions(+), 198 deletions(-)
 delete mode 100644 frontend/src/composables/useSearchPersistence.ts
 create mode 100644 frontend/src/composables/useSearchReset.ts
 create mode 100644 frontend/src/utils/search-reset.ts

diff --git a/frontend/src/components/table/TableSearch.vue b/frontend/src/components/table/TableSearch.vue
index f965fb385..401ad150d 100644
--- a/frontend/src/components/table/TableSearch.vue
+++ b/frontend/src/components/table/TableSearch.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { onActivated, ref, watch } from 'vue';
 defineOptions({ name: 'TableSearch' });
 
 const emit = defineEmits(['search', 'update:searchName']);
@@ -42,6 +42,10 @@ watch(
     { immediate: true },
 );
 
+onActivated(() => {
+    searchInfo.value = props.searchName;
+});
+
 const search = () => {
     emit('update:searchName', searchInfo.value);
     emit('search');
diff --git a/frontend/src/components/table/complex/ComplexTable.vue b/frontend/src/components/table/complex/ComplexTable.vue
index 8b6865590..c10644c1e 100644
--- a/frontend/src/components/table/complex/ComplexTable.vue
+++ b/frontend/src/components/table/complex/ComplexTable.vue
@@ -167,7 +167,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { computed, onMounted, ref, useAttrs } from 'vue';
+import { computed, onDeactivated, onMounted, ref, useAttrs } from 'vue';
 import { useGlobalStore } from '@/composables/useGlobalStore';
 import { flattenVNodes, type FuTableOperationButton } from '@/components/table/shared';
 import { useCardColumns } from './useCardColumns';
@@ -459,6 +459,8 @@ watch([currentViewMode, tableData, () => props.syncCardContentHeight], scheduleC
     flush: 'post',
 });
 
+onDeactivated(clearSelects);
+
 watch([() => props.paginationConfig?.currentPage, () => props.paginationConfig?.pageSize], clearSelects, {
     flush: 'sync',
 });
diff --git a/frontend/src/composables/usePageState.ts b/frontend/src/composables/usePageState.ts
index 659d65cab..a15c22a78 100644
--- a/frontend/src/composables/usePageState.ts
+++ b/frontend/src/composables/usePageState.ts
@@ -1,11 +1,6 @@
 import { reactive, type UnwrapNestedRefs } from 'vue';
-import { useRoute } from 'vue-router';
-import { useGlobalStore } from '@/composables/useGlobalStore';
-import { getPageState } from '@/utils/page-state-cache';
 
+/** A new page visit starts from its defaults instead of restoring the previous page number. */
 export const usePageState = <T extends object>(factory: () => T): UnwrapNestedRefs<T> => {
-    const route = useRoute();
-    const { currentNode } = useGlobalStore();
-    const key = `${currentNode.value}:${String(route.name || route.path)}`;
-    return reactive(getPageState(key, factory));
+    return reactive(factory());
 };
diff --git a/frontend/src/composables/useSearchPersistence.ts b/frontend/src/composables/useSearchPersistence.ts
deleted file mode 100644
index fcef3d923..000000000
--- a/frontend/src/composables/useSearchPersistence.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { storeToRefs } from 'pinia';
-import { watch, type Ref } from 'vue';
-import GlobalStore from '@/store/modules/global';
-
-type SearchValue = string | number | undefined;
-type SearchFields = Record<string, Ref<SearchValue>>;
-
-export const useSearchPersistence = (page: string, fields: SearchFields, scope?: () => SearchValue) => {
-    const { currentNode } = storeToRefs(GlobalStore());
-    const defaults = Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value]));
-    let initialized = false;
-    let restoring = false;
-    let activeKey: string | undefined;
-
-    watch(
-        () => {
-            const context = scope?.();
-            if (scope && context === undefined) return undefined;
-            return `1panel:search:v1:${JSON.stringify([currentNode.value, page, context ?? ''])}`;
-        },
-        (key) => {
-            activeKey = key;
-            let saved: Record<string, unknown> = {};
-            try {
-                const parsed = activeKey ? JSON.parse(localStorage.getItem(activeKey) || '{}') : {};
-                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) saved = parsed;
-            } catch {}
-            restoring = true;
-            for (const [name, field] of Object.entries(fields)) {
-                const value = saved[name];
-                const initial = defaults[name];
-                let fallback = initial;
-                if (initialized) {
-                    fallback = typeof initial === 'string' ? '' : undefined;
-                }
-                const valid =
-                    (typeof value === 'string' || (typeof value === 'number' && Number.isFinite(value))) &&
-                    (fallback === undefined || typeof value === typeof fallback);
-                if (value === null) {
-                    field.value = typeof initial === 'string' ? '' : undefined;
-                } else if (valid) {
-                    field.value = value as SearchValue;
-                } else {
-                    field.value = fallback;
-                }
-            }
-            restoring = false;
-            initialized = true;
-        },
-        { immediate: true, flush: 'sync' },
-    );
-
-    watch(
-        () => Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value ?? null])),
-        (value) => {
-            if (restoring || !activeKey) return;
-            try {
-                localStorage.setItem(activeKey, JSON.stringify(value));
-            } catch {}
-        },
-        { flush: 'sync' },
-    );
-};
diff --git a/frontend/src/composables/useSearchReset.ts b/frontend/src/composables/useSearchReset.ts
new file mode 100644
index 000000000..f10144ca6
--- /dev/null
+++ b/frontend/src/composables/useSearchReset.ts
@@ -0,0 +1,24 @@
+import { storeToRefs } from 'pinia';
+import { onActivated, onDeactivated } from 'vue';
+import GlobalStore from '@/store/modules/global';
+import { bindSearchReset, type SearchFields } from '@/utils/search-reset';
+
+interface SearchResetOptions {
+    scope?: () => string | number | undefined;
+    onRevisit: () => unknown;
+}
+
+export const useSearchReset = (fields: SearchFields, options: SearchResetOptions) => {
+    const { currentNode } = storeToRefs(GlobalStore());
+    const reset = bindSearchReset(options.scope ? [currentNode, options.scope] : [currentNode], fields);
+    let deactivated = false;
+    onDeactivated(() => {
+        deactivated = true;
+    });
+    onActivated(() => {
+        if (!deactivated) return;
+        deactivated = false;
+        reset();
+        return options.onRevisit();
+    });
+};
diff --git a/frontend/src/store/modules/process.ts b/frontend/src/store/modules/process.ts
index 13a5a4ece..91ae45634 100644
--- a/frontend/src/store/modules/process.ts
+++ b/frontend/src/store/modules/process.ts
@@ -1,4 +1,6 @@
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { bindSearchReset } from '@/utils/search-reset';
+import router from '@/routers/router';
+import { useGlobalStore } from '@/composables/useGlobalStore';
 import { defineStore } from 'pinia';
 import { ref, reactive, toRef } from 'vue';
 import { MsgError } from '@/utils/message';
@@ -47,12 +49,12 @@ export const ProcessStore = defineStore('ProcessStore', () => {
         port: undefined,
     });
 
-    useSearchPersistence('host/process/process', {
+    const { currentNode } = useGlobalStore();
+    bindSearchReset([() => router.currentRoute.value.path, currentNode], {
         pid: toRef(psSearch, 'pid'),
         name: toRef(psSearch, 'name'),
         username: toRef(psSearch, 'username'),
-    });
-    useSearchPersistence('host/process/network', {
+
         processID: toRef(netSearch, 'processID'),
         processName: toRef(netSearch, 'processName'),
         port: toRef(netSearch, 'port'),
diff --git a/frontend/src/utils/search-reset.ts b/frontend/src/utils/search-reset.ts
new file mode 100644
index 000000000..52ecef14d
--- /dev/null
+++ b/frontend/src/utils/search-reset.ts
@@ -0,0 +1,12 @@
+import { watch, type Ref, type WatchSource } from 'vue';
+
+export type SearchFields = Record<string, Ref<string | number | undefined>>;
+
+export const bindSearchReset = (sources: WatchSource[], fields: SearchFields) => {
+    const defaults = Object.values(fields).map((field) => ({ field, value: field.value }));
+    const reset = () => {
+        for (const { field, value } of defaults) field.value = value;
+    };
+    watch(sources, reset, { flush: 'sync' });
+    return reset;
+};
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue b/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
index 1a7994868..d947ce0f4 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
@@ -172,7 +172,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { ElMessageBox } from 'element-plus';
@@ -193,10 +193,16 @@ const searching = ref(false);
 const operating = ref('');
 const keyword = ref('');
 const marketKeyword = ref('');
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/plugins',
+useSearchReset(
     { keyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            page.value = 1;
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const origin = ref('');
 const status = ref('');
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue b/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
index ee8f0943c..fcb7757b9 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
@@ -138,7 +138,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -169,10 +169,15 @@ const getDefaultMarketSource = (): HermesSkillMarketSource => {
 const marketSource = ref<HermesSkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/skills/hermes',
+useSearchReset(
     { installedKeyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const installedSkills = ref<AI.AgentSkillItem[]>([]);
 const marketResults = ref<AI.AgentSkillSearchItem[]>([]);
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue b/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
index 8689ab407..0420e3100 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
@@ -142,7 +142,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -181,10 +181,15 @@ const getDefaultMarketSource = (): SkillMarketSource => {
 const marketSource = ref<SkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/skills/openclaw',
+useSearchReset(
     { installedKeyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const skills = ref<AI.AgentSkillItem[]>([]);
 const marketResults = ref<AI.AgentSkillSearchItem[]>([]);
diff --git a/frontend/src/views/ai/agents/agent/index.vue b/frontend/src/views/ai/agents/agent/index.vue
index f9cab2081..27a862ada 100644
--- a/frontend/src/views/ai/agents/agent/index.vue
+++ b/frontend/src/views/ai/agents/agent/index.vue
@@ -272,8 +272,8 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { deleteAgentCheck, pageAgents, resetAgentToken, unbindAgentWebsite, updateAgentRemark } from '@/api/modules/ai';
 import { checkAppInstalled, installedOp, searchApp, searchAppInstalled } from '@/api/modules/app';
@@ -341,7 +341,6 @@ const isActive = ref(false);
 const isExist = ref(false);
 const noApp = ref(false);
 const searchName = ref('');
-useSearchPersistence('ai/agents/agent/index', { search: searchName });
 const defaultHttpsPort = ref(443);
 const openrestyPortLoaded = ref(false);
 const websiteDomainsMap = ref<Record<number, Website.Domain[]>>({});
@@ -401,6 +400,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const checkNoApp = async () => {
     try {
diff --git a/frontend/src/views/ai/agents/model/index.vue b/frontend/src/views/ai/agents/model/index.vue
index cf31de24a..4f9347ce8 100644
--- a/frontend/src/views/ai/agents/model/index.vue
+++ b/frontend/src/views/ai/agents/model/index.vue
@@ -69,8 +69,8 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteAgentAccount, getAgentProviders, pageAgentAccounts } from '@/api/modules/ai';
 import { AI } from '@/api/interface/ai';
 import AddDialog from '@/views/ai/agents/model/add/index.vue';
@@ -86,7 +86,6 @@ const items = ref<AI.AgentAccountItem[]>([]);
 const addRef = ref();
 const modelPoolRef = ref();
 const searchName = ref('');
-useSearchPersistence('ai/agents/model/index', { search: searchName });
 const apiType = ref('');
 const apiTypeOptions = ref<string[]>([]);
 
@@ -112,6 +111,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     const req: AI.AgentAccountSearch = {
diff --git a/frontend/src/views/ai/model/ollama/index.vue b/frontend/src/views/ai/model/ollama/index.vue
index 90b14c08a..b2eef6bbf 100644
--- a/frontend/src/views/ai/model/ollama/index.vue
+++ b/frontend/src/views/ai/model/ollama/index.vue
@@ -186,7 +186,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import AppStatus from '@/components/app-status/index.vue';
 import AddDialog from '@/views/ai/model/ollama/add/index.vue';
 import Conn from '@/views/ai/model/ollama/conn/index.vue';
@@ -195,7 +195,7 @@ import Terminal from '@/views/ai/model/ollama/terminal/index.vue';
 import Del from '@/views/ai/model/ollama/del/index.vue';
 import PortJumpDialog from '@/components/port-jump/index.vue';
 import CodemirrorDrawer from '@/components/codemirror-pro/drawer.vue';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { App } from '@/api/interface/app';
 import {
@@ -237,7 +237,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('ai/model/ollama/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const appInstallID = ref(0);
 
 const opRef = ref();
diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index 710706042..6190565d2 100644
--- a/frontend/src/views/app-store/apps/index.vue
+++ b/frontend/src/views/app-store/apps/index.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { App } from '@/api/interface/app';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { searchApp, syncApp, syncCutomAppStore, syncLocalApp, getCurrentNodeCustomAppConfig } from '@/api/modules/app';
@@ -105,7 +105,10 @@ const req = reactive({
     resource: 'all',
     showCurrentArch: false,
 });
-useSearchPersistence('app-store/apps/index', { search: toRef(req, 'name') });
+useSearchReset(
+    { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search(req) },
+);
 
 const apps = ref<App.AppItem[]>([]);
 const loading = ref(false);
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index 7dcb71872..d176d5272 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -139,7 +139,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import AppCard from '@/views/app-store/installed/app/card.vue';
 import Backups from '@/components/backup/index.vue';
 import Uploads from '@/components/upload/index.vue';
@@ -211,7 +211,10 @@ const searchReq = reactive({
     update: false,
     sync: false,
 });
-useSearchPersistence('app-store/installed/index', { search: toRef(searchReq, 'name') });
+useSearchReset(
+    { search: toRef(searchReq, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const router = useRouter();
 const activeName = ref(i18n.global.t('app.installed'));
 const mode = ref('installed');
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
index 88eb399ea..26ce3225c 100644
--- a/frontend/src/views/container/compose/index.vue
+++ b/frontend/src/views/container/compose/index.vue
@@ -521,7 +521,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, h, ref } from 'vue';
 import CodemirrorPro from '@/components/codemirror-pro/index.vue';
 import ContainerLog from '@/components/log/container/index.vue';
@@ -576,7 +576,7 @@ const dialogBackupRef = ref();
 const uploadRef = ref();
 
 const searchName = ref('');
-useSearchPersistence('container/compose/index', { search: searchName });
+useSearchReset({ search: searchName }, { onRevisit: () => search() });
 const includeAppStore = ref(localStorage.getItem('includeAppStore') !== 'false');
 const showType = ref('compose');
 const containerStats = ref<any[]>([]);
diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue
index 7708dfece..e75320260 100644
--- a/frontend/src/views/container/container/index.vue
+++ b/frontend/src/views/container/container/index.vue
@@ -474,7 +474,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import PruneDialog from '@/views/container/container/prune/index.vue';
 import RenameDialog from '@/views/container/container/rename/index.vue';
 import UpgradeDialog from '@/views/container/container/upgrade/index.vue';
@@ -490,7 +490,7 @@ import Uploads from '@/components/upload/index.vue';
 import DockerStatus from '@/views/container/docker-status/index.vue';
 import ContainerLogDialog from '@/components/log/container-drawer/index.vue';
 import Status from '@/components/status/index.vue';
-import { computed, reactive, ref } from 'vue';
+import { toRef, computed, reactive, ref } from 'vue';
 import {
     containerItemStats,
     containerListStats,
@@ -536,7 +536,7 @@ const paginationConfig = reactive({
     order: 'ascending',
 });
 const searchName = ref();
-useSearchPersistence('container/container/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const dialogUpgradeRef = ref();
 const dialogCommitRef = ref();
 const dialogPortJumpRef = ref();
diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
index c46cd1d5d..8bdd25b0f 100644
--- a/frontend/src/views/container/image/index.vue
+++ b/frontend/src/views/container/image/index.vue
@@ -157,7 +157,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, reactive, ref, computed } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
@@ -200,7 +200,10 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
-useSearchPersistence('container/image/index', { search: toRef(paginationConfig, 'name') });
+useSearchReset(
+    { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const columns = ref([]);
 
 const isActive = ref(false);
diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue
index 52b792af8..1a59e14c4 100644
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -95,10 +95,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import CreateDialog from '@/views/container/network/create/index.vue';
 import DetailDrawer from '@/views/container/network/detail/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
 import { deleteNetwork, searchNetwork, inspect, containerPrune } from '@/api/modules/container';
@@ -121,7 +121,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/network/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const isActive = ref(false);
diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue
index cd9c45ae6..94e5d7d91 100644
--- a/frontend/src/views/container/repo/index.vue
+++ b/frontend/src/views/container/repo/index.vue
@@ -59,9 +59,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import OperatorDialog from '@/views/container/repo/operator/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { Container } from '@/api/interface/container';
 import { checkRepoStatus, deleteImageRepo, searchImageRepo } from '@/api/modules/container';
@@ -78,7 +78,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/repo/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const confirmDialog = ref();
diff --git a/frontend/src/views/container/template/index.vue b/frontend/src/views/container/template/index.vue
index 816666d13..319ae5501 100644
--- a/frontend/src/views/container/template/index.vue
+++ b/frontend/src/views/container/template/index.vue
@@ -81,8 +81,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { downloadWithContent } from '@/utils/file';
 import { Container } from '@/api/interface/container';
@@ -111,7 +111,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/template/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     if (!isActive.value || !isExist.value) {
diff --git a/frontend/src/views/container/volume/index.vue b/frontend/src/views/container/volume/index.vue
index 4d8d79b0b..55c45addf 100644
--- a/frontend/src/views/container/volume/index.vue
+++ b/frontend/src/views/container/volume/index.vue
@@ -124,11 +124,11 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import CreateDialog from '@/views/container/volume/create/index.vue';
 import CodemirrorDrawer from '@/components/codemirror-pro/drawer.vue';
 import DockerStatus from '@/views/container/docker-status/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
 import { deleteVolume, searchVolume, inspect, containerPrune } from '@/api/modules/container';
@@ -158,7 +158,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/volume/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const isActive = ref(false);
 const isExist = ref(false);
 
diff --git a/frontend/src/views/cronjob/cronjob/index.vue b/frontend/src/views/cronjob/cronjob/index.vue
index 90477a1cb..60e14cf58 100644
--- a/frontend/src/views/cronjob/cronjob/index.vue
+++ b/frontend/src/views/cronjob/cronjob/index.vue
@@ -272,11 +272,11 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import Records from '@/views/cronjob/cronjob/record/index.vue';
 import Backups from '@/views/cronjob/cronjob/backup/index.vue';
 import Import from '@/views/cronjob/cronjob/import/index.vue';
-import { onMounted, ref, toRefs } from 'vue';
+import { toRef, onMounted, ref, toRefs } from 'vue';
 import {
     deleteCronjob,
     editCronjobGroup,
@@ -332,7 +332,7 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const { defaultGroupID, searchName, searchGroupID } = toRefs(pageState);
-useSearchPersistence('cronjob/cronjob/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     if (column) {
diff --git a/frontend/src/views/cronjob/library/index.vue b/frontend/src/views/cronjob/library/index.vue
index a8d38caea..90df9d64a 100644
--- a/frontend/src/views/cronjob/library/index.vue
+++ b/frontend/src/views/cronjob/library/index.vue
@@ -132,7 +132,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { deepCopy } from '@/utils/misc';
 import { newUUID } from '@/utils/id';
@@ -141,7 +141,7 @@ import TaskLog from '@/components/log/task/index.vue';
 import OperateDialog from '@/views/cronjob/library/operate/index.vue';
 import TerminalDialog from '@/views/cronjob/library/run/index.vue';
 import { deleteScript, searchScript, syncScript } from '@/api/modules/cronjob';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { Cronjob } from '@/api/interface/cronjob';
 import i18n from '@/lang';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -170,7 +170,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchPersistence('cronjob/library/index', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 const groupOptions = ref();
 
diff --git a/frontend/src/views/database/mongodb/index.vue b/frontend/src/views/database/mongodb/index.vue
index c17ab308a..e6c2cbf35 100644
--- a/frontend/src/views/database/mongodb/index.vue
+++ b/frontend/src/views/database/mongodb/index.vue
@@ -323,8 +323,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { nextTick, onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, nextTick, onMounted, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { getRandomStr } from '@/utils/id';
 import { Position } from '@element-plus/icons-vue';
@@ -366,7 +366,6 @@ const loading = ref(false);
 const maskShow = ref(true);
 const submitLoading = ref(false);
 const searchName = ref('');
-useSearchPersistence('database/mongodb/index', { search: searchName });
 const createVisible = ref(false);
 const appStatusRef = ref();
 const bindRef = ref();
@@ -400,6 +399,7 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 type FormInstance = InstanceType<typeof ElForm>;
 const formRef = ref<FormInstance>();
diff --git a/frontend/src/views/database/mongodb/remote/index.vue b/frontend/src/views/database/mongodb/remote/index.vue
index 15bf8d0a3..402a97201 100644
--- a/frontend/src/views/database/mongodb/remote/index.vue
+++ b/frontend/src/views/database/mongodb/remote/index.vue
@@ -75,9 +75,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/postgresql/check/index.vue';
 import OperateDialog from '@/views/database/mongodb/remote/operate/index.vue';
@@ -101,7 +101,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mongodb/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index 7b3586ac5..46eb39168 100644
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -226,7 +226,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import BindDialog from '@/views/database/mysql/bind/index.vue';
 import UserDialog from '@/views/database/mysql/user/index.vue';
 import OperateDialog from '@/views/database/mysql/create/index.vue';
@@ -241,7 +241,7 @@ import PortJumpDialog from '@/components/port-jump/index.vue';
 import Tooltip from '@/components/tooltip/index.vue';
 import { dateFormat } from '@/utils/date';
 import { ElMessageBox } from 'element-plus';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import {
     deleteCheckMysqlDB,
     listDatabases,
@@ -301,7 +301,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mysql/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const mysqlContainer = ref();
 const mysqlStatus = ref();
diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue
index d2d945bf2..772b14c99 100644
--- a/frontend/src/views/database/mysql/remote/index.vue
+++ b/frontend/src/views/database/mysql/remote/index.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/mysql/check/index.vue';
 import OperateDialog from '@/views/database/mysql/remote/operate/index.vue';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mysql/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/postgresql/index.vue b/frontend/src/views/database/postgresql/index.vue
index 87e637ecf..34878d0bd 100644
--- a/frontend/src/views/database/postgresql/index.vue
+++ b/frontend/src/views/database/postgresql/index.vue
@@ -241,7 +241,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import BindDialog from '@/views/database/postgresql/bind/index.vue';
 import OperateDialog from '@/views/database/postgresql/create/index.vue';
 import DeleteDialog from '@/views/database/postgresql/delete/index.vue';
@@ -256,7 +256,7 @@ import UploadDialog from '@/components/upload/index.vue';
 import PortJumpDialog from '@/components/port-jump/index.vue';
 import Tooltip from '@/components/tooltip/index.vue';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import {
     deleteCheckPostgresqlDB,
     listDatabases,
@@ -313,7 +313,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/postgresql/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const postgresqlContainer = ref();
 const postgresqlStatus = ref();
diff --git a/frontend/src/views/database/postgresql/remote/index.vue b/frontend/src/views/database/postgresql/remote/index.vue
index 6f96dbd92..8bff59afe 100644
--- a/frontend/src/views/database/postgresql/remote/index.vue
+++ b/frontend/src/views/database/postgresql/remote/index.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/postgresql/check/index.vue';
 import OperateDialog from '@/views/database/postgresql/remote/operate/index.vue';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/postgresql/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/redis/remote/index.vue b/frontend/src/views/database/redis/remote/index.vue
index ee66b73f8..78d625489 100644
--- a/frontend/src/views/database/redis/remote/index.vue
+++ b/frontend/src/views/database/redis/remote/index.vue
@@ -73,9 +73,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/redis/check/index.vue';
 import OperateDialog from '@/views/database/redis/remote/operate/index.vue';
@@ -99,7 +99,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/redis/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 297462a99..ed9df204d 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -739,7 +739,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import {
     addFavorite,
@@ -853,7 +853,6 @@ const initData = () => ({
     sortOrder: 'ascending',
 });
 let req = reactive(initData());
-useSearchPersistence('host/file-management/index', { search: toRef(req, 'search') });
 let loading = ref(false);
 const paths = ref<FilePaths[]>([]);
 const breadcrumbVisiblePaths = ref<FilePaths[]>([]);
@@ -986,6 +985,10 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('file-page-size')) || 100,
     total: 0,
 });
+useSearchReset(
+    { search: toRef(req, 'search'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 
 const btnWrapperRefs = ref<Record<string, any>>({});
 
diff --git a/frontend/src/views/host/firewall/docker/index.vue b/frontend/src/views/host/firewall/docker/index.vue
index 52b9abab7..f706bd651 100644
--- a/frontend/src/views/host/firewall/docker/index.vue
+++ b/frontend/src/views/host/firewall/docker/index.vue
@@ -220,7 +220,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, reactive, ref, watch } from 'vue';
 import FireRouter from '@/views/host/firewall/index.vue';
 import DockerGuardStatus from '@/views/host/firewall/docker/status/index.vue';
@@ -264,7 +264,14 @@ const openRuleTask = (taskID: string) => taskLogRef.value?.openWithTaskID(taskID
 const orphanDrawerVisible = ref(false);
 const orphanSearchName = ref('');
 const searchName = ref('');
-useSearchPersistence('host/firewall/docker/index', { search: searchName });
+useSearchReset(
+    { search: searchName },
+    {
+        onRevisit: () => {
+            paginationConfig.currentPage = 1;
+        },
+    },
+);
 const selects = ref<Firewall.DockerGuardContainer[]>([]);
 const orphanSelects = ref<Firewall.DockerGuardEndpoint[]>([]);
 const data = reactive<Firewall.DockerGuardList>({
diff --git a/frontend/src/views/host/firewall/forward/index.vue b/frontend/src/views/host/firewall/forward/index.vue
index 4fefc3b10..91d91535d 100644
--- a/frontend/src/views/host/firewall/forward/index.vue
+++ b/frontend/src/views/host/firewall/forward/index.vue
@@ -120,14 +120,14 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import OperateDialog from './operate/index.vue';
 import ImportDialog from './import/index.vue';
 import FireRouter from '@/views/host/firewall/index.vue';
 import FireStatus from '@/views/host/firewall/status/index.vue';
 import RuleReset from '@/views/host/firewall/components/rule-reset.vue';
 import TaskLog from '@/components/log/task/index.vue';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { resetFirewallRules, operateForwardRule, searchForwardRule } from '@/api/modules/firewall';
 import { Firewall } from '@/api/interface/firewall';
 import { buildForwardRuleExport } from './transfer';
@@ -141,7 +141,6 @@ import { ElMessageBox } from 'element-plus';
 const loading = ref();
 const selects = ref<any>([]);
 const searchName = ref();
-useSearchPersistence('host/firewall/forward/index', { search: searchName });
 
 const isInit = ref(false);
 const isBind = ref(false);
@@ -192,6 +191,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-forward-page-size')) || 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     if (!isInit.value || !isBind.value || fireName.value === '-') {
diff --git a/frontend/src/views/host/firewall/rule/index.vue b/frontend/src/views/host/firewall/rule/index.vue
index 063d9bca0..b2665441d 100644
--- a/frontend/src/views/host/firewall/rule/index.vue
+++ b/frontend/src/views/host/firewall/rule/index.vue
@@ -302,7 +302,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Firewall } from '@/api/interface/firewall';
 import type { FuTableOperationButton } from '@/components/table/shared';
 import { buildHostRuleExport } from './transfer';
@@ -330,7 +330,7 @@ import RuleReset from '@/views/host/firewall/components/rule-reset.vue';
 import TaskLog from '@/components/log/task/index.vue';
 import DockerRestart from '@/components/docker-proxy/docker-restart.vue';
 import { loadDockerStatus } from '@/api/modules/container';
-import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
+import { toRef, computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import { useElementSize } from '@vueuse/core';
 import { ElMessageBox } from 'element-plus';
 import { Expand, Loading, Lock, Refresh } from '@element-plus/icons-vue';
@@ -405,7 +405,6 @@ const showFirewallUnavailablePrompt = computed(
 const firewallVersion = ref('');
 const selectedRuleFilters = ref<RuleFilter[]>(loadCachedFilterValues(ruleFilterStorageKey, ruleFilterOptions, []));
 const searchName = ref('');
-useSearchPersistence('host/firewall/rule/index', { search: searchName });
 const inventoryItems = ref<Firewall.InventoryItem[]>([]);
 const positionRanges = ref<Partial<Record<Firewall.Family, Firewall.PositionRange>>>({});
 const inventoryTotal = ref(0);
@@ -433,6 +432,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-rule-page-size')) || 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const providerScopes = (): Firewall.Scope[] => {
     if (provider.value === 'iptables' || provider.value === 'nftables') {
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue
index d94918e65..6c210f484 100644
--- a/frontend/src/views/host/ssh/log/log.vue
+++ b/frontend/src/views/host/ssh/log/log.vue
@@ -93,11 +93,11 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { dateFormatServerTimezone } from '@/utils/date';
 import { downloadFile } from '@/utils/file';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { cleanSSHLogs, exportSSHLogs, loadSSHLogs } from '@/api/modules/host';
 import { useGlobalStore } from '@/composables/useGlobalStore';
 import i18n from '@/lang';
@@ -120,7 +120,7 @@ const exportConfig = reactive({
     status: 'All',
 });
 const searchInfo = ref();
-useSearchPersistence('host/ssh/log/log', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchStatus = ref('All');
 
 const search = async () => {
diff --git a/frontend/src/views/host/ssh/session/index.vue b/frontend/src/views/host/ssh/session/index.vue
index 0389420e3..f67d6b5b8 100644
--- a/frontend/src/views/host/ssh/session/index.vue
+++ b/frontend/src/views/host/ssh/session/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import FireRouter from '@/views/host/ssh/index.vue';
 import { toRef, ref, onMounted, onUnmounted, reactive } from 'vue';
 import i18n from '@/lang';
@@ -38,7 +38,7 @@ const sshSearch = reactive({
     type: 'ssh',
     loginUser: '',
 });
-useSearchPersistence('host/ssh/session/index', { search: toRef(sshSearch, 'loginUser') });
+useSearchReset({ search: toRef(sshSearch, 'loginUser') }, { onRevisit: () => search() });
 
 const buttons = [
     {
diff --git a/frontend/src/views/log/host-system/index.vue b/frontend/src/views/log/host-system/index.vue
index 5bac4b411..5461af0e8 100644
--- a/frontend/src/views/log/host-system/index.vue
+++ b/frontend/src/views/log/host-system/index.vue
@@ -101,7 +101,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import { Log } from '@/api/interface/log';
 import { getSystemLogStatus, listRunningServices, readSystemLogs } from '@/api/modules/log';
@@ -114,7 +114,7 @@ const logs = ref<Log.SystemLogItem[]>([]);
 const loading = ref(false);
 const watching = ref(false);
 const keyword = ref('');
-useSearchPersistence('log/host-system/index', { keyword });
+useSearchReset({ keyword }, { onRevisit: () => scheduleFilterSearch() });
 const priority = ref('');
 const service = ref('');
 const services = ref<string[]>([]);
@@ -274,11 +274,13 @@ onUnmounted(() => {
     if (filterTimer) clearTimeout(filterTimer);
 });
 
-watch([keyword, priority, service], () => {
+const scheduleFilterSearch = () => {
     requestID++;
     if (filterTimer) clearTimeout(filterTimer);
     filterTimer = setTimeout(resetAndLoadLogs, 300);
-});
+};
+
+watch([keyword, priority, service], scheduleFilterSearch);
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend/src/views/log/login/index.vue b/frontend/src/views/log/login/index.vue
index 9e967943c..b82eefd63 100644
--- a/frontend/src/views/log/login/index.vue
+++ b/frontend/src/views/log/login/index.vue
@@ -45,12 +45,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
 import { cleanLogs, getLoginLogs } from '@/api/modules/log';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -67,7 +67,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchPersistence('log/login/index', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchStatus = ref<string>('');
 
 const search = async () => {
diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue
index f95948171..5c1f43d95 100644
--- a/frontend/src/views/log/operation/index.vue
+++ b/frontend/src/views/log/operation/index.vue
@@ -125,12 +125,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
 import { cleanLogs, getOperationLogs } from '@/api/modules/log';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -146,7 +146,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref<string>('');
-useSearchPersistence('log/operation/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchGroup = ref<string>('');
 const searchStatus = ref<string>('');
 const searchNode = ref<string>('');
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
index 5e089d6ac..45da42208 100644
--- a/frontend/src/views/setting/backup-account/index.vue
+++ b/frontend/src/views/setting/backup-account/index.vue
@@ -120,7 +120,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, ref } from 'vue';
 import { searchBackup, deleteBackup, refreshToken } from '@/api/modules/backup';
@@ -143,7 +143,10 @@ const paginationConfig = reactive({
     type: '',
     name: '',
 });
-useSearchPersistence('setting/backup-account/index', { search: toRef(paginationConfig, 'name') });
+useSearchReset(
+    { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const opRef = ref();
 const dialogRef = ref();
 const detailRef = ref();
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
index 2f1ec2aa9..9a4246c2b 100644
--- a/frontend/src/views/setting/snapshot/index.vue
+++ b/frontend/src/views/setting/snapshot/index.vue
@@ -225,7 +225,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import {
     searchSnapshotPage,
     snapshotDelete,
@@ -233,7 +233,7 @@ import {
     snapshotRollback,
     updateSnapshotDescription,
 } from '@/api/modules/setting';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { computeSize } from '@/utils/size';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
@@ -261,7 +261,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('setting/snapshot/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
index 8fa1c839d..f4350a2d5 100644
--- a/frontend/src/views/terminal/command/index.vue
+++ b/frontend/src/views/terminal/command/index.vue
@@ -100,13 +100,13 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Command } from '@/api/interface/command';
 import GroupDialog from '@/components/group/index.vue';
 import OperateDialog from '@/views/terminal/command/operate/index.vue';
 import ImportDialog from '@/views/terminal/command/import/index.vue';
 import { editCommand, deleteCommand, getCommandPage, exportCommands } from '@/api/modules/command';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { getGroupList } from '@/api/modules/group';
@@ -124,7 +124,7 @@ const paginationConfig = reactive({
     order: 'ascending',
 });
 const info = ref();
-useSearchPersistence('terminal/command/index', { search: info });
+useSearchReset({ search: info, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 const dialogRef = ref();
 const opRef = ref();
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
index fbe9822fb..69a1bb315 100644
--- a/frontend/src/views/terminal/host/index.vue
+++ b/frontend/src/views/terminal/host/index.vue
@@ -79,12 +79,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import GroupDialog from '@/components/agent-group/index.vue';
 import OperateDialog from '@/views/terminal/host/operate/index.vue';
 import { deleteHost, editHostGroup, searchHosts } from '@/api/modules/terminal';
 import { getAgentGroupList } from '@/api/modules/group';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { Host } from '@/api/interface/host';
 import { MsgSuccess } from '@/utils/message';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const info = ref();
-useSearchPersistence('terminal/host/index', { search: info });
+useSearchReset({ search: info, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 
 const opRef = ref();
diff --git a/frontend/src/views/toolbox/clam/index.vue b/frontend/src/views/toolbox/clam/index.vue
index f79176371..b7728f59d 100644
--- a/frontend/src/views/toolbox/clam/index.vue
+++ b/frontend/src/views/toolbox/clam/index.vue
@@ -190,8 +190,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { deleteClam, handleClamScan, searchClam, updateClam, updateClamStatus } from '@/api/modules/toolbox';
@@ -218,7 +218,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('toolbox/clam/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const dialogRef = ref();
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
index fb31d9394..26adbbab2 100644
--- a/frontend/src/views/toolbox/ftp/index.vue
+++ b/frontend/src/views/toolbox/ftp/index.vue
@@ -174,8 +174,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgError, MsgSuccess } from '@/utils/message';
 import { deleteFtp, searchFtp, updateFtp, syncFtp, operateFtp, getFtpBase } from '@/api/modules/toolbox';
@@ -201,7 +201,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('toolbox/ftp/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const form = reactive({
     isActive: true,
diff --git a/frontend/src/views/website/runtime/php/extension-management/index.vue b/frontend/src/views/website/runtime/php/extension-management/index.vue
index 53dc92be7..7183e0f8b 100644
--- a/frontend/src/views/website/runtime/php/extension-management/index.vue
+++ b/frontend/src/views/website/runtime/php/extension-management/index.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Runtime } from '@/api/interface/runtime';
 import { GetPHPExtensions, InstallPHPExtension, UnInstallPHPExtension } from '@/api/modules/runtime';
 import i18n from '@/lang';
@@ -49,7 +49,7 @@ const supportExtensions = ref([]);
 const loading = ref(false);
 const taskLogRef = ref();
 const searchName = ref('');
-useSearchPersistence('website/runtime/php/extension-management/index', { search: searchName });
+useSearchReset({ search: searchName }, { onRevisit: () => searchByName() });
 const data = ref([]);
 
 const handleClose = () => {
diff --git a/frontend/src/views/website/ssl/index.vue b/frontend/src/views/website/ssl/index.vue
index 24fba751a..44eda5ba7 100644
--- a/frontend/src/views/website/ssl/index.vue
+++ b/frontend/src/views/website/ssl/index.vue
@@ -221,7 +221,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { deleteSSL, downloadFile, pushSSLToNode, searchSSL, updateSSL } from '@/api/modules/website';
 import DnsAccount from './dns-account/index.vue';
@@ -287,7 +287,10 @@ const req = reactive({
     orderBy: 'updated_at',
     order: 'descending',
 });
-useSearchPersistence('website/ssl/index', { search: toRef(req, 'domain') });
+useSearchReset(
+    { search: toRef(req, 'domain'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const pushForm = ref({
     id: 0,
     pushNode: true,
diff --git a/frontend/src/views/website/template/index.vue b/frontend/src/views/website/template/index.vue
index de057f9e6..d9463795a 100644
--- a/frontend/src/views/website/template/index.vue
+++ b/frontend/src/views/website/template/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Website } from '@/api/interface/website';
 import { deleteTemplate, searchTemplates } from '@/api/modules/website';
 import TemplateOperate from '@/views/website/template/operate/index.vue';
@@ -67,12 +67,11 @@ import OutputCreate from '@/views/website/template/output/create.vue';
 import OutputList from '@/views/website/template/output/index.vue';
 import { dateFormat } from '@/utils/date';
 import i18n from '@/lang';
-import { reactive, ref, onMounted } from 'vue';
+import { toRef, reactive, ref, onMounted } from 'vue';
 
 const loading = ref(false);
 const data = ref<Website.Template[]>([]);
 const searchName = ref('');
-useSearchPersistence('website/template/index', { search: searchName });
 const opRef = ref();
 const operateRef = ref();
 const outputCreateRef = ref();
@@ -91,6 +90,7 @@ const paginationConfig = reactive({
     pageSize: 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const buttons = [
     {
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 9098803d1..cba937c2e 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -346,7 +346,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import Backups from '@/components/backup/index.vue';
 import UploadDialog from '@/components/upload/index.vue';
 import DefaultServer from '@/views/website/website/default/index.vue';
@@ -451,7 +451,10 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const req = pageState.req;
-useSearchPersistence('website/website/index', { search: toRef(req, 'name') });
+useSearchReset(
+    { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const tableSort = pageState.tableSort;
 
 const goRouter = async (key: string) => {