From 8f5d0ce6ee9fd348ce94825419493bc5babb68b0 Mon Sep 17 00:00:00 2001
From: "guokai.jgk" <guokai.jgk@alibaba-inc.com>
Date: Wed, 18 Nov 2020 14:14:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=A4=A7=E5=8E=85=E5=B7=B2=E6=9C=89=E7=9A=84=E7=9A=84=20api=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/datasource-mtop-handler/src/index.ts          | 2 +-
 packages/datasource-types/src/data-source-interpret.ts | 1 +
 packages/datasource-types/src/data-source-runtime.ts   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

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<T = unknown>(config?: MTopConfig) {
   // eslint-disable-next-line space-before-function-paren
   return async function(options: RuntimeOptionsConfig): Promise<{ data: T }> {
     const response = await mtopRequest.request<T>({
-      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/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<string, unknown>;
   method?: string;
   isCors?: boolean;