From 0c4de43358c712368c82de7dcaa69ef9bb0f55f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E7=A6=85?= Date: Tue, 1 Sep 2020 19:11:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=AE=B9=E5=99=A8=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5=20placeholder=20?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E5=BA=94=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react-simulator-renderer/src/renderer-view.tsx | 12 +----------- packages/react-simulator-renderer/src/renderer.less | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index c5931929f..92186d9d3 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -117,17 +117,7 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { (!viewProps.style || Object.keys(viewProps.style).length === 0) ) { children = ( -
+
{viewProps.placeholder || '拖拽组件或模板到这里'}
); diff --git a/packages/react-simulator-renderer/src/renderer.less b/packages/react-simulator-renderer/src/renderer.less index 76d83aacf..d7da4f61a 100644 --- a/packages/react-simulator-renderer/src/renderer.less +++ b/packages/react-simulator-renderer/src/renderer.less @@ -105,3 +105,13 @@ body.engine-document { #app { height: 100vh; } + +.container-placeholder { + height: 44px; + line-height: 44px; + background-color: #f0f0f0; + border-color: #a7b1bd; + border: 1px dotted; + color: #a7b1bd; + text-align: center; +} \ No newline at end of file From a171d3ef46b2a717ebbf2b55e023857968808ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Thu, 3 Sep 2020 11:38:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20set('schema')?= =?UTF-8?q?=20=E5=90=8E=20componentsTree=20=E8=B6=8A=E6=9D=A5=E8=B6=8A?= =?UTF-8?q?=E5=A4=9A=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/document-model.ts | 6 +++++- packages/designer/src/project/project.ts | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 7a7666d63..6cb074f11 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -1,5 +1,5 @@ import { computed, obx } from '@ali/lowcode-editor-core'; -import { NodeData, isJSExpression, isDOMText, NodeSchema, isNodeSchema, RootSchema } from '@ali/lowcode-types'; +import { NodeData, isJSExpression, isDOMText, NodeSchema, isNodeSchema, RootSchema, PageSchema } from '@ali/lowcode-types'; import { EventEmitter } from 'events'; import { Project } from '../project'; import { ISimulatorHost } from '../simulator'; @@ -659,3 +659,7 @@ export class DocumentModel { export function isDocumentModel(obj: any): obj is DocumentModel { return obj && obj.rootNode; } + +export function isPageSchema(obj: any): obj is PageSchema { + return obj?.componentName === 'Page'; +} diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts index 47e03f24c..13cb65be0 100644 --- a/packages/designer/src/project/project.ts +++ b/packages/designer/src/project/project.ts @@ -1,7 +1,7 @@ import { EventEmitter } from 'events'; import { obx, computed } from '@ali/lowcode-editor-core'; import { Designer } from '../designer'; -import { DocumentModel, isDocumentModel } from '../document'; +import { DocumentModel, isDocumentModel, isPageSchema } from '../document'; import { ProjectSchema, RootSchema } from '@ali/lowcode-types'; export class Project { @@ -138,6 +138,11 @@ export class Project { if (isDocumentModel(doc)) { return doc.open(); + } else if (isPageSchema(doc)) { + const foundDoc = this.documents.find(curDoc => curDoc?.rootNode?.id && curDoc?.rootNode?.id === doc?.id); + if (foundDoc) { + foundDoc.remove(); + } } doc = new DocumentModel(this, doc); From 1f6d131300103cf0acdaf0e43183ad0ce7435d92 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Mon, 7 Sep 2020 15:52:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=8A=BD=E7=A6=BBAppHelper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 导出AppHelper --- packages/rax-render/package.json | 3 ++- packages/rax-render/src/hoc/compFactory.js | 2 +- packages/utils/package.json | 2 +- .../src/utils/appHelper.js => utils/src/appHelper.ts} | 2 +- packages/utils/src/index.ts | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) rename packages/{rax-render/src/utils/appHelper.js => utils/src/appHelper.ts} (94%) diff --git a/packages/rax-render/package.json b/packages/rax-render/package.json index 5ab65c43e..2b2b0860b 100644 --- a/packages/rax-render/package.json +++ b/packages/rax-render/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-rax-renderer", - "version": "1.0.7-0", + "version": "1.0.7-1", "description": "Rax renderer for Ali lowCode engine", "main": "lib/index.js", "module": "lib/index.js", @@ -36,6 +36,7 @@ "@ali/b3-one": "^0.0.17", "@ali/bzb-request": "2.6.1", "@ali/lib-mtop": "^2.5.1", + "@ali/lowcode-utils": "^0.8.22", "classnames": "^2.2.6", "debug": "^4.1.1", "events": "^3.0.0", diff --git a/packages/rax-render/src/hoc/compFactory.js b/packages/rax-render/src/hoc/compFactory.js index cf4ea40e6..98b1a3269 100644 --- a/packages/rax-render/src/hoc/compFactory.js +++ b/packages/rax-render/src/hoc/compFactory.js @@ -1,6 +1,6 @@ import { Component, createElement, forwardRef } from 'rax'; import PropTypes from 'prop-types'; -import AppHelper from '../utils/appHelper'; +import { AppHelper } from '@ali/lowcode-utils'; import { forEach, isFileSchema } from '../utils'; import CompEngine from '../engine/compEngine'; import BlockEngine from '../engine/blockEngine'; diff --git a/packages/utils/package.json b/packages/utils/package.json index 6f56bc89d..b23f3a054 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-utils", - "version": "1.0.7-0", + "version": "1.0.7-1", "description": "Utils for Ali lowCode engine", "files": [ "es", diff --git a/packages/rax-render/src/utils/appHelper.js b/packages/utils/src/appHelper.ts similarity index 94% rename from packages/rax-render/src/utils/appHelper.js rename to packages/utils/src/appHelper.ts index e39741ddc..d9b80856f 100644 --- a/packages/rax-render/src/utils/appHelper.js +++ b/packages/utils/src/appHelper.ts @@ -4,7 +4,7 @@ let instance = null; EventEmitter.defaultMaxListeners = 100; -export default class AppHelper extends EventEmitter { +export class AppHelper extends EventEmitter { static getInstance = () => { if (!instance) { instance = new AppHelper(); diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 08d5342b1..0f9fcad2a 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -19,3 +19,4 @@ export * from './shallow-equal'; export * from './svg-icon'; export * from './unique-id'; export * from './build-components'; +export * from './appHelper';