diff --git a/openapi-ts-request.config.ts b/openapi-ts-request.config.ts index fd2fe11..37216cf 100644 --- a/openapi-ts-request.config.ts +++ b/openapi-ts-request.config.ts @@ -5,8 +5,8 @@ export default defineConfig([ describe: 'unibest-openapi-test', schemaPath: 'https://ukw0y1.laf.run/unibest-opapi-test.json', serversPath: './src/service', - requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions } from '@/http/types';`, - requestOptionsType: 'CustomRequestOptions', + requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions_ } from '@/http/types';`, + requestOptionsType: 'CustomRequestOptions_', isGenReactQuery: false, reactQueryMode: 'vue', isGenJavaScript: false, diff --git a/src/http/types.ts b/src/http/types.ts index 42ac8e9..8187822 100644 --- a/src/http/types.ts +++ b/src/http/types.ts @@ -7,6 +7,9 @@ export type CustomRequestOptions = UniApp.RequestOptions & { hideErrorToast?: boolean } & IUniUploadFileOptions // 添加uni.uploadFile参数类型 +/** 主要提供给 openapi-ts-request 生成的代码使用 */ +export type CustomRequestOptions_ = Omit + export interface HttpRequestResult { promise: Promise requestTask: UniApp.RequestTask diff --git a/src/service/info.ts b/src/service/info.ts index 8ef6951..fe09da5 100644 --- a/src/service/info.ts +++ b/src/service/info.ts @@ -1,12 +1,12 @@ /* eslint-disable */ // @ts-ignore import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/types'; +import { CustomRequestOptions_ } from '@/http/types'; import * as API from './types'; /** 用户信息 GET /user/info */ -export function infoUsingGet({ options }: { options?: CustomRequestOptions }) { +export function infoUsingGet({ options }: { options?: CustomRequestOptions_ }) { return request('/user/info', { method: 'GET', ...(options || {}), diff --git a/src/service/listAll.ts b/src/service/listAll.ts index 5847f44..bc1c683 100644 --- a/src/service/listAll.ts +++ b/src/service/listAll.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // @ts-ignore import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/types'; +import { CustomRequestOptions_ } from '@/http/types'; import * as API from './types'; @@ -9,7 +9,7 @@ import * as API from './types'; export function listAllUsingGet({ options, }: { - options?: CustomRequestOptions; + options?: CustomRequestOptions_; }) { return request('/user/listAll', { method: 'GET',