From e85b542161c29fa799208f98480e7d03c55d7d34 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Tue, 23 Jun 2020 22:12:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1=E5=99=A8=E3=80=81?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=A0=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E4=B8=BA=20Page=20=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=20topArea=20=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/node/node.ts | 4 ++++ packages/editor-preset-vision/src/pages.ts | 9 ++++++--- packages/editor-skeleton/src/layouts/workbench.less | 5 +++++ packages/rax-render/src/utils/index.js | 2 +- packages/react-renderer/src/engine/blockEngine.jsx | 2 +- packages/react-renderer/src/engine/index.jsx | 1 + packages/react-renderer/src/utils/index.js | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index 54fe0c483..60bd8c28f 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -520,6 +520,10 @@ export class Node { } } + toData() { + return this.export(); + } + /** * 导出 schema */ diff --git a/packages/editor-preset-vision/src/pages.ts b/packages/editor-preset-vision/src/pages.ts index bc3ee9d12..504b544ba 100644 --- a/packages/editor-preset-vision/src/pages.ts +++ b/packages/editor-preset-vision/src/pages.ts @@ -39,10 +39,13 @@ const pages = Object.assign(project, { } else { componentsTree = pages[0].componentsTree; if (componentsTree[0]) { - componentsTree[0].componentName = 'Page'; + componentsTree[0].componentName = componentsTree[0].componentName || 'Page'; // FIXME - componentsTree[0].lifeCycles = {}; - componentsTree[0].methods = {}; + if (componentsTree[0].componentName === 'Page' || + componentsTree[0].componentName === 'Component') { + componentsTree[0].lifeCycles = {}; + componentsTree[0].methods = {}; + } } } diff --git a/packages/editor-skeleton/src/layouts/workbench.less b/packages/editor-skeleton/src/layouts/workbench.less index deec754a1..504b1e6ff 100644 --- a/packages/editor-skeleton/src/layouts/workbench.less +++ b/packages/editor-skeleton/src/layouts/workbench.less @@ -143,6 +143,11 @@ body { margin-bottom: 2px; padding: 8px 12px 8px 16px; + .lc-top-area-left { + display: flex; + align-items: center; + } + .lc-top-area-center{ flex: 1; display: flex; diff --git a/packages/rax-render/src/utils/index.js b/packages/rax-render/src/utils/index.js index 814f1edc9..d8fdde649 100644 --- a/packages/rax-render/src/utils/index.js +++ b/packages/rax-render/src/utils/index.js @@ -69,7 +69,7 @@ export function isSchema(schema, ignoreArr) { export function isFileSchema(schema) { if (isEmpty(schema)) return false; - return ['Page', 'Block', 'Component', 'Addon', 'Temp'].includes(schema.componentName); + return ['Page', 'Block', 'Component', 'Addon', 'Temp', 'Div'].includes(schema.componentName); } // 判断当前页面是否被嵌入到同域的页面中 diff --git a/packages/react-renderer/src/engine/blockEngine.jsx b/packages/react-renderer/src/engine/blockEngine.jsx index f56342763..9712ef3ea 100644 --- a/packages/react-renderer/src/engine/blockEngine.jsx +++ b/packages/react-renderer/src/engine/blockEngine.jsx @@ -61,7 +61,7 @@ export default class BlockEngine extends BaseEngine { render() { const { __schema } = this.props; - if (!isSchema(__schema, true) || __schema.componentName !== 'Block') { + if (!isSchema(__schema, true) || (__schema.componentName !== 'Block' && __schema.componentName !== 'Div')) { return '区块schema结构异常！'; } diff --git a/packages/react-renderer/src/engine/index.jsx b/packages/react-renderer/src/engine/index.jsx index 0853a39e0..9147f347c 100644 --- a/packages/react-renderer/src/engine/index.jsx +++ b/packages/react-renderer/src/engine/index.jsx @@ -23,6 +23,7 @@ const ENGINE_COMPS = { BlockEngine, AddonEngine, TempEngine, + DivEngine: BlockEngine, }; class FaultComponent extends PureComponent { diff --git a/packages/react-renderer/src/utils/index.js b/packages/react-renderer/src/utils/index.js index cc5c5a256..9dc2469a0 100644 --- a/packages/react-renderer/src/utils/index.js +++ b/packages/react-renderer/src/utils/index.js @@ -69,7 +69,7 @@ export function isSchema(schema, ignoreArr) { export function isFileSchema(schema) { if (isEmpty(schema)) return false; - return ['Page', 'Block', 'Component', 'Addon', 'Temp'].includes(schema.componentName); + return ['Page', 'Block', 'Component', 'Addon', 'Temp', 'Div'].includes(schema.componentName); } // 判断当前页面是否被嵌入到同域的页面中