From 2701824f6f52e6ad589b2a7f8abf62907334ac52 Mon Sep 17 00:00:00 2001 From: zmq248570 Date: Tue, 5 May 2020 19:24:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=88=97=E7=82=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91=20drawer=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=89=93=E5=BC=80=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/src/vision/index.ts | 28 ++----------------- .../editor-skeleton/src/layouts/main-area.tsx | 2 +- .../src/layouts/right-area.tsx | 2 +- .../editor-skeleton/src/layouts/top-area.tsx | 2 +- .../src/renderer-view.tsx | 10 ------- 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/packages/demo/src/vision/index.ts b/packages/demo/src/vision/index.ts index f8a2ecfb5..e01b724c6 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -102,10 +102,7 @@ function initDemoPanes() { props: { align: 'bottom', icon: 'set', - description: '设置', - // onClick:()=>{ - // Engine.Pages.currentPage.root.select(); - // } + description: '设置' }, }); skeleton.add({ @@ -115,16 +112,7 @@ function initDemoPanes() { props: { align: 'bottom', icon: 'help', - description: '帮助', - onClick:()=>{ - const linkConfig = getDesignerModuleConfigs({}, 'helpLink'); - const reVersion = getConfig('RE_VERSION'); - let defaultLink = 'https://go.alibaba-inc.com/help/'; - if (cv(reVersion, '7.0.0') >= 0) { - defaultLink = 'https://go.alibaba-inc.com/help3/'; - } - window.open(linkConfig.url ? linkConfig.url : defaultLink, '_blank'); - } + description: '帮助' }, }); @@ -200,18 +188,6 @@ async function initTrunkPane() { Panes.add(TrunkPane); } -// 帮助面板 -function getDesignerModuleConfigs(source?:any, moduleName?:any) { - return _get(source, ['modules', moduleName], {}); -} -function getConfig(name: any) { - const { g_config, pageConfig } = window as any; - return ( - window[name] - || (g_config || {})[name] - || (pageConfig || {})[name] - ); -} // 数据源面板 function initDataPoolPane() { const dpConfigs = {}; diff --git a/packages/editor-skeleton/src/layouts/main-area.tsx b/packages/editor-skeleton/src/layouts/main-area.tsx index 891053427..9361a320f 100644 --- a/packages/editor-skeleton/src/layouts/main-area.tsx +++ b/packages/editor-skeleton/src/layouts/main-area.tsx @@ -13,7 +13,7 @@ export default class MainArea extends Component<{ area: Area +
{area.container.items.map((item) => item.content)}
); diff --git a/packages/editor-skeleton/src/layouts/right-area.tsx b/packages/editor-skeleton/src/layouts/right-area.tsx index 9379f55b1..69178edc3 100644 --- a/packages/editor-skeleton/src/layouts/right-area.tsx +++ b/packages/editor-skeleton/src/layouts/right-area.tsx @@ -12,7 +12,7 @@ export default class RightArea extends Component<{ area: Area }> { render() { const { area } = this.props; return ( -
diff --git a/packages/editor-skeleton/src/layouts/top-area.tsx b/packages/editor-skeleton/src/layouts/top-area.tsx index 2b8535117..062399a32 100644 --- a/packages/editor-skeleton/src/layouts/top-area.tsx +++ b/packages/editor-skeleton/src/layouts/top-area.tsx @@ -8,7 +8,7 @@ export default class TopArea extends Component<{ area: Area }> { render() { const { area } = this.props; return ( -
diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 9e76eee34..e964c2be9 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -84,16 +84,6 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { const { __id, __desingMode, ...viewProps } = props; viewProps.componentId = __id; viewProps._leaf = host.document.getNode(__id); - // if (Component.displayName === 'Calendar') { - // // debugger - // const testProps = { - // // defaultDate: undefined, - // // dateCellRender:(date: any)=>{return date.date();} - // // onSelect:(value:any)=>{console.log(value,'test')} - // // defaultMonth: undefined, - // }; - // Object.assign(viewProps, testProps); - // } return createElement( Component, viewProps,