From 6b3c8fc69284c6d52763898eaa2611271cff12ad Mon Sep 17 00:00:00 2001 From: kangwei Date: Wed, 22 Jul 2020 10:22:40 +0800 Subject: [PATCH 1/9] chore:build --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 37630f94c..d6626458a 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -30,7 +30,7 @@ lerna bootstrap lerna run cloud-build --stream cd $WORK_DIR -mv deploy-space/packages/demo/build $BUILD_DEST +# mv deploy-space/packages/demo/build $BUILD_DEST mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST From cb563a2bd2e04c466bf2b83948e38a228c765cca Mon Sep 17 00:00:00 2001 From: kangwei Date: Wed, 22 Jul 2020 10:37:33 +0800 Subject: [PATCH 2/9] chore: build --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index d6626458a..7e982e943 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -31,7 +31,7 @@ lerna run cloud-build --stream cd $WORK_DIR # mv deploy-space/packages/demo/build $BUILD_DEST -mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST +mv deploy-space/packages/react-simulator-renderer/dist $BUILD_DEST mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST # mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST From 60db7fb518a3374fb535b794f928f685c952e3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Wed, 22 Jul 2020 18:15:50 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=8F=92=E4=BB=B6plugin-transform-react-jsx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-simulator-renderer/.babelrc | 9 +++++++++ packages/rax-simulator-renderer/package.json | 1 + 2 files changed, 10 insertions(+) create mode 100644 packages/rax-simulator-renderer/.babelrc diff --git a/packages/rax-simulator-renderer/.babelrc b/packages/rax-simulator-renderer/.babelrc new file mode 100644 index 000000000..e0e2e5f34 --- /dev/null +++ b/packages/rax-simulator-renderer/.babelrc @@ -0,0 +1,9 @@ +{ + "plugins": [ + ["@babel/plugin-transform-react-jsx", { + "pragma": "createElement", // default pragma is React.createElement + "pragmaFrag": "createFragment", // default is React.Fragment + "throwIfNamespace": false // defaults to true + }] + ] +} diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index f2bbbde4c..689619667 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@alib/build-scripts": "^0.1.18", + "@babel/plugin-transform-react-jsx": "^7.10.4", "@recore/obx": "^1.0.8", "@types/classnames": "^2.2.7", "@types/node": "^13.7.1", From 52c3b9d83dab781f4ef97f935467b357defdabb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Wed, 22 Jul 2020 23:11:30 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=91=E6=9E=84?= =?UTF-8?q?=E5=BB=BAexternals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/cloud-build.json | 3 ++- packages/rax-simulator-renderer/src/renderer.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/demo/cloud-build.json b/packages/demo/cloud-build.json index 934ab050f..849bcfca7 100644 --- a/packages/demo/cloud-build.json +++ b/packages/demo/cloud-build.json @@ -12,7 +12,8 @@ "@ali/lowcode-editor-preset-general": "window.LowcodeEditor", "@ali/lowcode-editor-core": "window.LowcodeEditor", "@ali/lowcode-editor-skeleton": "window.LowcodeEditor", - "@ali/lowcode-designer": "window.LowcodeEditor" + "@ali/lowcode-designer": "window.LowcodeEditor", + "rax": "window.Rax" }, "minify": false, "sourcemap": true, diff --git a/packages/rax-simulator-renderer/src/renderer.ts b/packages/rax-simulator-renderer/src/renderer.ts index 67bb30b01..aed0dd614 100644 --- a/packages/rax-simulator-renderer/src/renderer.ts +++ b/packages/rax-simulator-renderer/src/renderer.ts @@ -406,8 +406,8 @@ function getNodeInstance(dom: HTMLElement): NodeInstance | null { } return { nodeId: node.props.componentId, - instance: node - } + instance: node, + }; // return parent; // const instance = fiberNode.stateNode; // if (instance) { From 26c307ec7beb48b8579389809256d32ec5fd38f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Wed, 22 Jul 2020 23:29:29 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=91=E6=9E=84?= =?UTF-8?q?=E5=BB=BAexternals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/cloud-build.json | 3 +-- packages/editor-preset-vision/build.json | 3 ++- packages/rax-simulator-renderer/build.json | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/demo/cloud-build.json b/packages/demo/cloud-build.json index 849bcfca7..1d0afbef7 100644 --- a/packages/demo/cloud-build.json +++ b/packages/demo/cloud-build.json @@ -13,9 +13,8 @@ "@ali/lowcode-editor-core": "window.LowcodeEditor", "@ali/lowcode-editor-skeleton": "window.LowcodeEditor", "@ali/lowcode-designer": "window.LowcodeEditor", - "rax": "window.Rax" + "rax": "var window.Rax" }, - "minify": false, "sourcemap": true, "outputAssetsPath": { "js": "", "css": "" diff --git a/packages/editor-preset-vision/build.json b/packages/editor-preset-vision/build.json index b9babfe67..8df991958 100644 --- a/packages/editor-preset-vision/build.json +++ b/packages/editor-preset-vision/build.json @@ -9,7 +9,8 @@ "externals": { "react": "var window.React", "react-dom": "var window.ReactDOM", - "prop-types": "var window.PropTypes" + "prop-types": "var window.PropTypes", + "rax": "var window.Rax" } } ], diff --git a/packages/rax-simulator-renderer/build.json b/packages/rax-simulator-renderer/build.json index 703b8c7ce..70f118bdf 100644 --- a/packages/rax-simulator-renderer/build.json +++ b/packages/rax-simulator-renderer/build.json @@ -6,7 +6,13 @@ "filename": "rax-simulator-renderer", "library": "SimulatorRenderer", "libraryExport": "default", - "libraryTarget": "umd" + "libraryTarget": "umd", + "externals": { + "react": "var window.React", + "react-dom": "var window.ReactDOM", + "prop-types": "var window.PropTypes", + "rax": "var window.Rax" + } } ], "./build.plugin.js" From 5e8ef8779899137013680aaa02d377b54d5fdc72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Tue, 28 Jul 2020 15:16:31 +0800 Subject: [PATCH 6/9] =?UTF-8?q?remove=20=E4=B9=90=E9=AB=98=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E5=85=BC=E5=AE=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-preset-vision/src/editor.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts index 86a89a43e..9b155bba1 100644 --- a/packages/editor-preset-vision/src/editor.ts +++ b/packages/editor-preset-vision/src/editor.ts @@ -172,13 +172,13 @@ function compatiableReducer(props: any) { } } // 为了能降级到老版本，建议在后期版本去掉以下代码 - if (isJSExpression(val) && !val.events) { - val = { - type: 'variable', - value: val.mock, - variable: val.value, - } - } + // if (isJSExpression(val) && !val.events) { + // val = { + // type: 'variable', + // value: val.mock, + // variable: val.value, + // } + // } newProps[key] = val; }); return newProps; From 6f5d11cf7762b6bb0d519209840e0c92d1c6f297 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Tue, 28 Jul 2020 20:24:05 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0try=20catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-core/src/hotkey.ts | 36 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/editor-core/src/hotkey.ts b/packages/editor-core/src/hotkey.ts index 50cca63ca..f991aaeab 100644 --- a/packages/editor-core/src/hotkey.ts +++ b/packages/editor-core/src/hotkey.ts @@ -328,23 +328,27 @@ function getKeyInfo(combination: string, action?: string): KeyInfo { * convention - prevent default and stop propogation on the event */ function fireCallback(callback: HotkeyCallback, e: KeyboardEvent, combo?: string, sequence?: string): void { - const editor = globalContext.get(Editor); - const designer = editor.get('designer'); - const node = designer?.currentSelection?.getNodes()?.[0]; - const npm = node?.componentMeta?.npm; - const selected = - [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; - if (callback(e, combo) === false) { - e.preventDefault(); - e.stopPropagation(); + try { + const editor = globalContext.get(Editor); + const designer = editor.get('designer'); + const node = designer?.currentSelection?.getNodes()?.[0]; + const npm = node?.componentMeta?.npm; + const selected = + [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; + if (callback(e, combo) === false) { + e.preventDefault(); + e.stopPropagation(); + } + editor?.emit('hotkey.callback.call', { + callback, + e, + combo, + sequence, + selected, + }); + } catch(err) { + console.error(err.message); } - editor?.emit('hotkey.callback.call', { - callback, - e, - combo, - sequence, - selected, - }); } export class Hotkey { From 852d8822ee4c66f5643b39d1e05ec4571768ba25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Tue, 28 Jul 2020 21:44:36 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BB=84=E4=BB=B6=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=81=9A=E7=84=A6=E5=88=B0=E7=82=B9=E4=B8=AD=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-preset-vision/src/editor.ts | 7 ++-- .../rax-simulator-renderer/src/renderer.ts | 39 +++++++++---------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts index 9b155bba1..b83fbc48f 100644 --- a/packages/editor-preset-vision/src/editor.ts +++ b/packages/editor-preset-vision/src/editor.ts @@ -56,7 +56,7 @@ function upgradePropsReducer(props: any) { type: 'JSSlot', title: (val.value.props as any)?.slotTitle, name: (val.value.props as any)?.slotName, - value: val.value.children + value: val.value.children, }; } else { val = val.value; @@ -126,7 +126,6 @@ designer.addPropsReducer((props, node) => { return props; }, TransformStage.Init); - function filterReducer(props: any, node: Node): any { const filters = node.componentMeta.getMetadata().experimental?.filters; if (filters && filters.length) { @@ -169,7 +168,7 @@ function compatiableReducer(props: any) { slotName: val.name, }, }, - } + }; } // 为了能降级到老版本，建议在后期版本去掉以下代码 // if (isJSExpression(val) && !val.events) { @@ -264,7 +263,7 @@ skeleton.add({ props: { condition: () => { return designer.dragon.dragging && !getTreeMaster(designer).hasVisibleTreeBoard(); - } + }, }, content: OutlineBackupPane, }); diff --git a/packages/rax-simulator-renderer/src/renderer.ts b/packages/rax-simulator-renderer/src/renderer.ts index aed0dd614..be68ca9ca 100644 --- a/packages/rax-simulator-renderer/src/renderer.ts +++ b/packages/rax-simulator-renderer/src/renderer.ts @@ -386,35 +386,34 @@ function getClosestNodeInstance(from: any, specId?: string): NodeInstance | return null; } -function matcher(parent: any) { - return parent.__isReactiveComponent && parent.props.componentId; +function isValidDesignModeRaxComponentInstance( + raxComponentInst: any, +): raxComponentInst is { + props: { + _leaf: Exclude['node'], null | undefined>; + }; +} { + const leaf = raxComponentInst?.props?._leaf; + return leaf && typeof leaf === 'object' && leaf.isNode; } function getNodeInstance(dom: HTMLElement): NodeInstance | null { const INTERNAL = '_internal'; + let instance = Instance.get(dom); - let node; while (instance && instance[INTERNAL]) { - if (matcher(instance)) { - node = instance; - break; + if (isValidDesignModeRaxComponentInstance(instance)) { + return { + nodeId: instance.props._leaf.getId(), + instance: instance, + node: instance.props._leaf, + }; } + instance = instance[INTERNAL].__parentInstance; } - if (!node) { - return null; - } - return { - nodeId: node.props.componentId, - instance: node, - }; - // return parent; - // const instance = fiberNode.stateNode; - // if (instance) { - // console.log(instance); - // } - // return getNodeInstance(fiberNode.return); - // return instance; + + return null; } function checkInstanceMounted(instance: any): boolean { From 5054d06a375f895483bd29b07df39c2027010ed0 Mon Sep 17 00:00:00 2001 From: YJSON Date: Wed, 29 Jul 2020 17:29:15 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=F0=9F=90=9B=20mainArea=20=E7=94=BB?= =?UTF-8?q?=E5=B8=83=E5=88=87=E6=8D=A2=EF=BC=8CMainArea=20=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4=20iframe?= =?UTF-8?q?=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget-views/index.less | 8 +++++++ .../index.tsx} | 21 +++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 packages/editor-skeleton/src/components/widget-views/index.less rename packages/editor-skeleton/src/components/{widget-views.tsx => widget-views/index.tsx} (93%) diff --git a/packages/editor-skeleton/src/components/widget-views/index.less b/packages/editor-skeleton/src/components/widget-views/index.less new file mode 100644 index 000000000..1241b0dde --- /dev/null +++ b/packages/editor-skeleton/src/components/widget-views/index.less @@ -0,0 +1,8 @@ +.lc-widget-view-container { + height: 100%; + width: 100%; + + &.hidden { + display: none; + } +} diff --git a/packages/editor-skeleton/src/components/widget-views.tsx b/packages/editor-skeleton/src/components/widget-views/index.tsx similarity index 93% rename from packages/editor-skeleton/src/components/widget-views.tsx rename to packages/editor-skeleton/src/components/widget-views/index.tsx index e14b2e2df..cb29ce451 100644 --- a/packages/editor-skeleton/src/components/widget-views.tsx +++ b/packages/editor-skeleton/src/components/widget-views/index.tsx @@ -2,13 +2,15 @@ import { Component, ReactElement } from 'react'; import { Icon } from '@alifd/next'; import classNames from 'classnames'; import { Title, observer, Tip, globalContext, Editor } from '@ali/lowcode-editor-core'; -import { DockProps } from '../types'; -import PanelDock from '../widget/panel-dock'; -import { composeTitle } from '../widget/utils'; -import WidgetContainer from '../widget/widget-container'; -import Panel from '../widget/panel'; -import { IWidget } from '../widget/widget'; -import { SkeletonEvents } from '../skeleton'; +import { DockProps } from '../../types'; +import PanelDock from '../../widget/panel-dock'; +import { composeTitle } from '../../widget/utils'; +import WidgetContainer from '../../widget/widget-container'; +import Panel from '../../widget/panel'; +import { IWidget } from '../../widget/widget'; +import { SkeletonEvents } from '../../skeleton'; + +import './index.less'; export function DockView({ title, icon, description, size, className, onClick }: DockProps) { return ( @@ -262,9 +264,6 @@ export class WidgetView extends Component<{ widget: IWidget }> { } render() { const { widget } = this.props; - if (!widget.visible) { - return null; - } - return widget.body; + return
{widget.body}
; } }