github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-26 16:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve merge conflicts

Browse Source
This commit is contained in:
vben
2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/effects/request/package.json
View File

@@ -22,8 +22,7 @@
"dependencies": {
"@vben/locales": "workspace:*",
"@vben/utils": "workspace:*",
"axios": "^1.7.2",
"vue-request": "^2.0.4"
"axios": "^1.7.2"
},
"devDependencies": {
"axios-mock-adapter": "^1.22.0"

1
packages/effects/request/src/index.ts
View File

@@ -1,3 +1,2 @@
export * from './request-client';
export * from './use-request';
export * from 'axios';

11
packages/effects/request/src/use-request.ts
View File

@@ -1,11 +0,0 @@
// import { setGlobalOptions, } from 'vue-request';
// setGlobalOptions({
// manual: true,
// // ...
// });
/**
* @see https://www.attojs.com/guide/documentation/globalOptions.html
*/
export * from 'vue-request';