test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7182 from lurunze1226/chore-jsonql-req

Browse Source 
chore: JSONQL请求支持追加 data 中的变量到 query 中
This commit is contained in:
hsm-lv 2023-06-16 13:46:09 +08:00 committed by GitHub
commit 321e66347c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/amis-core/src/utils/api.ts
View File

@ -1,3 +1,4 @@
import {attachmentAdpator} from 'amis-core';
import omit from 'lodash/omit';
import {Api, ApiObject, EventTrack, fetcherResult, Payload} from '../types';
import {fetcherConfig} from '../factory';
@ -143,6 +144,30 @@ export function buildApi(
}
: undefined
);
/** 追加data到请求的Query中 */
const attachDataToQuery = (
apiObject: ApiObject,
ctx: Record<string, any>
) => {
const idx = apiObject.url.indexOf('?');
if (~idx) {
const params = (apiObject.query = {
...qsparse(apiObject.url.substring(idx + 1)),
...apiObject.query,
...ctx
});
apiObject.url =
apiObject.url.substring(0, idx) + '?' + queryStringify(params);
} else {
apiObject.query = {...apiObject.query, ...ctx};
const query = queryStringify(ctx);
if (query) {
apiObject.url = `${apiObject.url}?${query}`;
}
}
return apiObject;
};
if (~idx) {
const hashIdx = url.indexOf('#');
@ -217,39 +242,11 @@ export function buildApi(
api.data &&
((!~raw.indexOf('$') && autoAppend) || api.forceAppendDataToQuery)
) {
const idx = api.url.indexOf('?');
if (~idx) {
let params = (api.query = {
...qsparse(api.url.substring(idx + 1)),
...api.query,
...data
});
api.url = api.url.substring(0, idx) + '?' + queryStringify(params);
} else {
api.query = {...api.query, ...data};
const query = queryStringify(data);
if (query) {
api.url = `${api.url}?${query}`;
}
}
api = attachDataToQuery(api, data);
}
if (api.data && api.attachDataToQuery !== false) {
const idx = api.url.indexOf('?');
if (~idx) {
let params = (api.query = {
...qsparse(api.url.substring(idx + 1)),
...api.query,
...api.data
});
api.url = api.url.substring(0, idx) + '?' + queryStringify(params);
} else {
api.query = {...api.query, ...api.data};
const query = queryStringify(api.query);
if (query) {
api.url = `${api.url}?${query}`;
}
}
api = attachDataToQuery(api, data);
delete api.data;
}
}
@ -302,6 +299,11 @@ export function buildApi(
jsonql: api.jsonql
}
: api.jsonql;
/** JSONQL所有method需要追加data中的变量到query中 */
if (api.forceAppendDataToQuery) {
api = attachDataToQuery(api, data);
}
}
return api;