diff --git a/packages/datasource-mtop-handler/package.json b/packages/datasource-mtop-handler/package.json index a62bfb847..f8f12da7b 100644 --- a/packages/datasource-mtop-handler/package.json +++ b/packages/datasource-mtop-handler/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-datasource-mtop-handler", - "version": "1.0.21", + "version": "1.0.22-alpha.1", "main": "lib/index.js", "module": "es/index.js", "typings": "es/index.d.ts", @@ -16,7 +16,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@ali/lowcode-datasource-types": "^1.0.21", + "@ali/lowcode-datasource-types": "^1.0.22-alpha.2", "@ali/universal-mtop": "^5.1.9", "typescript": "^3.9.7" }, diff --git a/packages/datasource-mtop-handler/src/index.ts b/packages/datasource-mtop-handler/src/index.ts index a508f394e..db11cfc76 100644 --- a/packages/datasource-mtop-handler/src/index.ts +++ b/packages/datasource-mtop-handler/src/index.ts @@ -16,7 +16,7 @@ export function createMtopHandler(config?: MTopConfig) { // eslint-disable-next-line space-before-function-paren return async function(options: RuntimeOptionsConfig): Promise<{ data: T }> { const response = await mtopRequest.request({ - api: options.uri, + api: options.uri || options.api, // 兼容老的结构 v: (options.v as string) || '1.0', data: options.params, type: (options.method as Method) || 'get', diff --git a/packages/datasource-types/package.json b/packages/datasource-types/package.json index fba3c15db..ce01675d8 100644 --- a/packages/datasource-types/package.json +++ b/packages/datasource-types/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-datasource-types", - "version": "1.0.21", + "version": "1.0.22-alpha.2", "main": "lib/index.js", "module": "es/index.js", "typings": "es/index.d.ts", diff --git a/packages/datasource-types/src/data-source-interpret.ts b/packages/datasource-types/src/data-source-interpret.ts index be28117f7..0c303b55f 100644 --- a/packages/datasource-types/src/data-source-interpret.ts +++ b/packages/datasource-types/src/data-source-interpret.ts @@ -30,6 +30,7 @@ export interface InterpretDataSourceConfig { shouldFetch?: JSFunction; options?: { uri: string | JSExpression; + api?: string | JSExpression; // 兼容 params?: JSONObject | JSExpression; method?: string | JSExpression; isCors?: boolean | JSExpression; diff --git a/packages/datasource-types/src/data-source-runtime.ts b/packages/datasource-types/src/data-source-runtime.ts index 878039340..191492737 100644 --- a/packages/datasource-types/src/data-source-runtime.ts +++ b/packages/datasource-types/src/data-source-runtime.ts @@ -38,6 +38,7 @@ export type RuntimeOptions = () => RuntimeOptionsConfig; export interface RuntimeOptionsConfig { uri: string; + api?: string; params?: Record; method?: string; isCors?: boolean;