diff --git a/package.json b/package.json index 91757f43..fb0a5369 100644 --- a/package.json +++ b/package.json @@ -66,5 +66,10 @@ "engines": { "node": ">=20.0.0", "pnpm": ">=9.0.0" + }, + "pnpm": { + "patchedDependencies": { + "vue-request@2.0.4": "patches/vue-request@2.0.4.patch" + } } } \ No newline at end of file diff --git a/patches/vue-request@2.0.4.patch b/patches/vue-request@2.0.4.patch new file mode 100644 index 00000000..c1d9385a --- /dev/null +++ b/patches/vue-request@2.0.4.patch @@ -0,0 +1,43 @@ +diff --git a/CHANGELOG.md b/CHANGELOG.md +deleted file mode 100644 +index d8211cb2878a897638fa9388fdde6788e2d7c509..0000000000000000000000000000000000000000 +diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md +deleted file mode 100644 +index ba64ecd5c9280d350fd865a298d03f03722c3797..0000000000000000000000000000000000000000 +diff --git a/README-en_US.md b/README-en_US.md +deleted file mode 100644 +index dd6678fed1142bea8d86b2dd92ad6a53332e592f..0000000000000000000000000000000000000000 +diff --git a/dist/index.cjs.js b/dist/index.cjs.js +index b3b8208c8ac04c4e056115c5a0efa46a7fbfb39c..e43868b41b48cb56ecf7b4daa79cd3df29606ccf 100644 +--- a/dist/index.cjs.js ++++ b/dist/index.cjs.js +@@ -1168,6 +1168,7 @@ function useRequest(service, options, plugins) { + + function usePagination(service) { + let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; ++ let plugins = arguments[2] + const defaultPaginationOptions = { + currentKey: 'current', + pageSizeKey: 'pageSize', +@@ -1196,7 +1197,7 @@ function usePagination(service) { + params, + run, + ...rest +- } = useRequest(service, finallyOptions); ++ } = useRequest(service, finallyOptions, plugins); + const paging = paginationParams => { + const [oldPaginationParams, ...restParams] = params.value || []; + const newPaginationParams = { +diff --git a/dist/types/index.d.ts b/dist/types/index.d.ts +index ac0223505e0f07a59c66e7e8fdf4f886c1575de5..537e21159124531a5bc7aafd8d461119bb9733a8 100644 +--- a/dist/types/index.d.ts ++++ b/dist/types/index.d.ts +@@ -20,7 +20,7 @@ interface PaginationQueryResult extends QueryResult void; + changePagination: (current: number, pageSize: number) => void; + } +-declare function usePagination(service: Service, options?: PaginationOptions): PaginationQueryResult; ++declare function usePagination(service: Service, options?: PaginationOptions, plugins?: PluginImplementType[]): PaginationQueryResult; + + type CacheData = { + data: R; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 091bdbd8..e03aed48 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + vue-request@2.0.4: + hash: imva7qnbqmkxs76or73cwn5jom + path: patches/vue-request@2.0.4.patch + importers: .: @@ -64,7 +69,7 @@ importers: version: 9.13.1(vue@3.4.37(typescript@5.5.4)) vue-request: specifier: ^2.0.4 - version: 2.0.4(vue@3.4.37(typescript@5.5.4)) + version: 2.0.4(patch_hash=imva7qnbqmkxs76or73cwn5jom)(vue@3.4.37(typescript@5.5.4)) vue-router: specifier: ^4.4.3 version: 4.4.3(vue@3.4.37(typescript@5.5.4)) @@ -5174,7 +5179,7 @@ snapshots: '@vue/devtools-api': 6.6.1 vue: 3.4.37(typescript@5.5.4) - vue-request@2.0.4(vue@3.4.37(typescript@5.5.4)): + vue-request@2.0.4(patch_hash=imva7qnbqmkxs76or73cwn5jom)(vue@3.4.37(typescript@5.5.4)): dependencies: vue: 3.4.37(typescript@5.5.4) vue-demi: 0.14.10(vue@3.4.37(typescript@5.5.4)) diff --git a/src/App.vue b/src/App.vue index 2cae17bb..0f6a7049 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,7 +58,7 @@ import pageHeader from './components/pageHeader.vue' import { useI18n } from 'vue-i18n' import { ArcoI18nMessages } from './locale' import { useEndpointStore, isModuleEnable } from './stores/endpoint' -import { computed, defineAsyncComponent } from 'vue' +import { computed, defineAsyncComponent, watch } from 'vue' import './transition.less' const endPointStore = useEndpointStore() diff --git a/src/components/autoUpdateBtn.vue b/src/components/autoUpdateBtn.vue index 2a4b6948..b351c227 100644 --- a/src/components/autoUpdateBtn.vue +++ b/src/components/autoUpdateBtn.vue @@ -1,11 +1,14 @@