From 19fabc1760dac8e0259222c5eaa21a9f8108e6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= Date: Sun, 30 Aug 2020 01:56:53 +0800 Subject: [PATCH] =?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 = (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 }): RequestHandler { +export default function urlParamsHandler(search: string | Record): RequestHandler { const urlParams = typeof search === 'string' ? qs.parse(search) : search; return async () => {