From 98ae1ed82c92119f408c4b4b5c6dad77bd4d5042 Mon Sep 17 00:00:00 2001 From: "muyun.my" Date: Sat, 7 Nov 2020 22:01:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E6=8E=A5=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.eslintignore | 0 .../.eslintrc.js | 0 .../.prettierrc.js | 0 .../CHANGELOG.md | 0 .../package.json | 0 .../src/data-source-handlers.ts | 0 .../src/data-source-interpret.ts | 0 .../src/data-source-runtime.ts | 0 .../src/data-source.ts | 0 .../src/index.ts | 0 .../src/value-type.ts | 0 .../tsconfig.json | 0 packages/demo/public/schema.json | 13 +++++++++++++ packages/designer/src/builtin-simulator/host.ts | 6 ++++++ packages/plugin-designer/src/index.tsx | 8 +++++++- packages/rax-render/src/engine/base.tsx | 5 +++-- packages/react-renderer/src/renderer/base.tsx | 6 ++++-- .../react-simulator-renderer/src/renderer-view.tsx | 4 ++-- packages/react-simulator-renderer/src/renderer.ts | 8 ++++++++ 19 files changed, 43 insertions(+), 7 deletions(-) rename packages/{types-datasource => datasource-types}/.eslintignore (100%) rename packages/{types-datasource => datasource-types}/.eslintrc.js (100%) rename packages/{types-datasource => datasource-types}/.prettierrc.js (100%) rename packages/{types-datasource => datasource-types}/CHANGELOG.md (100%) rename packages/{types-datasource => datasource-types}/package.json (100%) rename packages/{types-datasource => datasource-types}/src/data-source-handlers.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source-interpret.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source-runtime.ts (100%) rename packages/{types-datasource => datasource-types}/src/data-source.ts (100%) rename packages/{types-datasource => datasource-types}/src/index.ts (100%) rename packages/{types-datasource => datasource-types}/src/value-type.ts (100%) rename packages/{types-datasource => datasource-types}/tsconfig.json (100%) diff --git a/packages/types-datasource/.eslintignore b/packages/datasource-types/.eslintignore similarity index 100% rename from packages/types-datasource/.eslintignore rename to packages/datasource-types/.eslintignore diff --git a/packages/types-datasource/.eslintrc.js b/packages/datasource-types/.eslintrc.js similarity index 100% rename from packages/types-datasource/.eslintrc.js rename to packages/datasource-types/.eslintrc.js diff --git a/packages/types-datasource/.prettierrc.js b/packages/datasource-types/.prettierrc.js similarity index 100% rename from packages/types-datasource/.prettierrc.js rename to packages/datasource-types/.prettierrc.js diff --git a/packages/types-datasource/CHANGELOG.md b/packages/datasource-types/CHANGELOG.md similarity index 100% rename from packages/types-datasource/CHANGELOG.md rename to packages/datasource-types/CHANGELOG.md diff --git a/packages/types-datasource/package.json b/packages/datasource-types/package.json similarity index 100% rename from packages/types-datasource/package.json rename to packages/datasource-types/package.json diff --git a/packages/types-datasource/src/data-source-handlers.ts b/packages/datasource-types/src/data-source-handlers.ts similarity index 100% rename from packages/types-datasource/src/data-source-handlers.ts rename to packages/datasource-types/src/data-source-handlers.ts diff --git a/packages/types-datasource/src/data-source-interpret.ts b/packages/datasource-types/src/data-source-interpret.ts similarity index 100% rename from packages/types-datasource/src/data-source-interpret.ts rename to packages/datasource-types/src/data-source-interpret.ts diff --git a/packages/types-datasource/src/data-source-runtime.ts b/packages/datasource-types/src/data-source-runtime.ts similarity index 100% rename from packages/types-datasource/src/data-source-runtime.ts rename to packages/datasource-types/src/data-source-runtime.ts diff --git a/packages/types-datasource/src/data-source.ts b/packages/datasource-types/src/data-source.ts similarity index 100% rename from packages/types-datasource/src/data-source.ts rename to packages/datasource-types/src/data-source.ts diff --git a/packages/types-datasource/src/index.ts b/packages/datasource-types/src/index.ts similarity index 100% rename from packages/types-datasource/src/index.ts rename to packages/datasource-types/src/index.ts diff --git a/packages/types-datasource/src/value-type.ts b/packages/datasource-types/src/value-type.ts similarity index 100% rename from packages/types-datasource/src/value-type.ts rename to packages/datasource-types/src/value-type.ts diff --git a/packages/types-datasource/tsconfig.json b/packages/datasource-types/tsconfig.json similarity index 100% rename from packages/types-datasource/tsconfig.json rename to packages/datasource-types/tsconfig.json diff --git a/packages/demo/public/schema.json b/packages/demo/public/schema.json index ea405f970..4d15c5f83 100644 --- a/packages/demo/public/schema.json +++ b/packages/demo/public/schema.json @@ -11,6 +11,19 @@ "fileName": "test", "dataSource": { "list": [ + { + "type": "fetch", + "id": "请求商家数据，是一个 HTTP 请求，是一个 HTTP 请求，是一个 HTTP 请求", + "isInit": true, + "options": { + "uri": "https://www.taobao.com", + "params": { + "a": 1, + "b": true, + "c": "3" + } + } + } ] }, "state": { diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index 5d6158198..b6da3333d 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -135,6 +135,12 @@ export class BuiltinSimulatorHost implements ISimulatorHost { @@ -27,6 +28,7 @@ export default class DesignerPlugin extends PureComponent ); diff --git a/packages/rax-render/src/engine/base.tsx b/packages/rax-render/src/engine/base.tsx index 1e462df2e..c4d970bf3 100644 --- a/packages/rax-render/src/engine/base.tsx +++ b/packages/rax-render/src/engine/base.tsx @@ -178,9 +178,10 @@ export default class BaseEngine extends Component { }); } // 设置容器组件占位，若设置占位则在初始异步请求完成之前用loading占位且不渲染容器组件内部内容 - if (this.__parseData(schema.props && schema.props.autoLoading)) { + // @TODO __showPlaceholder 的逻辑一旦开启就关不掉，先注释掉了 + /* if (this.__parseData(schema.props && schema.props.autoLoading)) { this.__showPlaceholder = (dataSource.list || []).some((item) => !!this.__parseData(item.isInit)); - } + } */ }; __render = () => { diff --git a/packages/react-renderer/src/renderer/base.tsx b/packages/react-renderer/src/renderer/base.tsx index d72b6e429..9daa4d0c2 100644 --- a/packages/react-renderer/src/renderer/base.tsx +++ b/packages/react-renderer/src/renderer/base.tsx @@ -156,6 +156,7 @@ export default class BaseRender extends PureComponent { this.__showPlaceholder = true; reloadDataSource().then(() => { this.__showPlaceholder = false; + // this.forceUpdate(); // @TODO 是否需要 forceUpate resolve(); }); @@ -190,9 +191,10 @@ export default class BaseRender extends PureComponent { }); } // 设置容器组件占位，若设置占位则在初始异步请求完成之前用loading占位且不渲染容器组件内部内容 - this.__showPlaceholder = this.__parseData(schema.props && schema.props.autoLoading) && (dataSource.list || []).some( + // @TODO __showPlaceholder 的逻辑一旦开启就关不掉，先注释掉了 + /* this.__showPlaceholder = this.__parseData(schema.props && schema.props.autoLoading) && (dataSource.list || []).some( (item) => !!this.__parseData(item.isInit), - ); + ); */ }; __render = () => { diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index c635cb64b..0587d8f51 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -98,14 +98,14 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { render() { const { renderer } = this.props; - const { device, designMode } = renderer; + const { device, designMode, requestHandlersMap } = renderer; return (