From b9a562eeaba66adaefea22a95a44b04879f68f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Sun, 30 Aug 2020 00:32:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E6=8C=89=20826=20?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E7=BB=93=E8=AE=BA=E8=B0=83=E6=95=B4=E5=87=BA?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=95=B0=E6=8D=AE=E6=BA=90=E5=BC=95=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/rax/containerInjectContext.ts   | 44 ++++---------------
 .../src/plugins/component/rax/jsx.ts          |  6 ++-
 .../framework/rax/plugins/packageJSON.ts      |  1 +
 .../src/plugins/project/i18n.ts               | 21 ++++++++-
 .../demo1/expected/demo-project/package.json  |  1 +
 .../demo1/expected/demo-project/src/i18n.js   | 22 +++++++++-
 .../demo-project/src/pages/Home/index.jsx     | 41 ++++++++---------
 .../demo2/expected/demo-project/package.json  |  1 +
 .../demo2/expected/demo-project/src/i18n.js   | 22 +++++++++-
 .../demo-project/src/pages/Home/index.jsx     | 41 ++++++++---------
 .../test-cases/rax-app/demo2/schema.json5     |  3 +-
 .../demo3/expected/demo-project/package.json  |  1 +
 .../demo3/expected/demo-project/src/i18n.js   | 22 +++++++++-
 .../demo-project/src/pages/Detail/index.jsx   | 41 ++++++++---------
 .../demo-project/src/pages/Home/index.jsx     | 41 ++++++++---------
 .../demo-project/src/pages/List/index.jsx     | 41 ++++++++---------
 .../demo4/expected/demo-project/package.json  |  1 +
 .../demo4/expected/demo-project/src/i18n.js   | 22 +++++++++-
 .../demo-project/src/pages/Home/index.jsx     | 41 ++++++++---------
 .../demo5/expected/demo-project/package.json  |  1 +
 .../demo5/expected/demo-project/src/i18n.js   | 22 +++++++++-
 .../demo-project/src/pages/Home/index.jsx     | 41 ++++++++---------
 .../src/core/DataSourceEngine.ts              | 23 +++-------
 .../src/core/RuntimeDataSource.ts             | 21 +++------
 .../datasource-engine/src/handlers/fetch.ts   |  2 +-
 .../datasource-engine/src/handlers/mtop.ts    |  9 ++--
 .../src/handlers/url-params.ts                | 10 ++---
 .../src/types/DataSourceResponse.ts           |  3 ++
 .../src/types/RequestHandler.ts               |  3 +-
 29 files changed, 316 insertions(+), 232 deletions(-)
 create mode 100644 packages/datasource-engine/src/types/DataSourceResponse.ts

diff --git a/packages/code-generator/src/plugins/component/rax/containerInjectContext.ts b/packages/code-generator/src/plugins/component/rax/containerInjectContext.ts
index 3c993a2cb..1ca20b1b5 100644
--- a/packages/code-generator/src/plugins/component/rax/containerInjectContext.ts
+++ b/packages/code-generator/src/plugins/component/rax/containerInjectContext.ts
@@ -59,11 +59,16 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
         _createContext() {
           const self = this;
 
+          // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+          self._latestState = self.state;
+
           const context = {
             get state() {
-              return self.state;
+              // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+              return self._latestState;
             },
             setState(newState) {
+              self._latestState = { ...self._latestState, ...newState };
               self.setState(newState);
             },
             get dataSourceMap() {
@@ -87,12 +92,9 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
             get constants() {
               return __$$constants;
             },
-            get i18n() {
-              return self._i18n;
-            },
-            getLocale() {
-              return __$$i18n.getLocale();
-            },
+            i18n: __$$i18n.i18n,
+            i18nFormat: __$$i18n.i18nFormat,
+            getLocale: __$$i18n.getLocale,
             setLocale(locale) {
               __$$i18n.setLocale(locale);
               self.forceUpdate();
@@ -106,34 +108,6 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
       linkAfter: [RAX_CHUNK_NAME.ClassRenderEnd],
     });
 
-    next.chunks.push({
-      type: ChunkType.STRING,
-      fileType: cfg.fileType,
-      name: CLASS_DEFINE_CHUNK_NAME.InsVar,
-      content: `
-        _i18n = this._createI18nDelegate();
-      `,
-      linkAfter: [CLASS_DEFINE_CHUNK_NAME.Start],
-    });
-
-    next.chunks.push({
-      type: ChunkType.STRING,
-      fileType: cfg.fileType,
-      name: CLASS_DEFINE_CHUNK_NAME.InsPrivateMethod,
-      content: `
-        _createI18nDelegate() {
-          return new Proxy(
-            {},
-            {
-              get(target, prop) {
-                return __$$i18n.i18n(prop);
-              },
-            },
-          );
-        }
-      `,
-      linkAfter: [RAX_CHUNK_NAME.ClassRenderEnd],
-    });
     return next;
   };
   return plugin;
diff --git a/packages/code-generator/src/plugins/component/rax/jsx.ts b/packages/code-generator/src/plugins/component/rax/jsx.ts
index 497282e39..e7fad7c27 100644
--- a/packages/code-generator/src/plugins/component/rax/jsx.ts
+++ b/packages/code-generator/src/plugins/component/rax/jsx.ts
@@ -126,7 +126,11 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
       type: ChunkType.STRING,
       fileType: cfg.fileType,
       name: RAX_CHUNK_NAME.ClassRenderPre,
-      content: `const __$$context = this._context;`,
+      // TODO: setState, dataSourceMap, reloadDataSource, utils, i18n, i18nFormat, getLocale, setLocale 这些在 Rax 的编译模式下不能在视图中直接访问，需要转化成 this.xxx
+      content: `
+        const __$$context = this._context;
+        const { state, setState, dataSourceMap, reloadDataSource, utils, constants, i18n, i18nFormat, getLocale, setLocale } = __$$context;
+      `,
       linkAfter: [RAX_CHUNK_NAME.ClassRenderBegin],
     });
 
