diff --git a/frontend/src/composables/useSearchReset.ts b/frontend/src/composables/useSearchReset.ts
deleted file mode 100644
index d53cec428..000000000
--- a/frontend/src/composables/useSearchReset.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { storeToRefs } from 'pinia';
-import { onActivated, onDeactivated } from 'vue';
-import GlobalStore from '@/store/modules/global';
-import { bindSearchState, type SearchFields } from '@/utils/search-reset';
-
-interface SearchResetOptions {
-    scope?: () => string | number | undefined;
-    onRevisit: () => unknown;
-}
-
-/** Retain the existing entry point while keeping queries across all page visits. */
-export const useSearchReset = (page: string, fields: SearchFields, options: SearchResetOptions) => {
-    const { currentNode } = storeToRefs(GlobalStore());
-    const restore = bindSearchState(() => {
-        const scope = options.scope?.();
-        if (options.scope && scope === undefined) return undefined;
-        return JSON.stringify([currentNode.value, page, scope ?? '']);
-    }, fields);
-    let deactivated = false;
-    onDeactivated(() => {
-        deactivated = true;
-    });
-    onActivated(() => {
-        if (!deactivated) return;
-        deactivated = false;
-        restore();
-        return options.onRevisit();
-    });
-};
diff --git a/frontend/src/utils/search-reset.ts b/frontend/src/utils/search-reset.ts
index d341299e6..c85a04d3f 100644
--- a/frontend/src/utils/search-reset.ts
+++ b/frontend/src/utils/search-reset.ts
@@ -1,27 +1,30 @@
-import { watch, type Ref } from 'vue';
+import { storeToRefs } from 'pinia';
+import { onActivated, onDeactivated, onScopeDispose, watch, type Ref } from 'vue';
+import GlobalStore from '@/store/modules/global';
 
 export type SearchFields = Record<string, Ref<string | number | undefined>>;
 type SearchValues = Record<string, string | number | undefined>;
 
 /** Shared by normal page visits and edit-return visits; navigation never evicts a query. */
