From d8456fb1cd508f4caea8214771c183e2285b3a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=8C=E5=BF=83?= Date: Mon, 20 Jul 2020 21:33:59 +0800 Subject: [PATCH] Revert "Revert "Merge branch 'feat/rax-simulator' into 'release/0.9.0' "" This reverts commit 5767023d3f7d1406343a14089941e8365d029fa7. --- packages/demo/build.json | 6 +- packages/demo/build.plugin.js | 15 +- packages/demo/public/index.html | 1 + packages/demo/public/rax.json | 20 + packages/demo/public/raxAssets.json | 83 ++++ packages/demo/src/editor/components.ts | 2 +- packages/demo/src/editor/config.js | 10 +- packages/demo/src/vision/index.ts | 2 + .../src/builtin-simulator/create-simulator.ts | 18 +- .../designer/src/builtin-simulator/host.ts | 74 ++- packages/designer/src/simulator.ts | 2 +- packages/plugin-designer/src/index.tsx | 5 +- packages/rax-render/CHANGELOG.md | 4 + packages/rax-render/package.json | 5 +- packages/rax-render/src/engine/base.jsx | 264 ++++++----- .../rax-render/src/engine/blockEngine.jsx | 16 +- packages/rax-render/src/engine/compEngine.jsx | 32 +- packages/rax-render/src/engine/index.jsx | 115 ++++- packages/rax-render/src/engine/pageEngine.jsx | 104 ++++- packages/rax-render/src/engine/tempEngine.jsx | 16 +- packages/rax-render/src/hoc/compWrapper.js | 6 +- packages/rax-render/src/utils/index.js | 213 ++++----- packages/rax-simulator-renderer/build.json | 21 + .../rax-simulator-renderer/build.plugin.js | 0 packages/rax-simulator-renderer/package.json | 53 +++ .../src/builtin-components/Leaf/index.tsx | 226 ++++++++++ .../UnusualComponent/index.less | 0 .../UnusualComponent/index.tsx | 34 ++ .../src/builtin-components/renderUtils.ts | 82 ++++ packages/rax-simulator-renderer/src/host.ts | 4 + .../rax-simulator-renderer/src/image.d.ts | 1 + packages/rax-simulator-renderer/src/index.ts | 7 + .../src/obx-rax/derivation.ts | 210 +++++++++ .../src/obx-rax/global-state.ts | 68 +++ .../src/obx-rax/next-tick.ts | 56 +++ .../src/obx-rax/observable/compare.ts | 5 + .../src/obx-rax/observable/observable.ts | 179 ++++++++ .../src/obx-rax/observable/obx-array.ts | 152 +++++++ .../src/obx-rax/observable/obx-instance.ts | 14 + .../src/obx-rax/observable/obx-map.ts | 37 ++ .../src/obx-rax/observable/obx-object.ts | 93 ++++ .../src/obx-rax/observable/obx-property.ts | 212 +++++++++ .../src/obx-rax/observable/obx-set.ts | 133 ++++++ .../src/obx-rax/observable/obx.ts | 141 ++++++ .../src/obx-rax/observable/proxy.ts | 40 ++ .../src/obx-rax/observer.ts | 149 ++++++ .../src/obx-rax/reaction.ts | 252 +++++++++++ .../src/obx-rax/utils.ts | 0 .../src/obx-rax/utils/has-own-property.ts | 5 + .../src/obx-rax/utils/index.ts | 7 + .../src/obx-rax/utils/invariant.ts | 5 + .../src/obx-rax/utils/is-primitive.ts | 8 + .../src/obx-rax/utils/next-id.ts | 4 + .../src/obx-rax/utils/shallow-equal.ts | 28 ++ .../src/obx-rax/utils/split-path.ts | 5 + .../src/obx-rax/utils/throttle.ts | 97 ++++ .../src/renderer-view.tsx | 151 +++++++ .../rax-simulator-renderer/src/renderer.less | 111 +++++ .../rax-simulator-renderer/src/renderer.ts | 423 ++++++++++++++++++ .../src/utils/create-defer.ts | 17 + .../src/utils/get-client-rects.ts | 13 + .../src/utils/get-closest-node-instance.ts | 0 .../src/utils/get-device-view.ts | 23 + .../src/utils/loader.ts | 113 +++++ .../src/utils/script.ts | 54 +++ .../rax-simulator-renderer/src/utils/style.ts | 73 +++ packages/react-renderer/src/engine/index.jsx | 20 +- .../react-renderer/src/engine/pageEngine.jsx | 13 +- .../src/renderer-view.tsx | 2 +- .../react-simulator-renderer/src/renderer.ts | 19 +- scripts/start.sh | 1 + 71 files changed, 4044 insertions(+), 330 deletions(-) create mode 100644 packages/demo/public/rax.json create mode 100644 packages/demo/public/raxAssets.json create mode 100644 packages/rax-simulator-renderer/build.json create mode 100644 packages/rax-simulator-renderer/build.plugin.js create mode 100644 packages/rax-simulator-renderer/package.json create mode 100644 packages/rax-simulator-renderer/src/builtin-components/Leaf/index.tsx create mode 100644 packages/rax-simulator-renderer/src/builtin-components/UnusualComponent/index.less create mode 100644 packages/rax-simulator-renderer/src/builtin-components/UnusualComponent/index.tsx create mode 100644 packages/rax-simulator-renderer/src/builtin-components/renderUtils.ts create mode 100644 packages/rax-simulator-renderer/src/host.ts create mode 100644 packages/rax-simulator-renderer/src/image.d.ts create mode 100644 packages/rax-simulator-renderer/src/index.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/derivation.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/global-state.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/next-tick.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/compare.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/observable.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-array.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-instance.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-map.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-object.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-property.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx-set.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/obx.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observable/proxy.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/observer.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/reaction.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/has-own-property.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/index.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/invariant.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/is-primitive.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/next-id.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/shallow-equal.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/split-path.ts create mode 100644 packages/rax-simulator-renderer/src/obx-rax/utils/throttle.ts create mode 100644 packages/rax-simulator-renderer/src/renderer-view.tsx create mode 100644 packages/rax-simulator-renderer/src/renderer.less create mode 100644 packages/rax-simulator-renderer/src/renderer.ts create mode 100644 packages/rax-simulator-renderer/src/utils/create-defer.ts create mode 100644 packages/rax-simulator-renderer/src/utils/get-client-rects.ts create mode 100644 packages/rax-simulator-renderer/src/utils/get-closest-node-instance.ts create mode 100644 packages/rax-simulator-renderer/src/utils/get-device-view.ts create mode 100644 packages/rax-simulator-renderer/src/utils/loader.ts create mode 100644 packages/rax-simulator-renderer/src/utils/script.ts create mode 100644 packages/rax-simulator-renderer/src/utils/style.ts diff --git a/packages/demo/build.json b/packages/demo/build.json index 83cf581dd..42ade8d92 100644 --- a/packages/demo/build.json +++ b/packages/demo/build.json @@ -2,7 +2,8 @@ "entry": { "index": "src/index", "editor-preset-vision": "../editor-preset-vision/src/index.ts", - "react-simulator-renderer": "../react-simulator-renderer/src/index.ts" + "react-simulator-renderer": "../react-simulator-renderer/src/index.ts", + "rax-simulator-renderer": "../rax-simulator-renderer/src/index.ts" }, "vendor": false, "devServer": { @@ -15,7 +16,8 @@ "prop-types": "var window.PropTypes", "@alifd/next": "var window.Next", "@ali/visualengine": "var window.VisualEngine", - "@ali/visualengine-utils": "var window.VisualEngineUtils" + "@ali/visualengine-utils": "var window.VisualEngineUtils", + "rax": "var window.Rax" }, "plugins": [ [ diff --git a/packages/demo/build.plugin.js b/packages/demo/build.plugin.js index 53380e73a..9e95cbd09 100644 --- a/packages/demo/build.plugin.js +++ b/packages/demo/build.plugin.js @@ -10,12 +10,15 @@ module.exports = ({ onGetWebpackConfig }) => { ]); config - // 定义插件名称 - .plugin('MonacoWebpackPlugin') - // 第一项为具体插件,第二项为插件参数 - .use(new MonacoWebpackPlugin({ - languages:["typescript","css","json"] - }), []); + // 定义插件名称 + .plugin('MonacoWebpackPlugin') + // 第一项为具体插件,第二项为插件参数 + .use( + new MonacoWebpackPlugin({ + languages: ['typescript', 'css', 'json'], + }), + [], + ); config.plugins.delete('hot'); config.devServer.hot(false); diff --git a/packages/demo/public/index.html b/packages/demo/public/index.html index e219c8bad..5a4ed76dd 100644 --- a/packages/demo/public/index.html +++ b/packages/demo/public/index.html @@ -16,6 +16,7 @@ +