lxm_front/tmagic-editor
1
0
Fork 0
mirror of synced 2026-04-04 23:38:37 +08:00
Code Issues Projects Releases Wiki Activity

feat(data-source,editor): http数据源params,data,headers支持函数配置

Browse Source
This commit is contained in:
roymondchen
2024-11-22 18:21:51 +08:00
committed by roymondchen
parent 7a47315bc1
commit 03942dc49e
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/data-source/src/data-sources/Http.ts
View File

@@ -18,7 +18,7 @@
import type { HttpOptions, RequestFunction } from '@tmagic/core';
import { getValueByKeyPath } from '@tmagic/core';
import { DataSourceOptions, HttpDataSourceSchema } from '@data-source/types';
import type { DataSourceOptions, HttpDataSourceSchema, HttpOptionsSchema } from '@data-source/types';
import DataSource from './Base';
@@ -74,7 +74,7 @@ export default class HttpDataSource extends DataSource<HttpDataSourceSchema> {
code?: string | number;
};
/** 请求配置 */
public httpOptions: HttpOptions;
public httpOptions: HttpOptionsSchema;
/** 请求函数 */
#fetch?: RequestFunction;
@@ -115,7 +115,7 @@ export default class HttpDataSource extends DataSource<HttpDataSourceSchema> {
public async init() {
if (this.schema.autoFetch) {
await this.request(this.httpOptions);
await this.request();
}
super.init();
@@ -124,8 +124,14 @@ export default class HttpDataSource extends DataSource<HttpDataSourceSchema> {
public async request(options: Partial<HttpOptions> = {}) {
this.isLoading = true;
let reqOptions = {
...this.httpOptions,
const { url, params, data, headers, ...otherHttpOptions } = this.httpOptions;
let reqOptions: HttpOptions = {
url: typeof url === 'function' ? url({ app: this.app, dataSource: this }) : url,
params: typeof params === 'function' ? params({ app: this.app, dataSource: this }) : params,
data: typeof data === 'function' ? data({ app: this.app, dataSource: this }) : data,
headers: typeof headers === 'function' ? headers({ app: this.app, dataSource: this }) : headers,
...otherHttpOptions,
...options,
};

18
packages/data-source/src/types.ts
View File

@@ -1,4 +1,4 @@
import type { DataSourceSchema, default as TMagicApp, HttpOptions, RequestFunction } from '@tmagic/core';
import type { DataSourceSchema, default as TMagicApp, HttpOptions, Method, RequestFunction } from '@tmagic/core';
import type DataSource from './data-sources/Base';
import type HttpDataSource from './data-sources/Http';
@@ -16,9 +16,23 @@ export interface DataSourceOptions<T extends DataSourceSchema = DataSourceSchema
[key: string]: any;
}
export interface HttpOptionsSchema {
/** 请求链接 */
url: string | ((data: { app: TMagicApp; dataSource: HttpDataSource }) => string);
/** query参数 */
params?: Record<string, string> | ((data: { app: TMagicApp; dataSource: HttpDataSource }) => Record<string, string>);
/** body数据 */
data?: Record<string, any> | ((data: { app: TMagicApp; dataSource: HttpDataSource }) => Record<string, string>);
/** 请求头 */
headers?: Record<string, string> | ((data: { app: TMagicApp; dataSource: HttpDataSource }) => Record<string, string>);
/** 请求方法 GET/POST */
method?: Method;
[key: string]: any;
}
export interface HttpDataSourceSchema extends DataSourceSchema {
type: 'http';
options: HttpOptions;
options: HttpOptionsSchema;
responseOptions?: {
dataPath?: string;
};