-export const createSearchVisitCache = (storage: () => Storage = () => localStorage) => {
-    const entries = new Map<string, SearchValues>();
+export const createSearchStateStorage = (storage: () => Storage = () => localStorage) => {
+    const unsaved = new Map<string, SearchValues>();
     return {
         save(key: string, values: SearchValues) {
-            entries.set(key, { ...values });
             try {
-                storage().setItem(
-                    `1panel:search-state:v2:${key}`,
-                    JSON.stringify(
-                        Object.fromEntries(Object.entries(values).map(([name, value]) => [name, value ?? null])),
-                    ),
+                const target = storage();
+                const storageKey = `1panel:search-state:v2:${key}`;
+                const serialized = JSON.stringify(
+                    Object.fromEntries(Object.entries(values).map(([name, value]) => [name, value ?? null])),
                 );
+                if (target.getItem(storageKey) !== serialized) target.setItem(storageKey, serialized);
+                unsaved.delete(key);
             } catch {
-                // Keep in-memory state when storage is unavailable or full.
+                // Only failed writes need an in-memory fallback.
+                unsaved.set(key, { ...values });
             }
         },
         read(key: string): SearchValues | undefined {
-            const cached = entries.get(key);
+            const cached = unsaved.get(key);
             if (cached) return { ...cached };
             try {
                 const saved = JSON.parse(storage().getItem(`1panel:search-state:v2:${key}`) || 'null');
@@ -43,20 +46,31 @@ export const createSearchVisitCache = (storage: () => Storage = () => localStora
     };
 };
 
-const visitCache = createSearchVisitCache();
+const searchStorage = createSearchStateStorage();
 
-export const bindSearchState = (key: () => string | undefined, fields: SearchFields, cache = visitCache) => {
+export const bindSearchState = (key: () => string | undefined, fields: SearchFields, storage = searchStorage) => {
     const defaults = Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value]));
+    const names = Object.keys(fields).sort((left, right) => Number(left === 'page') - Number(right === 'page'));
+    let pending: { key: string; values: SearchValues } | undefined;
+    let queued = false;
+    const flush = () => {
+        if (!pending) return;
+        const snapshot = pending;
+        pending = undefined;
+        storage.save(snapshot.key, snapshot.values);
+    };
+    onScopeDispose(flush);
     let restoring = false;
     let activeKey: string | undefined;
     const restore = () => {
+        // Commit the previous node/resource before restoring another one.
+        flush();
         activeKey = key();
         if (!activeKey) return;
-        const saved = cache.read(activeKey) || defaults;
+        const saved = storage.read(activeKey) || defaults;
         restoring = true;
         try {
             // Restore pagination last: search/filter watchers may reset it to page one.
-            const names = Object.keys(fields).sort((left, right) => Number(left === 'page') - Number(right === 'page'));
             for (const name of names) {
                 const value = Object.hasOwn(saved, name) ? saved[name] : defaults[name];
                 const initial = defaults[name];
@@ -71,9 +85,39 @@ export const bindSearchState = (key: () => string | undefined, fields: SearchFie
     watch(
         () => Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value])),
         (values) => {
-            if (!restoring && activeKey) cache.save(activeKey, values);
+            if (restoring || !activeKey) return;
+            pending = { key: activeKey, values };
+            if (queued) return;
+            queued = true;
+            queueMicrotask(() => {
+                queued = false;
+                flush();
+            });
         },
-        { immediate: true, flush: 'sync' },
+        { flush: 'sync' },
     );
-    return restore;
+};
+
+interface SearchStateOptions {
+    scope?: () => string | number | undefined;
+    onRevisit: () => unknown;
+}
+
+/** Keep queries across page visits and reload data when a cached page becomes active. */
+export const useSearchState = (page: string, fields: SearchFields, options: SearchStateOptions) => {
+    const { currentNode } = storeToRefs(GlobalStore());
+    bindSearchState(() => {
+        const scope = options.scope?.();
+        if (options.scope && scope === undefined) return undefined;
+        return JSON.stringify([currentNode.value, page, scope ?? '']);
+    }, fields);
+    let deactivated = false;
+    onDeactivated(() => {
+        deactivated = true;
+    });
+    onActivated(() => {
+        if (!deactivated) return;
+        deactivated = false;
+        return options.onRevisit();
+    });
 };
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 e7e072c12..adb704b14 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { ElMessageBox } from 'element-plus';
@@ -193,7 +193,7 @@ const searching = ref(false);
 const operating = ref('');
 const keyword = ref('');
 const marketKeyword = ref('');
-useSearchReset(
+useSearchState(
     'ai/agents/agent/config/tabs/plugins',
     { keyword, marketKeyword },
     {
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 08faeeeb7..2c7ffb93b 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -169,7 +169,7 @@ const getDefaultMarketSource = (): HermesSkillMarketSource => {
 const marketSource = ref<HermesSkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchReset(
+useSearchState(
     'ai/agents/agent/config/tabs/skills/hermes',
     { installedKeyword, marketKeyword },
     {
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 073c689fa..a0af7561e 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -181,7 +181,7 @@ const getDefaultMarketSource = (): SkillMarketSource => {
 const marketSource = ref<SkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchReset(
+useSearchState(
     'ai/agents/agent/config/tabs/skills/openclaw',
     { installedKeyword, marketKeyword },
     {
diff --git a/frontend/src/views/ai/agents/agent/index.vue b/frontend/src/views/ai/agents/agent/index.vue
index 1d93db15a..b4b7b464f 100644
--- a/frontend/src/views/ai/agents/agent/index.vue
+++ b/frontend/src/views/ai/agents/agent/index.vue
@@ -272,7 +272,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { deleteAgentCheck, pageAgents, resetAgentToken, unbindAgentWebsite, updateAgentRemark } from '@/api/modules/ai';
@@ -400,7 +400,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'ai/agents/agent/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/ai/agents/model/index.vue b/frontend/src/views/ai/agents/model/index.vue
index a39c74aba..899476b3a 100644
--- a/frontend/src/views/ai/agents/model/index.vue
+++ b/frontend/src/views/ai/agents/model/index.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteAgentAccount, getAgentProviders, pageAgentAccounts } from '@/api/modules/ai';
 import { AI } from '@/api/interface/ai';
@@ -111,7 +111,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'ai/agents/model/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/ai/model/ollama/index.vue b/frontend/src/views/ai/model/ollama/index.vue
index 0c08bb52f..fba19897c 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -237,7 +237,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'ai/model/ollama/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index e956dfb0c..2b9614015 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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,7 @@ const req = reactive({
     resource: 'all',
     showCurrentArch: false,
 });
-useSearchReset(
+useSearchState(
     'app-store/apps/index',
     { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search(req) },
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index d01b74cd0..7b796be85 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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,7 @@ const searchReq = reactive({
     update: false,
     sync: false,
 });
-useSearchReset(
+useSearchState(
     'app-store/installed/index',
     { search: toRef(searchReq, 'name'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
index a5eb61e6a..5afc825ea 100644
--- a/frontend/src/views/container/compose/index.vue
+++ b/frontend/src/views/container/compose/index.vue
@@ -522,7 +522,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { computed, h, ref } from 'vue';
 import CodemirrorPro from '@/components/codemirror-pro/index.vue';
 import ContainerLog from '@/components/log/container/index.vue';
@@ -577,7 +577,7 @@ const dialogBackupRef = ref();
 const uploadRef = ref();
 
 const searchName = ref('');
-useSearchReset('container/compose/index', { search: searchName }, { onRevisit: () => search() });
+useSearchState('container/compose/index', { 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 c4799d5d0..c82d052a9 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -551,7 +551,7 @@ const taskLogRef = ref();
 
 const tags = ref([]);
 const activeTag = ref('all');
-useSearchReset(
+useSearchState(
     'container/container/index',
     {
         search: searchName,
diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
index cf085b8ce..31dd5123f 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, reactive, ref, computed } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
@@ -200,7 +200,7 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
-useSearchReset(
+useSearchState(
     'container/image/index',
     { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue
index fc6ff293f..75e917bac 100644
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import CreateDialog from '@/views/container/network/create/index.vue';
 import DetailDrawer from '@/views/container/network/detail/index.vue';
 import { toRef, reactive, ref } from 'vue';
@@ -121,7 +121,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'container/network/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue
index c05a7b63f..da9de6173 100644
--- a/frontend/src/views/container/repo/index.vue
+++ b/frontend/src/views/container/repo/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import OperatorDialog from '@/views/container/repo/operator/index.vue';
 import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
@@ -78,7 +78,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'container/repo/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/container/template/index.vue b/frontend/src/views/container/template/index.vue
index 4ce10f18d..8f3921a9d 100644
--- a/frontend/src/views/container/template/index.vue
+++ b/frontend/src/views/container/template/index.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, reactive, ref } from 'vue';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { downloadWithContent } from '@/utils/file';
@@ -111,7 +111,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'container/template/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/container/volume/index.vue b/frontend/src/views/container/volume/index.vue
index 4c053fca7..2ed360c2a 100644
--- a/frontend/src/views/container/volume/index.vue
+++ b/frontend/src/views/container/volume/index.vue
@@ -124,7 +124,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -158,7 +158,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'container/volume/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/cronjob/cronjob/index.vue b/frontend/src/views/cronjob/cronjob/index.vue
index 1d5158d5b..66dbbacc2 100644
--- a/frontend/src/views/cronjob/cronjob/index.vue
+++ b/frontend/src/views/cronjob/cronjob/index.vue
@@ -272,7 +272,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -332,7 +332,7 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const { defaultGroupID, searchName, searchGroupID } = toRefs(pageState);
-useSearchReset(
+useSearchState(
     'cronjob/cronjob/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/cronjob/library/index.vue b/frontend/src/views/cronjob/library/index.vue
index 935078de2..d1c8f07ad 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { deepCopy } from '@/utils/misc';
 import { newUUID } from '@/utils/id';
@@ -170,7 +170,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchReset(
+useSearchState(
     'cronjob/library/index',
     { search: searchInfo, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/mongodb/index.vue b/frontend/src/views/database/mongodb/index.vue
index db7aee049..7f7a885cf 100644
--- a/frontend/src/views/database/mongodb/index.vue
+++ b/frontend/src/views/database/mongodb/index.vue
@@ -323,7 +323,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, nextTick, onMounted, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { getRandomStr } from '@/utils/id';
@@ -399,7 +399,7 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
-useSearchReset(
+useSearchState(
     'database/mongodb/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/mongodb/remote/index.vue b/frontend/src/views/database/mongodb/remote/index.vue
index 036491cb8..e7331368b 100644
--- a/frontend/src/views/database/mongodb/remote/index.vue
+++ b/frontend/src/views/database/mongodb/remote/index.vue
@@ -75,7 +75,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
@@ -101,7 +101,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/mongodb/remote/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index e60a01b91..c13b1eb6f 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -301,7 +301,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/mysql/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue
index 1d54716d0..1e66e5215 100644
--- a/frontend/src/views/database/mysql/remote/index.vue
+++ b/frontend/src/views/database/mysql/remote/index.vue
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/mysql/remote/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/postgresql/index.vue b/frontend/src/views/database/postgresql/index.vue
index d96bea1e8..93d1906da 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -313,7 +313,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/postgresql/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/postgresql/remote/index.vue b/frontend/src/views/database/postgresql/remote/index.vue
index 5932921d7..60019d86e 100644
--- a/frontend/src/views/database/postgresql/remote/index.vue
+++ b/frontend/src/views/database/postgresql/remote/index.vue
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/postgresql/remote/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/database/redis/remote/index.vue b/frontend/src/views/database/redis/remote/index.vue
index ec381e253..3ef0bd196 100644
--- a/frontend/src/views/database/redis/remote/index.vue
+++ b/frontend/src/views/database/redis/remote/index.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
@@ -99,7 +99,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'database/redis/remote/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index cf8151a76..770670000 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import {
     addFavorite,
@@ -985,7 +985,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('file-page-size')) || 100,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'host/file-management/index',
     { search: toRef(req, 'search'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/host/firewall/docker/index.vue b/frontend/src/views/host/firewall/docker/index.vue
index 7838d1e45..2401705e0 100644
--- a/frontend/src/views/host/firewall/docker/index.vue
+++ b/frontend/src/views/host/firewall/docker/index.vue
@@ -219,7 +219,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -263,7 +263,7 @@ const openRuleTask = (taskID: string) => taskLogRef.value?.openWithTaskID(taskID
 const orphanDrawerVisible = ref(false);
 const orphanSearchName = ref('');
 const searchName = ref('');
-useSearchReset(
+useSearchState(
     'host/firewall/docker/index',
     { search: searchName },
     {
diff --git a/frontend/src/views/host/firewall/forward/index.vue b/frontend/src/views/host/firewall/forward/index.vue
index 1e1b88db6..79f60637e 100644
--- a/frontend/src/views/host/firewall/forward/index.vue
+++ b/frontend/src/views/host/firewall/forward/index.vue
@@ -117,7 +117,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import OperateDialog from './operate/index.vue';
 import ImportDialog from './import/index.vue';
 import FireRouter from '@/views/host/firewall/index.vue';
@@ -188,7 +188,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-forward-page-size')) || 20,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'host/firewall/forward/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/host/firewall/rule/index.vue b/frontend/src/views/host/firewall/rule/index.vue
index 65ccc0482..891d244df 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { Firewall } from '@/api/interface/firewall';
 import type { FuTableOperationButton } from '@/components/table/shared';
 import { buildHostRuleExport } from './transfer';
@@ -432,7 +432,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-rule-page-size')) || 20,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'host/firewall/rule/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue
index 4d37eb8e1..44c0e1cc2 100644
--- a/frontend/src/views/host/ssh/log/log.vue
+++ b/frontend/src/views/host/ssh/log/log.vue
@@ -93,7 +93,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { dateFormatServerTimezone } from '@/utils/date';
 import { downloadFile } from '@/utils/file';
@@ -120,7 +120,7 @@ const exportConfig = reactive({
     status: 'All',
 });
 const searchInfo = ref();
-useSearchReset(
+useSearchState(
     'host/ssh/log/log',
     { search: searchInfo, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/host/ssh/session/index.vue b/frontend/src/views/host/ssh/session/index.vue
index ec4432cff..37ef845e9 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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: '',
 });
-useSearchReset('host/ssh/session/index', { search: toRef(sshSearch, 'loginUser') }, { onRevisit: () => search() });
+useSearchState('host/ssh/session/index', { 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 7fb809894..538167cc2 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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('');
-useSearchReset('log/host-system/index', { keyword }, { onRevisit: () => scheduleFilterSearch() });
+useSearchState('log/host-system/index', { keyword }, { onRevisit: () => scheduleFilterSearch() });
 const priority = ref('');
 const service = ref('');
 const services = ref<string[]>([]);
diff --git a/frontend/src/views/log/login/index.vue b/frontend/src/views/log/login/index.vue
index 2264a70c6..245706489 100644
--- a/frontend/src/views/log/login/index.vue
+++ b/frontend/src/views/log/login/index.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
@@ -67,7 +67,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchReset(
+useSearchState(
     'log/login/index',
     { search: searchInfo, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue
index b51d1122c..78e73013c 100644
--- a/frontend/src/views/log/operation/index.vue
+++ b/frontend/src/views/log/operation/index.vue
@@ -139,7 +139,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
@@ -160,7 +160,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref<string>('');
-useSearchReset(
+useSearchState(
     'log/operation/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
index f4f66f6ac..f86364e6b 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, ref } from 'vue';
 import { searchBackup, deleteBackup, refreshToken } from '@/api/modules/backup';
@@ -143,7 +143,7 @@ const paginationConfig = reactive({
     type: '',
     name: '',
 });
-useSearchReset(
+useSearchState(
     'setting/backup-account/index',
     { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
index 4119e864a..cbdbe058c 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import {
     searchSnapshotPage,
     snapshotDelete,
@@ -261,7 +261,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'setting/snapshot/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
index 407f0f945..c1e988d5e 100644
--- a/frontend/src/views/terminal/command/index.vue
+++ b/frontend/src/views/terminal/command/index.vue
@@ -100,7 +100,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { Command } from '@/api/interface/command';
 import GroupDialog from '@/components/group/index.vue';
 import OperateDialog from '@/views/terminal/command/operate/index.vue';
@@ -124,7 +124,7 @@ const paginationConfig = reactive({
     order: 'ascending',
 });
 const info = ref();
-useSearchReset(
+useSearchState(
     'terminal/command/index',
     { search: info, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
index 3fb5e3f08..7c1da6920 100644
--- a/frontend/src/views/terminal/host/index.vue
+++ b/frontend/src/views/terminal/host/index.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const info = ref();
-useSearchReset(
+useSearchState(
     'terminal/host/index',
     { search: info, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/toolbox/clam/index.vue b/frontend/src/views/toolbox/clam/index.vue
index 89fe814a8..3239cf090 100644
--- a/frontend/src/views/toolbox/clam/index.vue
+++ b/frontend/src/views/toolbox/clam/index.vue
@@ -190,7 +190,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
@@ -218,7 +218,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'toolbox/clam/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
index d1b089524..79f3d0486 100644
--- a/frontend/src/views/toolbox/ftp/index.vue
+++ b/frontend/src/views/toolbox/ftp/index.vue
@@ -174,7 +174,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgError, MsgSuccess } from '@/utils/message';
@@ -201,7 +201,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchReset(
+useSearchState(
     'toolbox/ftp/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
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 e0148bcc5..a4222a5b1 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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('');
-useSearchReset(
+useSearchState(
     'website/runtime/php/extension-management/index',
     { search: searchName },
     { onRevisit: () => searchByName() },
diff --git a/frontend/src/views/website/ssl/index.vue b/frontend/src/views/website/ssl/index.vue
index 8c646c348..a1293f24d 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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,7 @@ const req = reactive({
     orderBy: 'updated_at',
     order: 'descending',
 });
-useSearchReset(
+useSearchState(
     'website/ssl/index',
     { search: toRef(req, 'domain'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/website/template/index.vue b/frontend/src/views/website/template/index.vue
index 07e1b7167..89f923a13 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 import { Website } from '@/api/interface/website';
 import { deleteTemplate, searchTemplates } from '@/api/modules/website';
 import TemplateOperate from '@/views/website/template/operate/index.vue';
@@ -90,7 +90,7 @@ const paginationConfig = reactive({
     pageSize: 20,
     total: 0,
 });
-useSearchReset(
+useSearchState(
     'website/template/index',
     { search: searchName, page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 0f70229ab..a35bfa79e 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 { useSearchReset } from '@/composables/useSearchReset';
+import { useSearchState } from '@/utils/search-reset';
 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,7 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const req = pageState.req;
-useSearchReset(
+useSearchState(
     'website/website/index',
     { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
     { onRevisit: () => search() },