Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

2025-12-11 11:56:46 +08:00 · 2023-01-31 18:42:48 +08:00
parent 42fe8a07ec 08772c14f8
commit 409bc0819a
5 changed files with 88 additions and 122 deletions
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -121,11 +121,17 @@ export function usePage(_url, params, init = true) {
    })

    if (isRef(params)) {
-        watch(params, () => {
+        watch(params.value, () => {
            fetch()
        })
    }

+    if (isRef(_url)) {
+        watchEffect(fetch)
+    } else {
+        init && fetch()
+    }
+
    function reset(){
        state.data = []
        state.loading = false
@@ -142,12 +148,6 @@ export function usePage(_url, params, init = true) {
        })
    }

-    if (isRef(_url)) {
-        watchEffect(fetch)
-    } else {
-        init && fetch()
-    }
-
    return {
        ...toRefs(state),
        fetch,