diff --git a/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts b/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
index 63a113d32..c47412f0e 100644
--- a/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
+++ b/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
@@ -35,6 +35,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       dependencies: {
         '@ali/lowcode-datasource-engine': '^0.1.0',
         'universal-env': '^3.2.0',
+        'intl-messageformat': '^9.3.6',
         rax: '^1.1.0',
         'rax-app': '^2.0.0',
         'rax-document': '^0.1.0',
diff --git a/packages/code-generator/src/plugins/project/i18n.ts b/packages/code-generator/src/plugins/project/i18n.ts
index c5dc0911d..df9a497f8 100644
--- a/packages/code-generator/src/plugins/project/i18n.ts
+++ b/packages/code-generator/src/plugins/project/i18n.ts
@@ -24,6 +24,8 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
       fileType: FileType.JS,
       name: COMMON_CHUNK_NAME.FileMainContent,
       content: `
+        import IntlMessageFormat from 'intl-messageformat';
+
         const i18nConfig = ${i18nStr};
 
         let locale = 'en-US';
@@ -34,7 +36,23 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
           locale = target;
         };
 
-        const i18n = key => i18nConfig && i18nConfig[locale] && i18nConfig[locale][key] || '';
+        const i18nFormat = ({ id, defaultMessage }, variables) => {
+          const msg = i18nConfig && i18nConfig[locale] && i18nConfig[locale][id] || defaultMessage;
+          if (msg == null) {
+            console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+            return \`\${id}\`;
+          }
+
+          if (!variables || !variables.length) {
+            return msg;
+          }
+
+          return new IntlMessageFormat(msg, locale).format(variables);
+        }
+
+        const i18n = id => {
+          return i18nFormat({ id });
+        };
       `,
       linkAfter: [
         COMMON_CHUNK_NAME.ExternalDepsImport,
@@ -54,6 +72,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
           getLocale,
           setLocale,
           i18n,
+          i18nFormat,
         };
       `,
       linkAfter: [
diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
index a42398577..0d4d71bb6 100644
--- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@ali/lowcode-datasource-engine": "^0.1.0",
     "universal-env": "^3.2.0",
+    "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
     "rax-app": "^2.0.0",
     "rax-document": "^0.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/i18n.js b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/i18n.js
index 705ba5495..8f0de31e0 100644
--- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/i18n.js
+++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/i18n.js
@@ -1,3 +1,5 @@
+import IntlMessageFormat from 'intl-messageformat';
+
 const i18nConfig = {};
 
 let locale = 'en-US';
@@ -8,6 +10,22 @@ const setLocale = (target) => {
   locale = target;
 };
 
-const i18n = (key) => (i18nConfig && i18nConfig[locale] && i18nConfig[locale][key]) || '';
+const i18nFormat = ({ id, defaultMessage }, variables) => {
+  const msg = (i18nConfig && i18nConfig[locale] && i18nConfig[locale][id]) || defaultMessage;
+  if (msg == null) {
+    console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+    return `${id}`;
+  }
 
-export { getLocale, setLocale, i18n };
+  if (!variables || !variables.length) {
+    return msg;
+  }
+
+  return new IntlMessageFormat(msg, locale).format(variables);
+};
+
+const i18n = (id) => {
+  return i18nFormat({ id });
+};
+
+export { getLocale, setLocale, i18n, i18nFormat };
diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
index e3e89c9b0..f7f5f00c2 100644
--- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
@@ -24,8 +24,6 @@ class Home$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -39,6 +37,18 @@ class Home$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <Page>
@@ -50,11 +60,16 @@ class Home$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -78,12 +93,9 @@ class Home$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -94,17 +106,6 @@ class Home$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
index 70f2530d9..0b4537b56 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@ali/lowcode-datasource-engine": "^0.1.0",
     "universal-env": "^3.2.0",
+    "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
     "rax-app": "^2.0.0",
     "rax-document": "^0.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/i18n.js b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/i18n.js
index 705ba5495..8f0de31e0 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/i18n.js
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/i18n.js
@@ -1,3 +1,5 @@
+import IntlMessageFormat from 'intl-messageformat';
+
 const i18nConfig = {};
 
 let locale = 'en-US';
@@ -8,6 +10,22 @@ const setLocale = (target) => {
   locale = target;
 };
 
-const i18n = (key) => (i18nConfig && i18nConfig[locale] && i18nConfig[locale][key]) || '';
+const i18nFormat = ({ id, defaultMessage }, variables) => {
+  const msg = (i18nConfig && i18nConfig[locale] && i18nConfig[locale][id]) || defaultMessage;
+  if (msg == null) {
+    console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+    return `${id}`;
+  }
 
-export { getLocale, setLocale, i18n };
+  if (!variables || !variables.length) {
+    return msg;
+  }
+
+  return new IntlMessageFormat(msg, locale).format(variables);
+};
+
+const i18n = (id) => {
+  return i18nFormat({ id });
+};
+
+export { getLocale, setLocale, i18n, i18nFormat };
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
index f1dcacb95..66b6ce9a8 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
@@ -47,8 +47,6 @@ class Home$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, {
     runtimeConfig: true,
@@ -74,6 +72,18 @@ class Home$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <View>
@@ -147,11 +157,16 @@ class Home$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -175,12 +190,9 @@ class Home$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -191,17 +203,6 @@ class Home$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return {
diff --git a/packages/code-generator/test-cases/rax-app/demo2/schema.json5 b/packages/code-generator/test-cases/rax-app/demo2/schema.json5
index 9f7778e7f..a9f5813cd 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/schema.json5
+++ b/packages/code-generator/test-cases/rax-app/demo2/schema.json5
@@ -348,10 +348,9 @@
         main: '/clone',
       },
     },
-    // 支持 TNPM
     {
       name: 'Toast',
-      type: 'tnpm',
+      type: 'npm',
       content: {
         package: 'universal-toast',
         version: '^1.2.0',
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
index ab52a96fc..d9842a107 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@ali/lowcode-datasource-engine": "^0.1.0",
     "universal-env": "^3.2.0",
+    "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
     "rax-app": "^2.0.0",
     "rax-document": "^0.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/i18n.js b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/i18n.js
index 705ba5495..8f0de31e0 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/i18n.js
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/i18n.js
@@ -1,3 +1,5 @@
+import IntlMessageFormat from 'intl-messageformat';
+
 const i18nConfig = {};
 
 let locale = 'en-US';
@@ -8,6 +10,22 @@ const setLocale = (target) => {
   locale = target;
 };
 
-const i18n = (key) => (i18nConfig && i18nConfig[locale] && i18nConfig[locale][key]) || '';
+const i18nFormat = ({ id, defaultMessage }, variables) => {
+  const msg = (i18nConfig && i18nConfig[locale] && i18nConfig[locale][id]) || defaultMessage;
+  if (msg == null) {
+    console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+    return `${id}`;
+  }
 
-export { getLocale, setLocale, i18n };
+  if (!variables || !variables.length) {
+    return msg;
+  }
+
+  return new IntlMessageFormat(msg, locale).format(variables);
+};
+
+const i18n = (id) => {
+  return i18nFormat({ id });
+};
+
+export { getLocale, setLocale, i18n, i18nFormat };
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
index c3f22edd7..03a389ab0 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
@@ -30,8 +30,6 @@ class Detail$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -45,6 +43,18 @@ class Detail$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <View>
@@ -61,11 +71,16 @@ class Detail$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -89,12 +104,9 @@ class Detail$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -105,17 +117,6 @@ class Detail$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
index dbd0e81ad..8412a98f6 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
@@ -30,8 +30,6 @@ class Home$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -45,6 +43,18 @@ class Home$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <View>
@@ -61,11 +71,16 @@ class Home$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -89,12 +104,9 @@ class Home$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -105,17 +117,6 @@ class Home$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
index c4e62dd2d..17a49c62f 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
@@ -30,8 +30,6 @@ class List$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -45,6 +43,18 @@ class List$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <View>
@@ -64,11 +74,16 @@ class List$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -92,12 +107,9 @@ class List$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -108,17 +120,6 @@ class List$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
index c8b7cf47b..1510f3c4a 100644
--- a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@ali/lowcode-datasource-engine": "^0.1.0",
     "universal-env": "^3.2.0",
+    "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
     "rax-app": "^2.0.0",
     "rax-document": "^0.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/i18n.js b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/i18n.js
index 705ba5495..8f0de31e0 100644
--- a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/i18n.js
+++ b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/i18n.js
@@ -1,3 +1,5 @@
+import IntlMessageFormat from 'intl-messageformat';
+
 const i18nConfig = {};
 
 let locale = 'en-US';
@@ -8,6 +10,22 @@ const setLocale = (target) => {
   locale = target;
 };
 
-const i18n = (key) => (i18nConfig && i18nConfig[locale] && i18nConfig[locale][key]) || '';
+const i18nFormat = ({ id, defaultMessage }, variables) => {
+  const msg = (i18nConfig && i18nConfig[locale] && i18nConfig[locale][id]) || defaultMessage;
+  if (msg == null) {
+    console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+    return `${id}`;
+  }
 
-export { getLocale, setLocale, i18n };
+  if (!variables || !variables.length) {
+    return msg;
+  }
+
+  return new IntlMessageFormat(msg, locale).format(variables);
+};
+
+const i18n = (id) => {
+  return i18nFormat({ id });
+};
+
+export { getLocale, setLocale, i18n, i18nFormat };
diff --git a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
index 0a93e8574..e5463339e 100644
--- a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
@@ -30,8 +30,6 @@ class Home$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -45,6 +43,18 @@ class Home$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <View>
@@ -58,11 +68,16 @@ class Home$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -86,12 +101,9 @@ class Home$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -102,17 +114,6 @@ class Home$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
index a42398577..0d4d71bb6 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@ali/lowcode-datasource-engine": "^0.1.0",
     "universal-env": "^3.2.0",
+    "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
     "rax-app": "^2.0.0",
     "rax-document": "^0.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/i18n.js b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/i18n.js
index 33f66ab5a..c3e7c955d 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/i18n.js
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/i18n.js
@@ -1,3 +1,5 @@
+import IntlMessageFormat from 'intl-messageformat';
+
 const i18nConfig = {
   'zh-CN': {
     'hello-world': '你好，世界！',
@@ -15,6 +17,22 @@ const setLocale = (target) => {
   locale = target;
 };
 
-const i18n = (key) => (i18nConfig && i18nConfig[locale] && i18nConfig[locale][key]) || '';
+const i18nFormat = ({ id, defaultMessage }, variables) => {
+  const msg = (i18nConfig && i18nConfig[locale] && i18nConfig[locale][id]) || defaultMessage;
+  if (msg == null) {
+    console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale);
+    return `${id}`;
+  }
 
-export { getLocale, setLocale, i18n };
+  if (!variables || !variables.length) {
+    return msg;
+  }
+
+  return new IntlMessageFormat(msg, locale).format(variables);
+};
+
+const i18n = (id) => {
+  return i18nFormat({ id });
+};
+
+export { getLocale, setLocale, i18n, i18nFormat };
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
index 40444b2f2..8a3656bfc 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
@@ -24,8 +24,6 @@ class Home$$Page extends Component {
 
   _context = this._createContext();
 
-  _i18n = this._createI18nDelegate();
-
   _dataSourceConfig = this._defineDataSourceConfig();
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, { runtimeConfig: true });
 
@@ -39,6 +37,18 @@ class Home$$Page extends Component {
 
   render() {
     const __$$context = this._context;
+    const {
+      state,
+      setState,
+      dataSourceMap,
+      reloadDataSource,
+      utils,
+      constants,
+      i18n,
+      i18nFormat,
+      getLocale,
+      setLocale,
+    } = __$$context;
 
     return (
       <Page>
@@ -56,11 +66,16 @@ class Home$$Page extends Component {
   _createContext() {
     const self = this;
 
+    // 保存下最新的状态，这样 setState 可以搞成同步一样的了
+    self._latestState = self.state;
+
     const context = {
       get state() {
-        return self.state;
+        // 这里直接获取最新的 state，从而能避免一些 React/Rax 这样的框架因为异步 setState 而导致的一些问题
+        return self._latestState;
       },
       setState(newState) {
+        self._latestState = { ...self._latestState, ...newState };
         self.setState(newState);
       },
       get dataSourceMap() {
@@ -84,12 +99,9 @@ class Home$$Page extends Component {
       get constants() {
         return __$$constants;
       },
-      get i18n() {
-        return self._i18n;
-      },
-      getLocale() {
-        return __$$i18n.getLocale();
-      },
+      i18n: __$$i18n.i18n,
+      i18nFormat: __$$i18n.i18nFormat,
+      getLocale: __$$i18n.getLocale,
       setLocale(locale) {
         __$$i18n.setLocale(locale);
         self.forceUpdate();
@@ -100,17 +112,6 @@ class Home$$Page extends Component {
     return context;
   }
 
-  _createI18nDelegate() {
-    return new Proxy(
-      {},
-      {
-        get(target, prop) {
-          return __$$i18n.i18n(prop);
-        },
-      },
-    );
-  }
-
   _defineDataSourceConfig() {
     const __$$context = this._context;
     return { list: [] };
diff --git a/packages/datasource-engine/src/core/DataSourceEngine.ts b/packages/datasource-engine/src/core/DataSourceEngine.ts
index 30052ee6c..1d15aeee1 100644
--- a/packages/datasource-engine/src/core/DataSourceEngine.ts
+++ b/packages/datasource-engine/src/core/DataSourceEngine.ts
@@ -17,8 +17,7 @@ export class DataSourceEngine implements IDataSourceEngine {
   ) {
     _dataSourceConfig.list?.forEach((ds) => {
       // 确保数据源都有处理器
-      const requestHandler =
-        ds.requestHandler || _options?.requestHandlersMap?.[ds.type];
+      const requestHandler = ds.requestHandler || _options?.requestHandlersMap?.[ds.type];
       if (!requestHandler) {
         throw new Error(`No request handler for "${ds.type}" data source`);
       }
@@ -51,12 +50,8 @@ export class DataSourceEngine implements IDataSourceEngine {
         }
       }
 
-      await sleep(0); // TODO: 如何优雅地解决 setState 的异步问题？
-
       // 然后是所有其他的
-      const remainDataSourceConfigList = allDataSourceConfigList.filter(
-        (x) => x.type !== 'urlParams',
-      );
+      const remainDataSourceConfigList = allDataSourceConfigList.filter((x) => x.type !== 'urlParams');
 
       // 先发起异步的
       const asyncLoadings: Array<Promise<unknown>> = [];
@@ -65,9 +60,7 @@ export class DataSourceEngine implements IDataSourceEngine {
           const options = getValue(ds.options);
           if (options && !options.isSync) {
             this._dataSourceMap[ds.id].setOptions(options);
-            asyncLoadings.push(
-              this._dataSourceMap[ds.id].load(options?.params).catch(() => {}),
-            );
+            asyncLoadings.push(this._dataSourceMap[ds.id].load(options?.params).catch(() => {}));
           }
         }
       }
@@ -106,18 +99,12 @@ export class DataSourceEngine implements IDataSourceEngine {
   }
 }
 
-export const create: IDataSourceEngineFactory['create'] = (
-  dataSourceConfig,
-  runtimeContext,
-  options,
-) => {
+export const create: IDataSourceEngineFactory['create'] = (dataSourceConfig, runtimeContext, options) => {
   return new DataSourceEngine(dataSourceConfig, runtimeContext, options);
 };
 
 function getValue<T>(valueOrValueGetter: T | (() => T)): T;
-function getValue<T extends boolean>(
-  valueOrValueGetter: T | (() => T),
-): T | undefined {
+function getValue<T extends boolean>(valueOrValueGetter: T | (() => T)): T | undefined {
   if (typeof valueOrValueGetter === 'function') {
     try {
       return valueOrValueGetter();
diff --git a/packages/datasource-engine/src/core/RuntimeDataSource.ts b/packages/datasource-engine/src/core/RuntimeDataSource.ts
index e9ea43e87..8f53b45f7 100644
--- a/packages/datasource-engine/src/core/RuntimeDataSource.ts
+++ b/packages/datasource-engine/src/core/RuntimeDataSource.ts
@@ -1,9 +1,5 @@
-import {
-  DataSourceOptions,
-  IRuntimeDataSource,
-  RequestHandler,
-  RuntimeDataSourceStatus,
-} from '../types';
+import { DataSourceOptions, IRuntimeDataSource, RequestHandler, RuntimeDataSourceStatus } from '../types';
+import { DataSourceResponse } from '../types/DataSourceResponse';
 
 export class RuntimeDataSource<
   TParams extends Record<string, unknown> = Record<string, unknown>,
@@ -19,13 +15,10 @@ export class RuntimeDataSource<
     private _id: string,
     private _type: string,
     private _initialOptions: DataSourceOptions<TParams>,
-    private _requestHandler: RequestHandler<
-      DataSourceOptions<TParams>,
-      TRequestResult
-    >,
+    private _requestHandler: RequestHandler<DataSourceOptions<TParams>, DataSourceResponse<TRequestResult>>,
     private _dataHandler:
       | ((
-          data: TRequestResult | undefined,
+          data: DataSourceResponse<TRequestResult> | undefined,
           error: unknown | undefined,
         ) => TResultData | Promise<TResultData>)
       | undefined,
@@ -79,11 +72,11 @@ export class RuntimeDataSource<
 
   private async _request(options: DataSourceOptions<TParams>) {
     try {
-      const reqResult = await this._requestHandler(options);
+      const response = await this._requestHandler(options);
 
       const data = this._dataHandler
-        ? await this._dataHandler(reqResult, undefined)
-        : ((reqResult as unknown) as TResultData);
+        ? await this._dataHandler(response, undefined)
+        : ((response.data as unknown) as TResultData);
 
       return data;
     } catch (err) {
diff --git a/packages/datasource-engine/src/handlers/fetch.ts b/packages/datasource-engine/src/handlers/fetch.ts
index 3db926c9f..d0f6d344b 100644
--- a/packages/datasource-engine/src/handlers/fetch.ts
+++ b/packages/datasource-engine/src/handlers/fetch.ts
@@ -18,7 +18,7 @@ const fetchHandler: RequestHandler = async ({
 
   const res = await request(reqOptions as RequestOptions);
 
-  return res.data;
+  return res;
 };
 
 export default fetchHandler;
diff --git a/packages/datasource-engine/src/handlers/mtop.ts b/packages/datasource-engine/src/handlers/mtop.ts
index 88ab8e01b..4894b9ad9 100644
--- a/packages/datasource-engine/src/handlers/mtop.ts
+++ b/packages/datasource-engine/src/handlers/mtop.ts
@@ -1,15 +1,18 @@
 import mtop from '@ali/universal-mtop';
 import { RequestHandler } from '../types';
 
-const mtopHandler: RequestHandler = async ({ data, params, ...options }) => {
+const mtopHandler: RequestHandler = async (options) => {
+  const { api, uri, data, params, type, method, ...otherOptions } = options;
   const reqOptions = {
-    ...options,
+    ...otherOptions,
+    api: api || uri,
     data: data || params,
+    type: type || method,
   };
 
   const res = await mtop(reqOptions);
 
-  return res.data;
+  return res;
 };
 
 export default mtopHandler;
diff --git a/packages/datasource-engine/src/handlers/url-params.ts b/packages/datasource-engine/src/handlers/url-params.ts
index d7fbfba3d..c5a37f4bd 100644
--- a/packages/datasource-engine/src/handlers/url-params.ts
+++ b/packages/datasource-engine/src/handlers/url-params.ts
@@ -1,14 +1,12 @@
 import qs from 'query-string';
 import { RequestHandler } from '../types';
 
-export default function urlParamsHandler({
-  search,
-}: {
-  search: string | Record<string, unknown>;
-}): RequestHandler {
+export default function urlParamsHandler({ search }: { search: string | Record<string, unknown> }): RequestHandler {
   const urlParams = typeof search === 'string' ? qs.parse(search) : search;
 
   return async () => {
-    return urlParams;
+    return {
+      data: urlParams,
+    };
   };
 }
diff --git a/packages/datasource-engine/src/types/DataSourceResponse.ts b/packages/datasource-engine/src/types/DataSourceResponse.ts
new file mode 100644
index 000000000..36bd45fff
--- /dev/null
+++ b/packages/datasource-engine/src/types/DataSourceResponse.ts
@@ -0,0 +1,3 @@
+export type DataSourceResponse<TData = unknown> = {
+  data: TData;
+};
diff --git a/packages/datasource-engine/src/types/RequestHandler.ts b/packages/datasource-engine/src/types/RequestHandler.ts
index aa9708585..c8a96f099 100644
--- a/packages/datasource-engine/src/types/RequestHandler.ts
+++ b/packages/datasource-engine/src/types/RequestHandler.ts
@@ -1,6 +1,7 @@
 import { DataSourceOptions } from './DataSourceOptions';
+import { DataSourceResponse } from './DataSourceResponse';
 
 export type RequestHandler<
   TOptions extends DataSourceOptions = DataSourceOptions,
-  TResult = unknown
+  TResult extends DataSourceResponse = DataSourceResponse
 > = (options: TOptions) => Promise<TResult>;

From 19fabc1760dac8e0259222c5eaa21a9f8108e6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Sun, 30 Aug 2020 01:56:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E4=B8=8E=E5=9B=BD?=
 =?UTF-8?q?=E5=87=AF=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4,=E5=B0=86=20urlParams=20=E6=89=80=E9=9C=80?=
 =?UTF-8?q?=E7=9A=84=20search=20=E5=8F=82=E6=95=B0=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/component/rax/containerInjectDataSourceEngine.ts    | 2 +-
 .../demo2/expected/demo-project/src/pages/Home/index.jsx        | 2 +-
 packages/datasource-engine/src/handlers/url-params.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
index f6cca564d..10b8a2e2c 100644
--- a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
+++ b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
@@ -46,7 +46,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
 
           requestHandlersMap[ds.type] = {
             type: 'JSExpression',
-            value: handlerName + (ds.type === 'urlParams' ? '({ search: this.props.location.search })' : ''),
+            value: handlerName + (ds.type === 'urlParams' ? '(this.props.location.search)' : ''),
           };
 
           next.chunks.push({
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
index 66b6ce9a8..b3b0448e7 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
@@ -51,7 +51,7 @@ class Home$$Page extends Component {
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, {
     runtimeConfig: true,
     requestHandlersMap: {
-      urlParams: __$$urlParamsRequestHandler({ search: this.props.location.search }),
+      urlParams: __$$urlParamsRequestHandler(this.props.location.search),
       fetch: __$$fetchRequestHandler,
     },
   });
diff --git a/packages/datasource-engine/src/handlers/url-params.ts b/packages/datasource-engine/src/handlers/url-params.ts
index c5a37f4bd..67540c9f2 100644
--- a/packages/datasource-engine/src/handlers/url-params.ts
+++ b/packages/datasource-engine/src/handlers/url-params.ts
@@ -1,7 +1,7 @@
 import qs from 'query-string';
 import { RequestHandler } from '../types';
 
-export default function urlParamsHandler({ search }: { search: string | Record<string, unknown> }): RequestHandler {
+export default function urlParamsHandler(search: string | Record<string, unknown>): RequestHandler {
   const urlParams = typeof search === 'string' ? qs.parse(search) : search;
 
   return async () => {

From fea0946150ae03b4d9b3d796520f96c0b05eccb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Mon, 31 Aug 2020 10:21:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E4=B8=8E=E5=9B=BD?=
 =?UTF-8?q?=E5=87=AF=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E8=81=94=E8=B0=83,=E5=AF=B9=E9=BD=90=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/rax/containerInjectDataSourceEngine.ts  | 11 +++++++----
 .../project/framework/rax/plugins/packageJSON.ts      |  7 ++++++-
 .../rax-app/demo1/expected/demo-project/package.json  |  6 +++++-
 .../expected/demo-project/src/pages/Home/index.jsx    |  2 +-
 .../rax-app/demo2/expected/demo-project/package.json  |  6 +++++-
 .../expected/demo-project/src/pages/Home/index.jsx    | 10 +++++-----
 .../rax-app/demo3/expected/demo-project/package.json  |  6 +++++-
 .../expected/demo-project/src/pages/Detail/index.jsx  |  2 +-
 .../expected/demo-project/src/pages/Home/index.jsx    |  2 +-
 .../expected/demo-project/src/pages/List/index.jsx    |  2 +-
 .../rax-app/demo4/expected/demo-project/package.json  |  6 +++++-
 .../expected/demo-project/src/pages/Home/index.jsx    |  2 +-
 .../rax-app/demo5/expected/demo-project/package.json  |  6 +++++-
 .../expected/demo-project/src/pages/Home/index.jsx    |  2 +-
 14 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
index 10b8a2e2c..50ae8d90e 100644
--- a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
+++ b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
@@ -42,19 +42,22 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
 
       dataSourceItems.forEach((ds) => {
         if (!(ds.type in requestHandlersMap) && ds.type !== 'custom') {
-          const handlerName = '__$$' + changeCase.camelCase(ds.type) + 'RequestHandler';
+          const handlerFactoryName = '__$$create' + changeCase.pascal(ds.type) + 'RequestHandler';
 
           requestHandlersMap[ds.type] = {
             type: 'JSExpression',
-            value: handlerName + (ds.type === 'urlParams' ? '(this.props.location.search)' : ''),
+            value: handlerFactoryName + (ds.type === 'urlParams' ? '(this.props.location.search)' : '()'),
           };
 
+          const handlerFactoryExportName = `create${changeCase.pascal(ds.type)}Handler`;
+          const handlerPkgName = `@ali/lowcode-datasource-${changeCase.kebab(ds.type)}-handler`;
+
           next.chunks.push({
             type: ChunkType.STRING,
             fileType: FileType.JSX,
             name: COMMON_CHUNK_NAME.ExternalDepsImport,
             content: `
-              import ${handlerName} from '@ali/lowcode-datasource-engine/handlers/${changeCase.kebabCase(ds.type)}';
+              import { ${handlerFactoryExportName} as ${handlerFactoryName} } from '${handlerPkgName}';
             `,
             linkAfter: [],
           });
@@ -69,7 +72,7 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
       fileType: FileType.JSX,
       name: COMMON_CHUNK_NAME.ExternalDepsImport,
       content: `
-        import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+        import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
       `,
       linkAfter: [],
     });
diff --git a/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts b/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
index c47412f0e..7db3a0a38 100644
--- a/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
+++ b/packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
@@ -33,7 +33,12 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
         lint: 'eslint --ext .js --ext .jsx ./',
       },
       dependencies: {
-        '@ali/lowcode-datasource-engine': '^0.1.0',
+        '@ali/lowcode-datasource-engine': '*',
+        // TODO: 如何动态获取下面这些依赖？
+        '@ali/lowcode-datasource-url-params-handler': '*',
+        '@ali/lowcode-datasource-fetch-handler': '*',
+        '@ali/lowcode-datasource-mtop-handler': '*',
+        '@ali/lowcode-datasource-mopen-handler': '*',
         'universal-env': '^3.2.0',
         'intl-messageformat': '^9.3.6',
         rax: '^1.1.0',
diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
index 0d4d71bb6..33a086c66 100644
--- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/package.json
@@ -8,7 +8,11 @@
     "lint": "eslint --ext .js --ext .jsx ./"
   },
   "dependencies": {
-    "@ali/lowcode-datasource-engine": "^0.1.0",
+    "@ali/lowcode-datasource-engine": "*",
+    "@ali/lowcode-datasource-url-params-handler": "*",
+    "@ali/lowcode-datasource-fetch-handler": "*",
+    "@ali/lowcode-datasource-mtop-handler": "*",
+    "@ali/lowcode-datasource-mopen-handler": "*",
     "universal-env": "^3.2.0",
     "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
index f7f5f00c2..cb5a4ddbe 100644
--- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/pages/Home/index.jsx
@@ -7,7 +7,7 @@ import Page from 'rax-view';
 
 import Text from 'rax-text';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
index 0b4537b56..aa61cda9c 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/package.json
@@ -8,7 +8,11 @@
     "lint": "eslint --ext .js --ext .jsx ./"
   },
   "dependencies": {
-    "@ali/lowcode-datasource-engine": "^0.1.0",
+    "@ali/lowcode-datasource-engine": "*",
+    "@ali/lowcode-datasource-url-params-handler": "*",
+    "@ali/lowcode-datasource-fetch-handler": "*",
+    "@ali/lowcode-datasource-mtop-handler": "*",
+    "@ali/lowcode-datasource-mopen-handler": "*",
     "universal-env": "^3.2.0",
     "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
index b3b0448e7..5b78b28a0 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
@@ -9,11 +9,11 @@ import Text from 'rax-text';
 
 import Image from 'rax-image';
 
-import __$$urlParamsRequestHandler from '@ali/lowcode-datasource-engine/handlers/url-params';
+import { createUrlParamsHandler as __$$createUrlParamsRequestHandler } from '@ali/lowcode-datasource-url-params-handler';
 
-import __$$fetchRequestHandler from '@ali/lowcode-datasource-engine/handlers/fetch';
+import { createFetchHandler as __$$createFetchRequestHandler } from '@ali/lowcode-datasource-fetch-handler';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
@@ -51,8 +51,8 @@ class Home$$Page extends Component {
   _dataSourceEngine = __$$createDataSourceEngine(this._dataSourceConfig, this._context, {
     runtimeConfig: true,
     requestHandlersMap: {
-      urlParams: __$$urlParamsRequestHandler(this.props.location.search),
-      fetch: __$$fetchRequestHandler,
+      urlParams: __$$createUrlParamsRequestHandler(this.props.location.search),
+      fetch: __$$createFetchRequestHandler(),
     },
   });
 
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
index d9842a107..f9451df10 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/package.json
@@ -8,7 +8,11 @@
     "lint": "eslint --ext .js --ext .jsx ./"
   },
   "dependencies": {
-    "@ali/lowcode-datasource-engine": "^0.1.0",
+    "@ali/lowcode-datasource-engine": "*",
+    "@ali/lowcode-datasource-url-params-handler": "*",
+    "@ali/lowcode-datasource-fetch-handler": "*",
+    "@ali/lowcode-datasource-mtop-handler": "*",
+    "@ali/lowcode-datasource-mopen-handler": "*",
     "universal-env": "^3.2.0",
     "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
index 03a389ab0..91dbd2d75 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Detail/index.jsx
@@ -11,7 +11,7 @@ import Link from 'rax-link';
 
 import Image from 'rax-image';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
index 8412a98f6..d1d93e306 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/Home/index.jsx
@@ -11,7 +11,7 @@ import Link from 'rax-link';
 
 import Image from 'rax-image';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
diff --git a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
index 17a49c62f..9c14cc6e5 100644
--- a/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo3/expected/demo-project/src/pages/List/index.jsx
@@ -11,7 +11,7 @@ import Link from 'rax-link';
 
 import Image from 'rax-image';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
diff --git a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
index 1510f3c4a..c7a658230 100644
--- a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/package.json
@@ -8,7 +8,11 @@
     "lint": "eslint --ext .js --ext .jsx ./"
   },
   "dependencies": {
-    "@ali/lowcode-datasource-engine": "^0.1.0",
+    "@ali/lowcode-datasource-engine": "*",
+    "@ali/lowcode-datasource-url-params-handler": "*",
+    "@ali/lowcode-datasource-fetch-handler": "*",
+    "@ali/lowcode-datasource-mtop-handler": "*",
+    "@ali/lowcode-datasource-mopen-handler": "*",
     "universal-env": "^3.2.0",
     "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
index e5463339e..6b550a1e3 100644
--- a/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo4/expected/demo-project/src/pages/Home/index.jsx
@@ -11,7 +11,7 @@ import Text from 'rax-text';
 
 import Image from 'rax-image';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
index 0d4d71bb6..33a086c66 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/package.json
@@ -8,7 +8,11 @@
     "lint": "eslint --ext .js --ext .jsx ./"
   },
   "dependencies": {
-    "@ali/lowcode-datasource-engine": "^0.1.0",
+    "@ali/lowcode-datasource-engine": "*",
+    "@ali/lowcode-datasource-url-params-handler": "*",
+    "@ali/lowcode-datasource-fetch-handler": "*",
+    "@ali/lowcode-datasource-mtop-handler": "*",
+    "@ali/lowcode-datasource-mopen-handler": "*",
     "universal-env": "^3.2.0",
     "intl-messageformat": "^9.3.6",
     "rax": "^1.1.0",
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
index 8a3656bfc..d7885feb3 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
@@ -7,7 +7,7 @@ import Page from 'rax-view';
 
 import Text from 'rax-text';
 
-import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine';
+import { create as __$$createDataSourceEngine } from '@ali/lowcode-datasource-engine/runtime';
 
 import { isMiniApp as __$$isMiniApp } from 'universal-env';
 

From 4baf0b4e00c434dce8eb766060bf87783396c901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Wed, 9 Sep 2020 10:04:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83,=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E9=85=8D=E7=BD=AE=E4=B8=ADisInit?=
 =?UTF-8?q?=E5=92=8C=20type=20=E9=83=BD=E6=98=AF=E6=9C=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E7=9A=84,=E6=89=80=E4=BB=A5=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E6=98=AF=E5=8F=AF=E9=80=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/types/src/data-source.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/types/src/data-source.ts b/packages/types/src/data-source.ts
index e33912fd8..157e65648 100644
--- a/packages/types/src/data-source.ts
+++ b/packages/types/src/data-source.ts
@@ -6,8 +6,8 @@ import { CompositeValue, JSExpression, JSFunction, JSONObject } from './value-ty
  */
 export interface DataSourceConfig {
   id: string;
-  isInit: boolean | JSExpression;
-  type: string;
+  isInit?: boolean | JSExpression;
+  type?: string;
   requestHandler?: JSFunction;
   dataHandler?: JSFunction;
   options?: {

From ec8a191ef8590d038d4f5b57aab8c3f3e88c9e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Wed, 9 Sep 2020 10:07:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=9A=84=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E6=98=AF?=
 =?UTF-8?q?=20fetch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rax/containerInjectDataSourceEngine.ts          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
index 50ae8d90e..13ba44065 100644
--- a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
+++ b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
@@ -41,16 +41,17 @@ const pluginFactory: BuilderComponentPluginFactory<PluginConfig> = (config?) =>
       const requestHandlersMap = {} as Record<string, JSExpression>;
 
       dataSourceItems.forEach((ds) => {
-        if (!(ds.type in requestHandlersMap) && ds.type !== 'custom') {
-          const handlerFactoryName = '__$$create' + changeCase.pascal(ds.type) + 'RequestHandler';
+        const dsType = ds.type || 'fetch';
+        if (!(dsType in requestHandlersMap) && dsType !== 'custom') {
+          const handlerFactoryName = '__$$create' + changeCase.pascal(dsType) + 'RequestHandler';
 
-          requestHandlersMap[ds.type] = {
+          requestHandlersMap[dsType] = {
             type: 'JSExpression',
-            value: handlerFactoryName + (ds.type === 'urlParams' ? '(this.props.location.search)' : '()'),
+            value: handlerFactoryName + (dsType === 'urlParams' ? '(this.props.location.search)' : '()'),
           };
 
-          const handlerFactoryExportName = `create${changeCase.pascal(ds.type)}Handler`;
-          const handlerPkgName = `@ali/lowcode-datasource-${changeCase.kebab(ds.type)}-handler`;
+          const handlerFactoryExportName = `create${changeCase.pascal(dsType)}Handler`;
+          const handlerPkgName = `@ali/lowcode-datasource-${changeCase.kebab(dsType)}-handler`;
 
           next.chunks.push({
             type: ChunkType.STRING,

From 96d0f45dfd3e7bc4a0feb2080762fb2af88c90f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Wed, 9 Sep 2020 10:10:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?chore:=20=F0=9F=A4=96=20fix=20lint=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/plugins/component/rax/containerInjectDataSourceEngine.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
index 13ba44065..bf6d76f06 100644
--- a/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
+++ b/packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/indent */
 import changeCase from 'change-case';
 import { CLASS_DEFINE_CHUNK_NAME, COMMON_CHUNK_NAME } from '../../../const/generator';