From 2c14e7515b4fdb87dd56e6a94b5281424a3c1e97 Mon Sep 17 00:00:00 2001 From: "lihao.ylh" Date: Wed, 29 Dec 2021 19:22:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=20prop.items?= =?UTF-8?q?=20=E7=9A=84=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/node/props/prop.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index 4c83a4d76..3da3b153e 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -379,7 +379,7 @@ export class Prop implements IPropParent { /** * 构造 items 属性，同时构造 maps 属性 */ - @computed private get items(): Prop[] | null { + private get items(): Prop[] | null { if (this._items) return this._items; return runInAction(() => { let items: Prop[] | null = null; @@ -617,9 +617,11 @@ export class Prop implements IPropParent { if (this._items) { this._items.forEach((item) => item.purge()); } + this._items = null; this._maps = null; if (this._slotNode && this._slotNode.slotFor === this) { this._slotNode.remove(); + this._slotNode = undefined; } } From a6fedd9e85139914649aa28a863cf14c2e92c952 Mon Sep 17 00:00:00 2001 From: "lihao.ylh" Date: Fri, 7 Jan 2022 16:42:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=20xxx-simulator?= =?UTF-8?q?-renderer=20=E7=9A=84=E6=89=93=E5=8C=85=E8=A7=84=E5=88=99,=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20react-app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/engine/build.json | 29 ++++---------- .../rax-simulator-renderer/build.cloud.json | 38 +++++++++++++++++++ packages/rax-simulator-renderer/build.json | 20 +--------- packages/rax-simulator-renderer/package.json | 4 +- .../react-simulator-renderer/build.cloud.json | 24 ++++++------ packages/react-simulator-renderer/build.json | 14 +------ .../react-simulator-renderer/package.json | 3 +- scripts/deploy.bak.sh | 35 ----------------- scripts/deploy.sh | 13 ++----- 9 files changed, 68 insertions(+), 112 deletions(-) create mode 100644 packages/rax-simulator-renderer/build.cloud.json delete mode 100755 scripts/deploy.bak.sh diff --git a/packages/engine/build.json b/packages/engine/build.json index d6601ad60..e8c3e583d 100644 --- a/packages/engine/build.json +++ b/packages/engine/build.json @@ -1,24 +1,6 @@ { "plugins": [ - [ - "build-plugin-component", - { - "filename": "engine", - "library": "___AliLowCodeEngine___", - "libraryTarget": "umd", - "externals": { - "react": "var window.React", - "react-dom": "var window.ReactDOM", - "prop-types": "var window.PropTypes", - "@ali/visualengine": "var window.VisualEngine", - "@ali/visualengine-utils": "var window.VisualEngineUtils", - "@ali/lowcode-engine-ext": "var window.AliLowCodeEngineExt", - "rax": "var window.Rax", - "monaco-editor/esm/vs/editor/editor.api": "var window.monaco", - "monaco-editor/esm/vs/editor/editor.main.js": "var window.monaco" - } - } - ], + "build-plugin-component", [ "build-plugin-fusion", { @@ -26,9 +8,12 @@ "externalNext": "umd" } ], - ["build-plugin-moment-locales", { - "locales": ["zh-cn"] - }], + [ + "build-plugin-moment-locales", + { + "locales": ["zh-cn"] + } + ], "./build.plugin.js" ] } diff --git a/packages/rax-simulator-renderer/build.cloud.json b/packages/rax-simulator-renderer/build.cloud.json new file mode 100644 index 000000000..06a5fcf69 --- /dev/null +++ b/packages/rax-simulator-renderer/build.cloud.json @@ -0,0 +1,38 @@ +{ + "entry": { + "rax-simulator-renderer": "src/index" + }, + "sourceMap": true, + "library": "___RaxSimulatorRenderer___", + "libraryTarget": "umd", + "externals": { + "react": "var window.React", + "react-dom": "var window.ReactDOM", + "prop-types": "var window.PropTypes", + "@alifd/next": "var Next", + "@ali/lowcode-engine-ext": "var window.AliLowCodeEngineExt", + "rax": "var window.Rax", + "moment": "var moment", + "lodash": "var _" + }, + "polyfill": false, + "outputDir": "dist", + "vendor": false, + "ignoreHtmlTemplate": true, + "plugins": [ + "build-plugin-react-app", + [ + "build-plugin-fusion", + { + "externalNext": "umd" + } + ], + [ + "build-plugin-moment-locales", + { + "locales": ["zh-cn"] + } + ], + "./build.plugin.js" + ] +} diff --git a/packages/rax-simulator-renderer/build.json b/packages/rax-simulator-renderer/build.json index 59f913b34..b95a17aaf 100644 --- a/packages/rax-simulator-renderer/build.json +++ b/packages/rax-simulator-renderer/build.json @@ -1,21 +1,3 @@ { - "sourceMap": true, - "plugins": [ - [ - "build-plugin-component", - { - "filename": "rax-simulator-renderer", - "library": "SimulatorRenderer", - "libraryExport": "default", - "libraryTarget": "umd", - "externals": { - "react": "var window.React", - "react-dom": "var window.ReactDOM", - "prop-types": "var window.PropTypes", - "rax": "var window.Rax" - } - } - ], - "./build.plugin.js" - ] + "plugins": ["build-plugin-component", "./build.plugin.js"] } diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 4f2ad4c6d..8c18448dd 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -7,8 +7,8 @@ "license": "MIT", "files": [], "scripts": { - "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build", - "cloud-build": "build-scripts build --skip-demo" + "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --skip-demo", + "cloud-build": "build-scripts build --config build.cloud.json" }, "dependencies": { "@ali/lowcode-designer": "1.0.76", diff --git a/packages/react-simulator-renderer/build.cloud.json b/packages/react-simulator-renderer/build.cloud.json index 60a93f548..9014609ff 100644 --- a/packages/react-simulator-renderer/build.cloud.json +++ b/packages/react-simulator-renderer/build.cloud.json @@ -2,17 +2,13 @@ "entry": { "react-simulator-renderer": "src/index" }, + "sourceMap": true, "library": "___ReactSimulatorRenderer___", "libraryTarget": "umd", "externals": { "react": "var window.React", "react-dom": "var window.ReactDOM", "prop-types": "var window.PropTypes", - "@ali/visualengine": "var window.VisualEngine", - "@ali/visualengine-utils": "var window.VisualEngineUtils", - "rax": "var window.Rax", - "monaco-editor/esm/vs/editor/editor.api": "var window.monaco", - "monaco-editor/esm/vs/editor/editor.main.js": "var window.monaco", "@alifd/next": "var Next", "@ali/lowcode-engine-ext": "var window.AliLowCodeEngineExt", "moment": "var moment", @@ -24,12 +20,18 @@ "ignoreHtmlTemplate": true, "plugins": [ "build-plugin-react-app", - ["build-plugin-fusion", { - "externalNext": "umd" - }], - ["build-plugin-moment-locales", { - "locales": ["zh-cn"] - }], + [ + "build-plugin-fusion", + { + "externalNext": "umd" + } + ], + [ + "build-plugin-moment-locales", + { + "locales": ["zh-cn"] + } + ], "./build.plugin.js" ] } diff --git a/packages/react-simulator-renderer/build.json b/packages/react-simulator-renderer/build.json index cc6d56cd4..b95a17aaf 100644 --- a/packages/react-simulator-renderer/build.json +++ b/packages/react-simulator-renderer/build.json @@ -1,15 +1,3 @@ { - "sourceMap": true, - "plugins": [ - [ - "build-plugin-component", - { - "filename": "react-simulator-renderer", - "library": "SimulatorRenderer", - "libraryExport": "default", - "libraryTarget": "umd" - } - ], - "./build.plugin.js" - ] + "plugins": ["build-plugin-component", "./build.plugin.js"] } diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 5d14f744d..107cace6d 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -10,7 +10,8 @@ "lib" ], "scripts": { - "cloud-build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --skip-demo" + "build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --skip-demo", + "cloud-build": "NODE_OPTIONS=--max_old_space_size=8192 build-scripts build --config build.cloud.json" }, "dependencies": { "@ali/lowcode-designer": "1.0.76", diff --git a/scripts/deploy.bak.sh b/scripts/deploy.bak.sh deleted file mode 100755 index 937aef3bf..000000000 --- a/scripts/deploy.bak.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -WORK_DIR=$PWD -BUILD_DEST=$1 - -echo "Deploy ${PWD} -> ${BUILD_DEST} ..." - -# build globals -echo "build globals" -cd packages/globals -tnpm ii -tnpm run cloud-build -cd $WORK_DIR - -# build simulator-renderer -echo "build simulator-renderer" -cd packages/react-simulator-renderer -tnpm ii -tnpm run cloud-build -cd $WORK_DIR - -# build lowcode demo -echo "build lowcode demo" -cd packages/demo -# FIXME! npm is slow, but tnpm has a depends bug -npm i --registry=http://registry.npm.alibaba-inc.com -npm run cloud-build -cd $WORK_DIR - -mv packages/demo/build $BUILD_DEST -mv packages/react-simulator-renderer/dist/* $BUILD_DEST -mv packages/globals/dist/* $BUILD_DEST - -cp deploy-space/html/* $BUILD_DEST -echo "complete" diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 75c235c22..9b9ad4b3b 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -29,16 +29,11 @@ tnpm run setup lerna run cloud-build --stream - -# mv deploy-space/packages/demo/build $BUILD_DEST -mv ./packages/react-simulator-renderer/dist/* $BUILD_DEST -mv ./packages/rax-simulator-renderer/dist/* $BUILD_DEST -# mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST +mv ./packages/react-simulator-renderer/dist/js/* $BUILD_DEST +mv ./packages/react-simulator-renderer/dist/css/* $BUILD_DEST +mv ./packages/rax-simulator-renderer/dist/js/* $BUILD_DEST +mv ./packages/rax-simulator-renderer/dist/css/* $BUILD_DEST mv ./packages/engine/dist/js/* $BUILD_DEST mv ./packages/engine/dist/css/* $BUILD_DEST -# mv ./packages/vision-polyfill/dist/js/* $BUILD_DEST -# mv ./packages/vision-polyfill/dist/css/* $BUILD_DEST -# mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST -# cp deploy-space/static/* $BUILD_DEST echo "Complete"