From f3ac23bc894d839dcbd3202434cd5ec4a09a9203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=BD=E5=9F=8E?= Date: Fri, 21 Aug 2020 16:50:55 +0800 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=99=A8=20hoo?= =?UTF-8?q?ks=20=E8=83=BD=E5=8A=9B=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-core/src/editor.ts | 50 +++++++++++++++++++++++++++--- packages/types/src/editor.ts | 2 +- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/packages/editor-core/src/editor.ts b/packages/editor-core/src/editor.ts index db9e0d784..f55c03df3 100644 --- a/packages/editor-core/src/editor.ts +++ b/packages/editor-core/src/editor.ts @@ -1,13 +1,22 @@ import { EventEmitter } from 'events'; -import { IEditor, EditorConfig, PluginClassSet, KeyType, GetOptions, GetReturnType } from '@ali/lowcode-types'; +import { + IEditor, + EditorConfig, + PluginClassSet, + KeyType, + GetOptions, + GetReturnType, + HookConfig, +} from '@ali/lowcode-types'; import { IocContext, RegisterOptions } from './di'; import { globalLocale } from './intl'; +import * as utils from './utils'; +import { tipHandler } from './widgets/tip/tip-handler'; + EventEmitter.defaultMaxListeners = 100; const NOT_FOUND = Symbol.for('not_found'); -import * as utils from './utils'; - export class Editor extends EventEmitter implements IEditor { /** * Ioc Container @@ -22,6 +31,8 @@ export class Editor extends EventEmitter implements IEditor { readonly utils = utils; + private hooks: HookConfig[] = []; + get(keyOrType: KeyOrType, opt?: GetOptions): GetReturnType | undefined { const x = this.context.get(keyOrType, opt); if (x === NOT_FOUND) { @@ -79,15 +90,19 @@ export class Editor extends EventEmitter implements IEditor { async init(config?: EditorConfig, components?: PluginClassSet): Promise { this.config = config || {}; this.components = components || {}; - const { shortCuts = [], lifeCycles } = this.config; + const { shortCuts = [], hooks = [], lifeCycles } = this.config; this.emit('editor.beforeInit'); const init = (lifeCycles && lifeCycles.init) || ((): void => {}); + try { await init(this); // 注册快捷键 // registShortCuts(shortCuts, this); + // 注册 hooks + this.registerHooks(hooks); this.emit('editor.afterInit'); + return true; } catch (err) { console.error(err); @@ -101,6 +116,9 @@ export class Editor extends EventEmitter implements IEditor { try { const { shortCuts = [], lifeCycles = {} } = this.config; // unRegistShortCuts(shortCuts); + + this.unRegisterHooks(); + if (lifeCycles.destroy) { lifeCycles.destroy(this); } @@ -109,6 +127,30 @@ export class Editor extends EventEmitter implements IEditor { } } + initHooks = (hooks: HookConfig[]) => { + this.hooks = hooks.map((hook) => ({ + ...hook, + // 指定第一个参数为 editor + handler: hook.handler.bind(this, this), + })); + + return this.hooks; + }; + + registerHooks = (hooks: HookConfig[]) => { + this.initHooks(hooks).forEach(({ message, type, handler }) => { + if (['on', 'once'].indexOf(type) !== -1) { + this[type](message, handler); + } + }); + }; + + unRegisterHooks = () => { + this.hooks.forEach(({ message, handler }) => { + this.removeListener(message, handler); + }); + }; + private waits = new Map< KeyType, Array<{ diff --git a/packages/types/src/editor.ts b/packages/types/src/editor.ts index bfb2682b8..2b5efd989 100644 --- a/packages/types/src/editor.ts +++ b/packages/types/src/editor.ts @@ -92,7 +92,7 @@ export type HooksConfig = HookConfig[]; export interface HookConfig { message: string; type: 'on' | 'once'; - handler: (editor: IEditor, ...args: any[]) => void; + handler: (this: IEditor, editor: IEditor, ...args: any[]) => void; } export type ShortCutsConfig = ShortCutConfig[]; From 488a5d8283bdcc3ff631431c6f968549b40e6e0f Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 23 Aug 2020 11:28:46 +0800 Subject: [PATCH 02/17] =?UTF-8?q?fix:=20nextId()=20=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/src/document/document-model.ts | 23 +++++++++++-------- packages/designer/src/document/node/node.ts | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 239560c35..544857bc9 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -20,14 +20,14 @@ export type GetDataType = T extends undefined : any : T; - export interface ComponentMap { - componentName: string; - package: string; - version?: string; - destructuring?: boolean; - exportName?: string; - subName?: string; - } +export interface ComponentMap { + componentName: string; + package: string; + version?: string; + destructuring?: boolean; + exportName?: string; + subName?: string; +} export class DocumentModel { /** @@ -148,7 +148,12 @@ export class DocumentModel { * 生成唯一id */ nextId() { - return (this.id.slice(-10) + (++this.seqId).toString(36)).toLocaleLowerCase(); + let id; + do { + id = 'node_' + (this.id.slice(-10) + (++this.seqId).toString(36)).toLocaleLowerCase(); + } while (this.nodesMap.get(id)) + + return id; } /** diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index 4aaca47ef..384b445e3 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -148,7 +148,7 @@ export class Node { constructor(readonly document: DocumentModel, nodeSchema: Schema) { const { componentName, id, children, props, ...extras } = nodeSchema; - this.id = id || `node_${document.nextId()}`; + this.id = id || document.nextId(); this.componentName = componentName; if (this.componentName === 'Leaf') { this.props = new Props(this, { From 31215da05baf9b8d5276260fa4e9fcdbdca53f96 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 23 Aug 2020 13:14:01 +0800 Subject: [PATCH 03/17] =?UTF-8?q?fix:=20fieldId=20=E9=87=8D=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-preset-vision/src/editor.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts index caeb0f920..43554c6c4 100644 --- a/packages/editor-preset-vision/src/editor.ts +++ b/packages/editor-preset-vision/src/editor.ts @@ -26,8 +26,9 @@ export const designer = new Designer({ editor: editor }); editor.set(Designer, designer); editor.set('designer', designer); -const nodeCache: any = {}; +let nodeCache: any = {}; designer.project.onCurrentDocumentChange((doc) => { + nodeCache = {}; doc.nodesMap.forEach((node) => { nodeCache[node.id] = node; }); @@ -97,6 +98,9 @@ designer.addPropsReducer((props, node) => { if (newProps.fieldId) { const fieldIds: any = []; Object.keys(nodeCache).forEach(nodeId => { + if (nodeId === node.id) { + return; + } const fieldId = nodeCache[nodeId].getPropValue('fieldId'); if (fieldId) { fieldIds.push(fieldId); From aa10342ceafb6c3a11b296c278451925eec44590 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 23 Aug 2020 17:08:49 +0800 Subject: [PATCH 04/17] Publish - @ali/lowcode-rax-simulator-renderer@0.8.53 --- packages/rax-simulator-renderer/CHANGELOG.md | 8 ++++++++ packages/rax-simulator-renderer/package.json | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md index 9a958313e..589eb97ff 100644 --- a/packages/rax-simulator-renderer/CHANGELOG.md +++ b/packages/rax-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.52...@ali/lowcode-rax-simulator-renderer@0.8.53) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer + ## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.51...@ali/lowcode-rax-simulator-renderer@0.8.52) (2020-08-20) diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 7ca05fd1a..2b8a341f2 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-rax-simulator-renderer", - "version": "0.8.52", + "version": "0.8.53", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -53,5 +53,5 @@ "ts-node/register" ] }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.51/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.52/build/index.html" } From 9ca00c5ba60e7e23742f1a63d4805cd8fe52f373 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 23 Aug 2020 17:17:05 +0800 Subject: [PATCH 05/17] Publish - @ali/lowcode-demo@0.8.59 - @ali/lowcode-designer@0.9.49 - @ali/lowcode-editor-preset-general@0.9.34 - @ali/lowcode-editor-preset-vision@0.8.51 - @ali/lowcode-editor-skeleton@0.8.55 - @ali/lowcode-plugin-components-pane@0.8.51 - @ali/lowcode-plugin-designer@0.9.49 - @ali/lowcode-plugin-outline-pane@0.8.55 - @ali/lowcode-plugin-sample-preview@0.8.53 - @ali/lowcode-plugin-undo-redo@0.8.53 - @ali/lowcode-rax-simulator-renderer@0.8.54 - @ali/lowcode-react-simulator-renderer@0.8.55 --- packages/demo/CHANGELOG.md | 8 ++++++++ packages/demo/package.json | 14 +++++++------- packages/designer/CHANGELOG.md | 11 +++++++++++ packages/designer/package.json | 2 +- packages/editor-preset-general/CHANGELOG.md | 8 ++++++++ packages/editor-preset-general/package.json | 8 ++++---- packages/editor-preset-vision/CHANGELOG.md | 11 +++++++++++ packages/editor-preset-vision/package.json | 10 +++++----- packages/editor-skeleton/CHANGELOG.md | 8 ++++++++ packages/editor-skeleton/package.json | 4 ++-- packages/plugin-components-pane/CHANGELOG.md | 8 ++++++++ packages/plugin-components-pane/package.json | 4 ++-- packages/plugin-designer/CHANGELOG.md | 8 ++++++++ packages/plugin-designer/package.json | 4 ++-- packages/plugin-outline-pane/CHANGELOG.md | 8 ++++++++ packages/plugin-outline-pane/package.json | 4 ++-- packages/plugin-sample-preview/CHANGELOG.md | 8 ++++++++ packages/plugin-sample-preview/package.json | 4 ++-- packages/plugin-undo-redo/CHANGELOG.md | 8 ++++++++ packages/plugin-undo-redo/package.json | 6 +++--- packages/rax-simulator-renderer/CHANGELOG.md | 8 ++++++++ packages/rax-simulator-renderer/package.json | 6 +++--- packages/react-simulator-renderer/CHANGELOG.md | 8 ++++++++ packages/react-simulator-renderer/package.json | 4 ++-- 24 files changed, 137 insertions(+), 35 deletions(-) diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md index 680aacfeb..a82ef1ebc 100644 --- a/packages/demo/CHANGELOG.md +++ b/packages/demo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.58...@ali/lowcode-demo@0.8.59) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + ## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.57...@ali/lowcode-demo@0.8.58) (2020-08-20) diff --git a/packages/demo/package.json b/packages/demo/package.json index e2c25eff9..1df61199d 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-demo", - "version": "0.8.58", + "version": "0.8.59", "private": true, "description": "低代码引擎 DEMO", "scripts": { @@ -10,15 +10,15 @@ "config": {}, "dependencies": { "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.54", - "@ali/lowcode-plugin-components-pane": "^0.8.50", - "@ali/lowcode-plugin-designer": "^0.9.48", + "@ali/lowcode-editor-skeleton": "^0.8.55", + "@ali/lowcode-plugin-components-pane": "^0.8.51", + "@ali/lowcode-plugin-designer": "^0.9.49", "@ali/lowcode-plugin-event-bind-dialog": "^0.8.30", - "@ali/lowcode-plugin-outline-pane": "^0.8.54", + "@ali/lowcode-plugin-outline-pane": "^0.8.55", "@ali/lowcode-plugin-sample-logo": "^0.8.29", - "@ali/lowcode-plugin-sample-preview": "^0.8.52", + "@ali/lowcode-plugin-sample-preview": "^0.8.53", "@ali/lowcode-plugin-settings-pane": "^0.8.8", - "@ali/lowcode-plugin-undo-redo": "^0.8.52", + "@ali/lowcode-plugin-undo-redo": "^0.8.53", "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.28", "@ali/lowcode-plugin-zh-en": "^0.8.32", "@ali/lowcode-react-renderer": "^0.8.20", diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index 390fc7bc4..208837d0c 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.48...@ali/lowcode-designer@0.9.49) (2020-08-23) + + +### Bug Fixes + +* nextId() 逻辑调整 ([488a5d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/488a5d8)) + + + + ## [0.9.48](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.47...@ali/lowcode-designer@0.9.48) (2020-08-20) diff --git a/packages/designer/package.json b/packages/designer/package.json index 13c1be23d..847806775 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-designer", - "version": "0.9.48", + "version": "0.9.49", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index 36e4fc374..8e9f11197 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.33...@ali/lowcode-editor-preset-general@0.9.34) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + ## [0.9.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.32...@ali/lowcode-editor-preset-general@0.9.33) (2020-08-20) diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json index 25e6fd5aa..372a6afae 100644 --- a/packages/editor-preset-general/package.json +++ b/packages/editor-preset-general/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-general", - "version": "0.9.33", + "version": "0.9.34", "private": true, "description": "Ali General Editor Preset", "main": "lib/index.js", @@ -16,9 +16,9 @@ "license": "MIT", "dependencies": { "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.54", - "@ali/lowcode-plugin-designer": "^0.9.48", - "@ali/lowcode-plugin-outline-pane": "^0.8.54", + "@ali/lowcode-editor-skeleton": "^0.8.55", + "@ali/lowcode-plugin-designer": "^0.9.49", + "@ali/lowcode-plugin-outline-pane": "^0.8.55", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", "@alifd/next": "^1.19.12", diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index eb7e9be9c..1876e1a97 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.50...@ali/lowcode-editor-preset-vision@0.8.51) (2020-08-23) + + +### Bug Fixes + +* fieldId 重置bug ([31215da](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/31215da)) + + + + ## [0.8.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.49...@ali/lowcode-editor-preset-vision@0.8.50) (2020-08-20) diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json index 01b61582c..6a302c890 100644 --- a/packages/editor-preset-vision/package.json +++ b/packages/editor-preset-vision/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-vision", - "version": "0.8.50", + "version": "0.8.51", "private": true, "description": "Vision Polyfill for Ali lowCode engine", "main": "lib/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.54", - "@ali/lowcode-plugin-designer": "^0.9.48", - "@ali/lowcode-plugin-outline-pane": "^0.8.54", + "@ali/lowcode-editor-skeleton": "^0.8.55", + "@ali/lowcode-plugin-designer": "^0.9.49", + "@ali/lowcode-plugin-outline-pane": "^0.8.55", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index 6cca09e55..a74a51ebc 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.54...@ali/lowcode-editor-skeleton@0.8.55) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-skeleton + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.53...@ali/lowcode-editor-skeleton@0.8.54) (2020-08-20) diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 159a27b33..9bd0dd8ea 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", - "version": "0.8.54", + "version": "0.8.55", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md index 2d02930e6..6a7db6e08 100644 --- a/packages/plugin-components-pane/CHANGELOG.md +++ b/packages/plugin-components-pane/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.50...@ali/lowcode-plugin-components-pane@0.8.51) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + ## [0.8.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.49...@ali/lowcode-plugin-components-pane@0.8.50) (2020-08-20) diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json index be486c084..ed5f18d6c 100644 --- a/packages/plugin-components-pane/package.json +++ b/packages/plugin-components-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-components-pane", - "version": "0.8.50", + "version": "0.8.51", "description": "alibaba lowcode editor component-list plugin", "files": [ "es/", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", "@ali/lowcode-types": "^0.8.16", "@ali/ve-component-list": "^1.1.1", diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index e088d370a..f66a3e2ba 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.48...@ali/lowcode-plugin-designer@0.9.49) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + ## [0.9.48](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.47...@ali/lowcode-plugin-designer@0.9.48) (2020-08-20) diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index be150662f..e09713c97 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-designer", - "version": "0.9.48", + "version": "0.9.49", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md index 0e2ff6865..5b4c33bb0 100644 --- a/packages/plugin-outline-pane/CHANGELOG.md +++ b/packages/plugin-outline-pane/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.54...@ali/lowcode-plugin-outline-pane@0.8.55) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.53...@ali/lowcode-plugin-outline-pane@0.8.54) (2020-08-20) diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 4e6e6d16f..7943f5e1a 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-outline-pane", - "version": "0.8.54", + "version": "0.8.55", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md index e88aa6978..8c25c89a7 100644 --- a/packages/plugin-sample-preview/CHANGELOG.md +++ b/packages/plugin-sample-preview/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.52...@ali/lowcode-plugin-sample-preview@0.8.53) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + ## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.51...@ali/lowcode-plugin-sample-preview@0.8.52) (2020-08-20) diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json index d2b3f1531..1fcb0d25e 100644 --- a/packages/plugin-sample-preview/package.json +++ b/packages/plugin-sample-preview/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-preview", - "version": "0.8.52", + "version": "0.8.53", "description": "alibaba lowcode editor sample preview plugin", "files": [ "es", @@ -18,7 +18,7 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", "@alifd/next": "^1.x", "react": "^16.8.1" diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md index 5a0d1505d..cb059d9aa 100644 --- a/packages/plugin-undo-redo/CHANGELOG.md +++ b/packages/plugin-undo-redo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.52...@ali/lowcode-plugin-undo-redo@0.8.53) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + ## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.51...@ali/lowcode-plugin-undo-redo@0.8.52) (2020-08-20) diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json index 6ee679098..eb261081f 100644 --- a/packages/plugin-undo-redo/package.json +++ b/packages/plugin-undo-redo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-undo-redo", - "version": "0.8.52", + "version": "0.8.53", "description": "alibaba lowcode editor undo redo plugin", "files": [ "es", @@ -19,9 +19,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.54", + "@ali/lowcode-editor-skeleton": "^0.8.55", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", "react": "^16.8.1", diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md index 589eb97ff..06b5f5ba7 100644 --- a/packages/rax-simulator-renderer/CHANGELOG.md +++ b/packages/rax-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.53...@ali/lowcode-rax-simulator-renderer@0.8.54) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer + ## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.52...@ali/lowcode-rax-simulator-renderer@0.8.53) (2020-08-23) diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 2b8a341f2..cfcecdf69 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-rax-simulator-renderer", - "version": "0.8.53", + "version": "0.8.54", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-rax-renderer": "^0.1.7", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", @@ -53,5 +53,5 @@ "ts-node/register" ] }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.52/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.53/build/index.html" } diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md index 95874c977..f9563a998 100644 --- a/packages/react-simulator-renderer/CHANGELOG.md +++ b/packages/react-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.54...@ali/lowcode-react-simulator-renderer@0.8.55) (2020-08-23) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.53...@ali/lowcode-react-simulator-renderer@0.8.54) (2020-08-20) diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 628ef071b..0b7b7df5b 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-react-simulator-renderer", - "version": "0.8.54", + "version": "0.8.55", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,7 +13,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.48", + "@ali/lowcode-designer": "^0.9.49", "@ali/lowcode-react-renderer": "^0.8.20", "@ali/lowcode-types": "^0.8.16", "@ali/lowcode-utils": "^0.8.18", From 8cc9d73f9129267c9e759cfdb357e3ae309436e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=86=A0?= Date: Mon, 24 Aug 2020 12:48:34 +0800 Subject: [PATCH 06/17] =?UTF-8?q?fix:=20=E5=A4=9A=E9=80=89=E6=97=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor-skeleton/src/components/settings/settings-pane.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx index a0341a002..ce3949636 100644 --- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx @@ -21,7 +21,7 @@ class SettingFieldView extends Component<{ field: SettingField }> { const { prototype } = componentMeta; let visible; try { - visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true; + visible = typeof condition === 'function' ? condition(field) !== false : true; } catch (error) { console.error('exception when condition (hidden) is excuted', error); } From 0e7e03887b3d9d0dadc467c17c91b8bc57e57b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 24 Aug 2020 15:31:56 +0800 Subject: [PATCH 07/17] =?UTF-8?q?fix:=20=E5=9C=A8=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E9=87=8C=EF=BC=8C=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=83=BD=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E7=AE=A1=20condition=20=E4=B8=BA=E4=BD=95=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/node/props/prop.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index 3ba60b5f3..b27b6e60b 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -65,6 +65,11 @@ export class Prop implements IPropParent { export(stage: TransformStage = TransformStage.Save): CompositeValue | UNSET { const type = this._type; + // 在设计器里，所有组件都需要展示 + if (stage === TransformStage.Render && this.key === '___condition___') { + return true; + } + if (type === 'unset') { // return UNSET; @康为 之后 review 下这块改造 return undefined; From c07b447fb5efb35eea39eee556c0a6bfd395578c Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Mon, 24 Aug 2020 17:04:51 +0800 Subject: [PATCH 08/17] =?UTF-8?q?fix:=20=E5=AE=9E=E7=8E=B0=20removeDocumen?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/document-model.ts | 2 +- packages/designer/src/project/project.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 544857bc9..1c6a5590f 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -461,7 +461,7 @@ export class DocumentModel { * 从项目中移除 */ remove() { - // this.project.removeDocument(this); + this.project.removeDocument(this); // todo: ... } diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts index 2480ded99..47e03f24c 100644 --- a/packages/designer/src/project/project.ts +++ b/packages/designer/src/project/project.ts @@ -69,6 +69,14 @@ export class Project { this.documents.forEach((doc) => doc.remove()); } + removeDocument(doc: DocumentModel) { + const index = this.documents.indexOf(doc); + if (index < 0) { + return; + } + this.documents.splice(index, 1); + } + /** * 分字段设置储存数据，不记录操作记录 */ From 59fac2555369707296fe1419a151ab276f50cef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 24 Aug 2020 20:37:51 +0800 Subject: [PATCH 09/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=94=80=E6=AF=81=E7=9B=B8=E5=BA=94=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B8=80=E7=B3=BB=E5=88=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/document-model.ts | 10 +++++++--- packages/designer/src/document/node/node.ts | 16 ++++++++-------- packages/plugin-outline-pane/src/tree-master.ts | 3 +++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 1c6a5590f..13cde0e05 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -33,7 +33,7 @@ export class DocumentModel { /** * 根节点 类型有：Page/Component/Block */ - readonly rootNode: RootNode; + rootNode: RootNode | null; /** * 文档编号 */ @@ -461,12 +461,16 @@ export class DocumentModel { * 从项目中移除 */ remove() { + this.purge(); this.project.removeDocument(this); - // todo: ... + this.designer.postEvent('document.remove', { id: this.id }); } purge() { - // todo: + this.rootNode?.purge(); + this.nodes.clear(); + this._nodesMap.clear(); + this.rootNode = null; } checkNesting(dropTarget: ParentalNode, dragObject: DragNodeObject | DragNodeDataObject): boolean { diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index 384b445e3..c69f780d5 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -679,7 +679,7 @@ export class Node { /** * 删除一个节点 - * @param node + * @param node */ removeChild(node: Node) { this.children?.delete(node); @@ -699,11 +699,11 @@ export class Node { if (this.purged) { return; } - if (this._parent) { - // should remove thisNode before purge - this.remove(useMutator); - return; - } + // if (this._parent) { + // // should remove thisNode before purge + // this.remove(useMutator); + // return; + // } this.purged = true; if (this.isParental()) { this.children.purge(useMutator); @@ -711,8 +711,8 @@ export class Node { this.autoruns?.forEach((dispose) => dispose()); this.props.purge(); this.document.internalRemoveAndPurgeNode(this); - this.document.destroyNode(this); + this.remove(useMutator); } /** @@ -862,7 +862,7 @@ export class Node { if (this.parent) { return this.parent.getSuitablePlace(node, ref); } - + return null; } /** diff --git a/packages/plugin-outline-pane/src/tree-master.ts b/packages/plugin-outline-pane/src/tree-master.ts index b89f116a2..326451958 100644 --- a/packages/plugin-outline-pane/src/tree-master.ts +++ b/packages/plugin-outline-pane/src/tree-master.ts @@ -54,6 +54,9 @@ export class TreeMaster { time: (endTime - startTime).toFixed(2), }); }); + designer.editor.on('designer.document.remove', ({ id }) => { + this.treeMap.delete(id); + }); } private toVision() { From 791501e2e03cc3693e69edd7fc9fb02f06b6184b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 24 Aug 2020 20:46:09 +0800 Subject: [PATCH 10/17] chore: unRegisterHooks -> unregisterHooks --- packages/editor-core/src/editor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor-core/src/editor.ts b/packages/editor-core/src/editor.ts index f55c03df3..6f8c22dc0 100644 --- a/packages/editor-core/src/editor.ts +++ b/packages/editor-core/src/editor.ts @@ -117,7 +117,7 @@ export class Editor extends EventEmitter implements IEditor { const { shortCuts = [], lifeCycles = {} } = this.config; // unRegistShortCuts(shortCuts); - this.unRegisterHooks(); + this.unregisterHooks(); if (lifeCycles.destroy) { lifeCycles.destroy(this); @@ -145,7 +145,7 @@ export class Editor extends EventEmitter implements IEditor { }); }; - unRegisterHooks = () => { + unregisterHooks = () => { this.hooks.forEach(({ message, handler }) => { this.removeListener(message, handler); }); From 16b427ba878a4eac03244f9928c13d92bcf3949e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 24 Aug 2020 22:17:07 +0800 Subject: [PATCH 11/17] Publish - @ali/lowcode-demo@0.8.60 - @ali/lowcode-designer@0.9.50 - @ali/lowcode-editor-core@0.8.33 - @ali/lowcode-editor-preset-general@0.9.35 - @ali/lowcode-editor-preset-vision@0.8.52 - @ali/lowcode-editor-setters@0.9.18 - @ali/lowcode-editor-skeleton@0.8.56 - @ali/lowcode-plugin-components-pane@0.8.52 - @ali/lowcode-plugin-designer@0.9.50 - @ali/lowcode-plugin-event-bind-dialog@0.8.31 - @ali/lowcode-plugin-outline-pane@0.8.56 - @ali/lowcode-plugin-sample-logo@0.8.30 - @ali/lowcode-plugin-sample-preview@0.8.54 - @ali/lowcode-plugin-source-editor@0.8.28 - @ali/lowcode-plugin-undo-redo@0.8.54 - @ali/lowcode-plugin-variable-bind-dialog@0.8.29 - @ali/lowcode-plugin-zh-en@0.8.33 - @ali/lowcode-rax-simulator-renderer@0.8.55 - @ali/lowcode-react-simulator-renderer@0.8.56 - @ali/lowcode-types@0.8.17 - @ali/lowcode-utils@0.8.19 --- packages/demo/CHANGELOG.md | 8 ++++++ packages/demo/package.json | 26 +++++++++---------- packages/designer/CHANGELOG.md | 13 ++++++++++ packages/designer/package.json | 8 +++--- packages/editor-core/CHANGELOG.md | 11 ++++++++ packages/editor-core/package.json | 6 ++--- packages/editor-preset-general/CHANGELOG.md | 8 ++++++ packages/editor-preset-general/package.json | 16 ++++++------ packages/editor-preset-vision/CHANGELOG.md | 8 ++++++ packages/editor-preset-vision/package.json | 12 ++++----- packages/editor-setters/CHANGELOG.md | 8 ++++++ packages/editor-setters/package.json | 4 +-- packages/editor-skeleton/CHANGELOG.md | 11 ++++++++ packages/editor-skeleton/package.json | 10 +++---- packages/plugin-components-pane/CHANGELOG.md | 8 ++++++ packages/plugin-components-pane/package.json | 8 +++--- packages/plugin-designer/CHANGELOG.md | 8 ++++++ packages/plugin-designer/package.json | 6 ++--- .../plugin-event-bind-dialog/CHANGELOG.md | 8 ++++++ .../plugin-event-bind-dialog/package.json | 6 ++--- packages/plugin-outline-pane/CHANGELOG.md | 11 ++++++++ packages/plugin-outline-pane/package.json | 10 +++---- packages/plugin-sample-logo/CHANGELOG.md | 8 ++++++ packages/plugin-sample-logo/package.json | 4 +-- packages/plugin-sample-preview/CHANGELOG.md | 8 ++++++ packages/plugin-sample-preview/package.json | 6 ++--- packages/plugin-source-editor/CHANGELOG.md | 8 ++++++ packages/plugin-source-editor/package.json | 4 +-- packages/plugin-undo-redo/CHANGELOG.md | 8 ++++++ packages/plugin-undo-redo/package.json | 12 ++++----- .../plugin-variable-bind-dialog/CHANGELOG.md | 8 ++++++ .../plugin-variable-bind-dialog/package.json | 4 +-- packages/plugin-zh-en/CHANGELOG.md | 8 ++++++ packages/plugin-zh-en/package.json | 8 +++--- packages/rax-simulator-renderer/CHANGELOG.md | 8 ++++++ packages/rax-simulator-renderer/package.json | 10 +++---- .../react-simulator-renderer/CHANGELOG.md | 8 ++++++ .../react-simulator-renderer/package.json | 8 +++--- packages/types/CHANGELOG.md | 11 ++++++++ packages/types/package.json | 2 +- packages/utils/CHANGELOG.md | 8 ++++++ packages/utils/package.json | 4 +-- 42 files changed, 272 insertions(+), 87 deletions(-) diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md index a82ef1ebc..915ef05f8 100644 --- a/packages/demo/CHANGELOG.md +++ b/packages/demo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.60](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.59...@ali/lowcode-demo@0.8.60) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + ## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.58...@ali/lowcode-demo@0.8.59) (2020-08-23) diff --git a/packages/demo/package.json b/packages/demo/package.json index 1df61199d..e8fd1ee47 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-demo", - "version": "0.8.59", + "version": "0.8.60", "private": true, "description": "低代码引擎 DEMO", "scripts": { @@ -9,21 +9,21 @@ }, "config": {}, "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.55", - "@ali/lowcode-plugin-components-pane": "^0.8.51", - "@ali/lowcode-plugin-designer": "^0.9.49", - "@ali/lowcode-plugin-event-bind-dialog": "^0.8.30", - "@ali/lowcode-plugin-outline-pane": "^0.8.55", - "@ali/lowcode-plugin-sample-logo": "^0.8.29", - "@ali/lowcode-plugin-sample-preview": "^0.8.53", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-editor-skeleton": "^0.8.56", + "@ali/lowcode-plugin-components-pane": "^0.8.52", + "@ali/lowcode-plugin-designer": "^0.9.50", + "@ali/lowcode-plugin-event-bind-dialog": "^0.8.31", + "@ali/lowcode-plugin-outline-pane": "^0.8.56", + "@ali/lowcode-plugin-sample-logo": "^0.8.30", + "@ali/lowcode-plugin-sample-preview": "^0.8.54", "@ali/lowcode-plugin-settings-pane": "^0.8.8", - "@ali/lowcode-plugin-undo-redo": "^0.8.53", - "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.28", - "@ali/lowcode-plugin-zh-en": "^0.8.32", + "@ali/lowcode-plugin-undo-redo": "^0.8.54", + "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.29", + "@ali/lowcode-plugin-zh-en": "^0.8.33", "@ali/lowcode-react-renderer": "^0.8.20", "@ali/lowcode-runtime": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-utils": "^0.8.19", "@ali/ve-action-pane": "^4.7.0-beta.0", "@ali/ve-datapool-pane": "^6.4.3", "@ali/ve-history-pane": "4.0.0", diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index 208837d0c..5a66a27e7 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.49...@ali/lowcode-designer@0.9.50) (2020-08-24) + + +### Bug Fixes + +* 修复在切换页面时，没有销毁相应节点导致的一系列bug ([59fac25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/59fac25)) +* 在设计器里，所有组件都需要展示，不管 condition 为何值 ([0e7e038](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/0e7e038)) +* 实现 removeDocument ([c07b447](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c07b447)) + + + + ## [0.9.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.48...@ali/lowcode-designer@0.9.49) (2020-08-23) diff --git a/packages/designer/package.json b/packages/designer/package.json index 847806775..8647fe451 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-designer", - "version": "0.9.49", + "version": "0.9.50", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", @@ -15,9 +15,9 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "classnames": "^2.2.6", "event": "^1.0.0", "react": "^16", diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md index 488285270..cd79c95a0 100644 --- a/packages/editor-core/CHANGELOG.md +++ b/packages/editor-core/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.32...@ali/lowcode-editor-core@0.8.33) (2020-08-24) + + +### Features + +* 编辑器 hooks 能力实现 ([f3ac23b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f3ac23b)) + + + + ## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.30...@ali/lowcode-editor-core@0.8.32) (2020-08-20) diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json index 84e41285f..7c1fd19cc 100644 --- a/packages/editor-core/package.json +++ b/packages/editor-core/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-core", - "version": "0.8.32", + "version": "0.8.33", "description": "Core Api for Ali lowCode engine", "license": "MIT", "main": "lib/index.js", @@ -15,8 +15,8 @@ "cloud-build": "build-scripts build --skip-demo" }, "dependencies": { - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@alifd/next": "^1.19.16", "@recore/obx": "^1.0.9", "@recore/obx-react": "^1.0.8", diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index 8e9f11197..bcc6eccf0 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.34...@ali/lowcode-editor-preset-general@0.9.35) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + ## [0.9.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.33...@ali/lowcode-editor-preset-general@0.9.34) (2020-08-23) diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json index 372a6afae..74ebd7c06 100644 --- a/packages/editor-preset-general/package.json +++ b/packages/editor-preset-general/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-general", - "version": "0.9.34", + "version": "0.9.35", "private": true, "description": "Ali General Editor Preset", "main": "lib/index.js", @@ -15,12 +15,12 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.55", - "@ali/lowcode-plugin-designer": "^0.9.49", - "@ali/lowcode-plugin-outline-pane": "^0.8.55", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-editor-skeleton": "^0.8.56", + "@ali/lowcode-plugin-designer": "^0.9.50", + "@ali/lowcode-plugin-outline-pane": "^0.8.56", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@alifd/next": "^1.19.12", "@alife/theme-lowcode-dark": "^0.1.0", "@alife/theme-lowcode-light": "^0.1.0", @@ -28,7 +28,7 @@ "react-dom": "^16.8.1" }, "devDependencies": { - "@ali/lowcode-editor-setters": "^0.9.17", + "@ali/lowcode-editor-setters": "^0.9.18", "@alib/build-scripts": "^0.1.18", "@types/events": "^3.0.0", "@types/react": "^16.8.3", diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index 1876e1a97..e7371d82e 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.51...@ali/lowcode-editor-preset-vision@0.8.52) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + ## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.50...@ali/lowcode-editor-preset-vision@0.8.51) (2020-08-23) diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json index 6a302c890..09b4ef9fa 100644 --- a/packages/editor-preset-vision/package.json +++ b/packages/editor-preset-vision/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-vision", - "version": "0.8.51", + "version": "0.8.52", "private": true, "description": "Vision Polyfill for Ali lowCode engine", "main": "lib/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.55", - "@ali/lowcode-plugin-designer": "^0.9.49", - "@ali/lowcode-plugin-outline-pane": "^0.8.55", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-editor-skeleton": "^0.8.56", + "@ali/lowcode-plugin-designer": "^0.9.50", + "@ali/lowcode-plugin-outline-pane": "^0.8.56", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/editor-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md index 2a4f79137..6cee799a3 100644 --- a/packages/editor-setters/CHANGELOG.md +++ b/packages/editor-setters/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.17...@ali/lowcode-editor-setters@0.9.18) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-setters + ## [0.9.17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.16...@ali/lowcode-editor-setters@0.9.17) (2020-08-20) diff --git a/packages/editor-setters/package.json b/packages/editor-setters/package.json index 43825ba03..2b0dbd313 100644 --- a/packages/editor-setters/package.json +++ b/packages/editor-setters/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-setters", - "version": "0.9.17", + "version": "0.9.18", "description": "Builtin setters for Ali lowCode engine", "files": [ "es", @@ -22,7 +22,7 @@ "@ali/iceluna-comp-react-node": "^1.0.5", "@ali/iceluna-sdk": "^1.0.5-beta.24", "@ali/lc-style-setter": "^0.0.1", - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-editor-core": "^0.8.33", "@alifd/next": "^1.19.16", "acorn": "^6.4.1", "classnames": "^2.2.6", diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index a74a51ebc..cfd7c687b 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.55...@ali/lowcode-editor-skeleton@0.8.56) (2020-08-24) + + +### Bug Fixes + +* 多选时设置项异常 ([8cc9d73](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8cc9d73)) + + + + ## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.54...@ali/lowcode-editor-skeleton@0.8.55) (2020-08-23) diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 9bd0dd8ea..51c1fe1ab 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", - "version": "0.8.55", + "version": "0.8.56", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,10 +19,10 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@alifd/next": "^1.20.12", "classnames": "^2.2.6", "react": "^16.8.1", diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md index 6a7db6e08..d288a10a4 100644 --- a/packages/plugin-components-pane/CHANGELOG.md +++ b/packages/plugin-components-pane/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.51...@ali/lowcode-plugin-components-pane@0.8.52) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + ## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.50...@ali/lowcode-plugin-components-pane@0.8.51) (2020-08-23) diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json index ed5f18d6c..6abf388fd 100644 --- a/packages/plugin-components-pane/package.json +++ b/packages/plugin-components-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-components-pane", - "version": "0.8.51", + "version": "0.8.52", "description": "alibaba lowcode editor component-list plugin", "files": [ "es/", @@ -20,9 +20,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", "@ali/ve-component-list": "^1.1.1", "@alifd/next": "^1.19.19", "react": "^16.8.1" diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index f66a3e2ba..5cb5acc9a 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.49...@ali/lowcode-plugin-designer@0.9.50) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + ## [0.9.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.48...@ali/lowcode-plugin-designer@0.9.49) (2020-08-23) diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index e09713c97..1aac1f782 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-designer", - "version": "0.9.49", + "version": "0.9.50", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -20,8 +20,8 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-event-bind-dialog/CHANGELOG.md b/packages/plugin-event-bind-dialog/CHANGELOG.md index b32f36021..0002afc10 100644 --- a/packages/plugin-event-bind-dialog/CHANGELOG.md +++ b/packages/plugin-event-bind-dialog/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.30...@ali/lowcode-plugin-event-bind-dialog@0.8.31) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog + ## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.29...@ali/lowcode-plugin-event-bind-dialog@0.8.30) (2020-08-20) diff --git a/packages/plugin-event-bind-dialog/package.json b/packages/plugin-event-bind-dialog/package.json index cfe28a2e3..dcf3ce5db 100644 --- a/packages/plugin-event-bind-dialog/package.json +++ b/packages/plugin-event-bind-dialog/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-event-bind-dialog", - "version": "0.8.30", + "version": "0.8.31", "description": "alibaba lowcode editor event bind dialog plugin", "files": [ "es", @@ -19,8 +19,8 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", "@alifd/next": "^1.19.16", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md index 5b4c33bb0..126fbe784 100644 --- a/packages/plugin-outline-pane/CHANGELOG.md +++ b/packages/plugin-outline-pane/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.55...@ali/lowcode-plugin-outline-pane@0.8.56) (2020-08-24) + + +### Bug Fixes + +* 修复在切换页面时，没有销毁相应节点导致的一系列bug ([59fac25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/59fac25)) + + + + ## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.54...@ali/lowcode-plugin-outline-pane@0.8.55) (2020-08-23) diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 7943f5e1a..518c06b18 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-outline-pane", - "version": "0.8.55", + "version": "0.8.56", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -14,10 +14,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@alifd/next": "^1.19.16", "classnames": "^2.2.6", "react": "^16", diff --git a/packages/plugin-sample-logo/CHANGELOG.md b/packages/plugin-sample-logo/CHANGELOG.md index 90c98bcdb..e6220218a 100644 --- a/packages/plugin-sample-logo/CHANGELOG.md +++ b/packages/plugin-sample-logo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.29...@ali/lowcode-plugin-sample-logo@0.8.30) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo + ## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.28...@ali/lowcode-plugin-sample-logo@0.8.29) (2020-08-20) diff --git a/packages/plugin-sample-logo/package.json b/packages/plugin-sample-logo/package.json index 39277afa9..e2deb32bf 100644 --- a/packages/plugin-sample-logo/package.json +++ b/packages/plugin-sample-logo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-logo", - "version": "0.8.29", + "version": "0.8.30", "description": "alibaba lowcode editor logo plugin", "files": [ "es/", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-editor-core": "^0.8.33", "react": "^16.8.1" }, "devDependencies": { diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md index 8c25c89a7..151b1ca94 100644 --- a/packages/plugin-sample-preview/CHANGELOG.md +++ b/packages/plugin-sample-preview/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.53...@ali/lowcode-plugin-sample-preview@0.8.54) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + ## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.52...@ali/lowcode-plugin-sample-preview@0.8.53) (2020-08-23) diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json index 1fcb0d25e..b9f9a9190 100644 --- a/packages/plugin-sample-preview/package.json +++ b/packages/plugin-sample-preview/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-preview", - "version": "0.8.53", + "version": "0.8.54", "description": "alibaba lowcode editor sample preview plugin", "files": [ "es", @@ -18,8 +18,8 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", "@alifd/next": "^1.x", "react": "^16.8.1" }, diff --git a/packages/plugin-source-editor/CHANGELOG.md b/packages/plugin-source-editor/CHANGELOG.md index 2a7010683..4dec5353e 100644 --- a/packages/plugin-source-editor/CHANGELOG.md +++ b/packages/plugin-source-editor/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.27...@ali/lowcode-plugin-source-editor@0.8.28) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-source-editor + ## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.26...@ali/lowcode-plugin-source-editor@0.8.27) (2020-08-20) diff --git a/packages/plugin-source-editor/package.json b/packages/plugin-source-editor/package.json index 15ce631c2..175f79709 100644 --- a/packages/plugin-source-editor/package.json +++ b/packages/plugin-source-editor/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-source-editor", - "version": "0.8.27", + "version": "0.8.28", "description": "alibaba lowcode editor source-editor plugin", "files": [ "es", @@ -19,7 +19,7 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-editor-core": "^0.8.33", "@alifd/next": "^1.19.16", "js-beautify": "^1.10.1", "prettier": "^1.18.2", diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md index cb059d9aa..671ecabdd 100644 --- a/packages/plugin-undo-redo/CHANGELOG.md +++ b/packages/plugin-undo-redo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.53...@ali/lowcode-plugin-undo-redo@0.8.54) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + ## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.52...@ali/lowcode-plugin-undo-redo@0.8.53) (2020-08-23) diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json index eb261081f..53320b9a4 100644 --- a/packages/plugin-undo-redo/package.json +++ b/packages/plugin-undo-redo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-undo-redo", - "version": "0.8.53", + "version": "0.8.54", "description": "alibaba lowcode editor undo redo plugin", "files": [ "es", @@ -19,11 +19,11 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.49", - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-editor-skeleton": "^0.8.55", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-editor-skeleton": "^0.8.56", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-variable-bind-dialog/CHANGELOG.md b/packages/plugin-variable-bind-dialog/CHANGELOG.md index c92e9917a..b5d6dbbb9 100644 --- a/packages/plugin-variable-bind-dialog/CHANGELOG.md +++ b/packages/plugin-variable-bind-dialog/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.28...@ali/lowcode-plugin-variable-bind-dialog@0.8.29) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog + ## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.27...@ali/lowcode-plugin-variable-bind-dialog@0.8.28) (2020-08-20) diff --git a/packages/plugin-variable-bind-dialog/package.json b/packages/plugin-variable-bind-dialog/package.json index 64dbe3e4b..a98f3326f 100644 --- a/packages/plugin-variable-bind-dialog/package.json +++ b/packages/plugin-variable-bind-dialog/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-variable-bind-dialog", - "version": "0.8.28", + "version": "0.8.29", "description": "alibaba lowcode editor variable bind dialog plugin", "files": [ "es", @@ -19,7 +19,7 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", + "@ali/lowcode-editor-core": "^0.8.33", "@alifd/next": "^1.19.16", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-zh-en/CHANGELOG.md b/packages/plugin-zh-en/CHANGELOG.md index cc9a82128..a265d5f4c 100644 --- a/packages/plugin-zh-en/CHANGELOG.md +++ b/packages/plugin-zh-en/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.32...@ali/lowcode-plugin-zh-en@0.8.33) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-zh-en + ## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.31...@ali/lowcode-plugin-zh-en@0.8.32) (2020-08-20) diff --git a/packages/plugin-zh-en/package.json b/packages/plugin-zh-en/package.json index 66231fac1..621cf37a8 100644 --- a/packages/plugin-zh-en/package.json +++ b/packages/plugin-zh-en/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-zh-en", - "version": "0.8.32", + "version": "0.8.33", "description": "alibaba lowcode editor zhong english plugin", "files": [ "es", @@ -14,9 +14,9 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-editor-core": "^0.8.32", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-editor-core": "^0.8.33", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md index 06b5f5ba7..f8c7190e9 100644 --- a/packages/rax-simulator-renderer/CHANGELOG.md +++ b/packages/rax-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.54...@ali/lowcode-rax-simulator-renderer@0.8.55) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.53...@ali/lowcode-rax-simulator-renderer@0.8.54) (2020-08-23) diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index cfcecdf69..ed035730d 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-rax-simulator-renderer", - "version": "0.8.54", + "version": "0.8.55", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -14,10 +14,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.49", + "@ali/lowcode-designer": "^0.9.50", "@ali/lowcode-rax-renderer": "^0.1.7", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@ali/recore-rax": "^1.2.4", "@ali/vu-css-style": "^1.0.2", "@recore/obx": "^1.0.8", @@ -53,5 +53,5 @@ "ts-node/register" ] }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.53/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.54/build/index.html" } diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md index f9563a998..9060869c6 100644 --- a/packages/react-simulator-renderer/CHANGELOG.md +++ b/packages/react-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.55...@ali/lowcode-react-simulator-renderer@0.8.56) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + ## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.54...@ali/lowcode-react-simulator-renderer@0.8.55) (2020-08-23) diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 0b7b7df5b..8a96600ca 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-react-simulator-renderer", - "version": "0.8.55", + "version": "0.8.56", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,10 +13,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.49", + "@ali/lowcode-designer": "^0.9.50", "@ali/lowcode-react-renderer": "^0.8.20", - "@ali/lowcode-types": "^0.8.16", - "@ali/lowcode-utils": "^0.8.18", + "@ali/lowcode-types": "^0.8.17", + "@ali/lowcode-utils": "^0.8.19", "@ali/vu-css-style": "^1.0.2", "@recore/obx": "^1.0.8", "@recore/obx-react": "^1.0.7", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 6a0675333..bffc1f4c9 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.16...@ali/lowcode-types@0.8.17) (2020-08-24) + + +### Features + +* 编辑器 hooks 能力实现 ([f3ac23b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f3ac23b)) + + + + ## [0.8.16](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.15...@ali/lowcode-types@0.8.16) (2020-08-19) diff --git a/packages/types/package.json b/packages/types/package.json index fa855a9d7..e46bce691 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-types", - "version": "0.8.16", + "version": "0.8.17", "description": "Types for Ali lowCode engine", "files": [ "es", diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 0b9efa002..b3b3df7f5 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.18...@ali/lowcode-utils@0.8.19) (2020-08-24) + + + + +**Note:** Version bump only for package @ali/lowcode-utils + ## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.17...@ali/lowcode-utils@0.8.18) (2020-08-19) diff --git a/packages/utils/package.json b/packages/utils/package.json index 07f2730b9..bdaf24538 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-utils", - "version": "0.8.18", + "version": "0.8.19", "description": "Utils for Ali lowCode engine", "files": [ "es", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-types": "^0.8.16", + "@ali/lowcode-types": "^0.8.17", "@alifd/next": "^1.19.16", "react": "^16" }, From fa94aab3cbfd8ce6541093a6f9a1a68ebb529518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Wed, 26 Aug 2020 11:08:12 +0800 Subject: [PATCH 12/17] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=20function=20co?= =?UTF-8?q?mponent=20=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9C=AC=E8=B4=A8=E4=B8=8A=E6=98=AF?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=20ref=20fix:=20=E5=A4=84=E7=90=86=20filter?= =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E5=9C=A8=E6=AF=8F=E6=AC=A1=E9=87=8D?= =?UTF-8?q?=E7=BB=98=E6=97=B6=20fieldId=20=E5=8F=98=E6=9B=B4=E7=9A=84=20bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/src/document/document-model.ts | 2 +- .../editor-preset-vision/src/bundle/bundle.ts | 2 -- .../src/bundle/prototype.ts | 23 ++++++++++++++----- packages/editor-preset-vision/src/editor.ts | 3 ++- .../plugin-outline-pane/src/tree-master.ts | 1 - 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 13cde0e05..7a7666d63 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -461,9 +461,9 @@ export class DocumentModel { * 从项目中移除 */ remove() { + this.designer.postEvent('document.remove', { id: this.id }); this.purge(); this.project.removeDocument(this); - this.designer.postEvent('document.remove', { id: this.id }); } purge() { diff --git a/packages/editor-preset-vision/src/bundle/bundle.ts b/packages/editor-preset-vision/src/bundle/bundle.ts index 8b0ce27d5..1835bd8f0 100644 --- a/packages/editor-preset-vision/src/bundle/bundle.ts +++ b/packages/editor-preset-vision/src/bundle/bundle.ts @@ -69,8 +69,6 @@ export default class Bundle { // invoke prototype mocker while the prototype does not exist Object.keys(this.viewsMap).forEach((viewName) => { - const test = this; - // console.log(test, viewName); if (!this.prototypeList.find((proto) => proto.getComponentName() === viewName)) { const mockedPrototype = trunk.mockComponentPrototype(this.viewsMap[viewName]); if (mockedPrototype) { diff --git a/packages/editor-preset-vision/src/bundle/prototype.ts b/packages/editor-preset-vision/src/bundle/prototype.ts index 5ef238f78..313e3bc5b 100644 --- a/packages/editor-preset-vision/src/bundle/prototype.ts +++ b/packages/editor-preset-vision/src/bundle/prototype.ts @@ -1,4 +1,4 @@ -import { ComponentType, ReactElement } from 'react'; +import { ComponentType, ReactElement, Component, FunctionComponent } from 'react'; import { ComponentMetadata, FieldConfig, InitialItem, FilterItem, AutorunItem, isI18nData } from '@ali/lowcode-types'; import { ComponentMeta, @@ -220,14 +220,14 @@ class Prototype { readonly isPrototype = true; readonly meta: ComponentMeta; readonly options: OldPrototypeConfig | ComponentMetadata; - view: ComponentType; - // componentName: string; get componentName() { return this.getId(); } get packageName() { return this.meta.npm?.package; } + // 兼容原 vision 用法 + view: ComponentType | undefined; constructor(input: OldPrototypeConfig | ComponentMetadata | ComponentMeta, extraConfigs: any = null, lookup: boolean = false) { if (lookup) { @@ -327,19 +327,30 @@ class Prototype { } setView(view: ComponentType) { - this.view = view; + let wrappedView = view; + if (!view?.prototype?.isReactComponent) { + const ViewComponentClass = class extends Component { + render() { + return (view as FunctionComponent)(this.props); + } + } as any; + ViewComponentClass.displayName = view.displayName; + wrappedView = ViewComponentClass; + } + this.view = wrappedView; const metadata = this.meta.getMetadata(); if (!metadata.experimental) { metadata.experimental = { - view, + view: wrappedView, }; } else { - metadata.experimental.view = view; + metadata.experimental.view = wrappedView; } } getView() { return ( + this.view || this.meta.getMetadata().experimental?.view || designer.currentDocument?.simulator?.getComponent(this.getComponentName()) ); diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts index 43554c6c4..d9e8b767f 100644 --- a/packages/editor-preset-vision/src/editor.ts +++ b/packages/editor-preset-vision/src/editor.ts @@ -106,7 +106,8 @@ designer.addPropsReducer((props, node) => { fieldIds.push(fieldId); } }); - if (fieldIds.indexOf(props.fieldId) >= 0) { + // 全局的关闭 uniqueIdChecker 信号，在 ve-utils 中实现 + if (fieldIds.indexOf(props.fieldId) >= 0 && !window.__disable_unique_id_checker__) { newProps.fieldId = undefined; } } diff --git a/packages/plugin-outline-pane/src/tree-master.ts b/packages/plugin-outline-pane/src/tree-master.ts index 326451958..99c23382c 100644 --- a/packages/plugin-outline-pane/src/tree-master.ts +++ b/packages/plugin-outline-pane/src/tree-master.ts @@ -98,7 +98,6 @@ export class TreeMaster { return this.treeMap.get(id)!; } const tree = new Tree(doc); - // TODO: listen purge event to remove this.treeMap.set(id, tree); return tree; } From 4369499458f09b544ee8a3e68bd23884d7192a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Wed, 26 Aug 2020 11:41:38 +0800 Subject: [PATCH 13/17] Publish - @ali/lowcode-demo@0.8.61 - @ali/lowcode-designer@0.9.51 - @ali/lowcode-editor-preset-general@0.9.36 - @ali/lowcode-editor-preset-vision@0.8.53 - @ali/lowcode-editor-skeleton@0.8.57 - @ali/lowcode-plugin-components-pane@0.8.53 - @ali/lowcode-plugin-designer@0.9.51 - @ali/lowcode-plugin-outline-pane@0.8.57 - @ali/lowcode-plugin-sample-preview@0.8.55 - @ali/lowcode-plugin-undo-redo@0.8.55 - @ali/lowcode-rax-simulator-renderer@0.8.56 - @ali/lowcode-react-simulator-renderer@0.8.57 --- packages/demo/CHANGELOG.md | 8 ++++++++ packages/demo/package.json | 14 +++++++------- packages/designer/CHANGELOG.md | 11 +++++++++++ packages/designer/package.json | 2 +- packages/editor-preset-general/CHANGELOG.md | 8 ++++++++ packages/editor-preset-general/package.json | 8 ++++---- packages/editor-preset-vision/CHANGELOG.md | 11 +++++++++++ packages/editor-preset-vision/package.json | 10 +++++----- packages/editor-skeleton/CHANGELOG.md | 8 ++++++++ packages/editor-skeleton/package.json | 4 ++-- packages/plugin-components-pane/CHANGELOG.md | 8 ++++++++ packages/plugin-components-pane/package.json | 4 ++-- packages/plugin-designer/CHANGELOG.md | 8 ++++++++ packages/plugin-designer/package.json | 4 ++-- packages/plugin-outline-pane/CHANGELOG.md | 11 +++++++++++ packages/plugin-outline-pane/package.json | 4 ++-- packages/plugin-sample-preview/CHANGELOG.md | 8 ++++++++ packages/plugin-sample-preview/package.json | 4 ++-- packages/plugin-undo-redo/CHANGELOG.md | 8 ++++++++ packages/plugin-undo-redo/package.json | 6 +++--- packages/rax-simulator-renderer/CHANGELOG.md | 8 ++++++++ packages/rax-simulator-renderer/package.json | 6 +++--- packages/react-simulator-renderer/CHANGELOG.md | 8 ++++++++ packages/react-simulator-renderer/package.json | 4 ++-- 24 files changed, 140 insertions(+), 35 deletions(-) diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md index 915ef05f8..e9e9b88cd 100644 --- a/packages/demo/CHANGELOG.md +++ b/packages/demo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.61](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.60...@ali/lowcode-demo@0.8.61) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + ## [0.8.60](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.59...@ali/lowcode-demo@0.8.60) (2020-08-24) diff --git a/packages/demo/package.json b/packages/demo/package.json index e8fd1ee47..bd9cf99a2 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-demo", - "version": "0.8.60", + "version": "0.8.61", "private": true, "description": "低代码引擎 DEMO", "scripts": { @@ -10,15 +10,15 @@ "config": {}, "dependencies": { "@ali/lowcode-editor-core": "^0.8.33", - "@ali/lowcode-editor-skeleton": "^0.8.56", - "@ali/lowcode-plugin-components-pane": "^0.8.52", - "@ali/lowcode-plugin-designer": "^0.9.50", + "@ali/lowcode-editor-skeleton": "^0.8.57", + "@ali/lowcode-plugin-components-pane": "^0.8.53", + "@ali/lowcode-plugin-designer": "^0.9.51", "@ali/lowcode-plugin-event-bind-dialog": "^0.8.31", - "@ali/lowcode-plugin-outline-pane": "^0.8.56", + "@ali/lowcode-plugin-outline-pane": "^0.8.57", "@ali/lowcode-plugin-sample-logo": "^0.8.30", - "@ali/lowcode-plugin-sample-preview": "^0.8.54", + "@ali/lowcode-plugin-sample-preview": "^0.8.55", "@ali/lowcode-plugin-settings-pane": "^0.8.8", - "@ali/lowcode-plugin-undo-redo": "^0.8.54", + "@ali/lowcode-plugin-undo-redo": "^0.8.55", "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.29", "@ali/lowcode-plugin-zh-en": "^0.8.33", "@ali/lowcode-react-renderer": "^0.8.20", diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index 5a66a27e7..bb299ec0b 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.50...@ali/lowcode-designer@0.9.51) (2020-08-26) + + +### Bug Fixes + +* 处理 function component 无法选中的问题，本质上是没有 ref ([fa94aab](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fa94aab)) + + + + ## [0.9.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.49...@ali/lowcode-designer@0.9.50) (2020-08-24) diff --git a/packages/designer/package.json b/packages/designer/package.json index 8647fe451..05579f94c 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-designer", - "version": "0.9.50", + "version": "0.9.51", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index bcc6eccf0..b7646c6e9 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.35...@ali/lowcode-editor-preset-general@0.9.36) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + ## [0.9.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.34...@ali/lowcode-editor-preset-general@0.9.35) (2020-08-24) diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json index 74ebd7c06..b57b157b0 100644 --- a/packages/editor-preset-general/package.json +++ b/packages/editor-preset-general/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-general", - "version": "0.9.35", + "version": "0.9.36", "private": true, "description": "Ali General Editor Preset", "main": "lib/index.js", @@ -16,9 +16,9 @@ "license": "MIT", "dependencies": { "@ali/lowcode-editor-core": "^0.8.33", - "@ali/lowcode-editor-skeleton": "^0.8.56", - "@ali/lowcode-plugin-designer": "^0.9.50", - "@ali/lowcode-plugin-outline-pane": "^0.8.56", + "@ali/lowcode-editor-skeleton": "^0.8.57", + "@ali/lowcode-plugin-designer": "^0.9.51", + "@ali/lowcode-plugin-outline-pane": "^0.8.57", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", "@alifd/next": "^1.19.12", diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index e7371d82e..8c20d57f0 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.52...@ali/lowcode-editor-preset-vision@0.8.53) (2020-08-26) + + +### Bug Fixes + +* 处理 function component 无法选中的问题，本质上是没有 ref ([fa94aab](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fa94aab)) + + + + ## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.51...@ali/lowcode-editor-preset-vision@0.8.52) (2020-08-24) diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json index 09b4ef9fa..caa88c9e2 100644 --- a/packages/editor-preset-vision/package.json +++ b/packages/editor-preset-vision/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-vision", - "version": "0.8.52", + "version": "0.8.53", "private": true, "description": "Vision Polyfill for Ali lowCode engine", "main": "lib/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", - "@ali/lowcode-editor-skeleton": "^0.8.56", - "@ali/lowcode-plugin-designer": "^0.9.50", - "@ali/lowcode-plugin-outline-pane": "^0.8.56", + "@ali/lowcode-editor-skeleton": "^0.8.57", + "@ali/lowcode-plugin-designer": "^0.9.51", + "@ali/lowcode-plugin-outline-pane": "^0.8.57", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index cfd7c687b..51a960d68 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.56...@ali/lowcode-editor-skeleton@0.8.57) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-skeleton + ## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.55...@ali/lowcode-editor-skeleton@0.8.56) (2020-08-24) diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 51c1fe1ab..f05104115 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", - "version": "0.8.56", + "version": "0.8.57", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md index d288a10a4..a4154461a 100644 --- a/packages/plugin-components-pane/CHANGELOG.md +++ b/packages/plugin-components-pane/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.52...@ali/lowcode-plugin-components-pane@0.8.53) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + ## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.51...@ali/lowcode-plugin-components-pane@0.8.52) (2020-08-24) diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json index 6abf388fd..50b84ea5b 100644 --- a/packages/plugin-components-pane/package.json +++ b/packages/plugin-components-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-components-pane", - "version": "0.8.52", + "version": "0.8.53", "description": "alibaba lowcode editor component-list plugin", "files": [ "es/", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", "@ali/lowcode-types": "^0.8.17", "@ali/ve-component-list": "^1.1.1", diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index 5cb5acc9a..bc60f600b 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.50...@ali/lowcode-plugin-designer@0.9.51) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + ## [0.9.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.49...@ali/lowcode-plugin-designer@0.9.50) (2020-08-24) diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index 1aac1f782..58b06e32b 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-designer", - "version": "0.9.50", + "version": "0.9.51", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md index 126fbe784..b9d598e8a 100644 --- a/packages/plugin-outline-pane/CHANGELOG.md +++ b/packages/plugin-outline-pane/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.56...@ali/lowcode-plugin-outline-pane@0.8.57) (2020-08-26) + + +### Bug Fixes + +* 处理 function component 无法选中的问题，本质上是没有 ref ([fa94aab](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fa94aab)) + + + + ## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.55...@ali/lowcode-plugin-outline-pane@0.8.56) (2020-08-24) diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 518c06b18..041671a15 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-outline-pane", - "version": "0.8.56", + "version": "0.8.57", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md index 151b1ca94..da023e335 100644 --- a/packages/plugin-sample-preview/CHANGELOG.md +++ b/packages/plugin-sample-preview/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.54...@ali/lowcode-plugin-sample-preview@0.8.55) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.53...@ali/lowcode-plugin-sample-preview@0.8.54) (2020-08-24) diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json index b9f9a9190..4c31200e6 100644 --- a/packages/plugin-sample-preview/package.json +++ b/packages/plugin-sample-preview/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-preview", - "version": "0.8.54", + "version": "0.8.55", "description": "alibaba lowcode editor sample preview plugin", "files": [ "es", @@ -18,7 +18,7 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", "@alifd/next": "^1.x", "react": "^16.8.1" diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md index 671ecabdd..3a461e74a 100644 --- a/packages/plugin-undo-redo/CHANGELOG.md +++ b/packages/plugin-undo-redo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.54...@ali/lowcode-plugin-undo-redo@0.8.55) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + ## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.53...@ali/lowcode-plugin-undo-redo@0.8.54) (2020-08-24) diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json index 53320b9a4..067c8b597 100644 --- a/packages/plugin-undo-redo/package.json +++ b/packages/plugin-undo-redo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-undo-redo", - "version": "0.8.54", + "version": "0.8.55", "description": "alibaba lowcode editor undo redo plugin", "files": [ "es", @@ -19,9 +19,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-editor-core": "^0.8.33", - "@ali/lowcode-editor-skeleton": "^0.8.56", + "@ali/lowcode-editor-skeleton": "^0.8.57", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", "react": "^16.8.1", diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md index f8c7190e9..648f5f0fc 100644 --- a/packages/rax-simulator-renderer/CHANGELOG.md +++ b/packages/rax-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.55...@ali/lowcode-rax-simulator-renderer@0.8.56) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer + ## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.54...@ali/lowcode-rax-simulator-renderer@0.8.55) (2020-08-24) diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index ed035730d..696db4729 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-rax-simulator-renderer", - "version": "0.8.55", + "version": "0.8.56", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-rax-renderer": "^0.1.7", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", @@ -53,5 +53,5 @@ "ts-node/register" ] }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.54/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.55/build/index.html" } diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md index 9060869c6..f38056b63 100644 --- a/packages/react-simulator-renderer/CHANGELOG.md +++ b/packages/react-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.56...@ali/lowcode-react-simulator-renderer@0.8.57) (2020-08-26) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + ## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.55...@ali/lowcode-react-simulator-renderer@0.8.56) (2020-08-24) diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 8a96600ca..903495ef7 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-react-simulator-renderer", - "version": "0.8.56", + "version": "0.8.57", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,7 +13,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.50", + "@ali/lowcode-designer": "^0.9.51", "@ali/lowcode-react-renderer": "^0.8.20", "@ali/lowcode-types": "^0.8.17", "@ali/lowcode-utils": "^0.8.19", From 1f920dd959fa6642e0627cb21bc428b164906eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Wed, 26 Aug 2020 21:22:56 +0800 Subject: [PATCH 14/17] =?UTF-8?q?fix:=20=E5=9C=A8=20renderer=20=E5=B1=82?= =?UTF-8?q?=E9=9D=A2=E5=81=9A=20function=20component=20=E5=8C=85=E8=A3=85?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=BD=B1=E5=93=8D=20rax=20=E7=AD=89?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/designer/setting/setting-top-entry.ts | 3 +++ .../editor-preset-vision/src/bundle/bundle.ts | 3 +++ .../src/bundle/prototype.ts | 17 +++-------------- .../react-simulator-renderer/src/renderer.ts | 11 +++++++---- packages/utils/src/is-react.ts | 18 +++++++++++++++++- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/packages/designer/src/designer/setting/setting-top-entry.ts b/packages/designer/src/designer/setting/setting-top-entry.ts index c7931a62c..19c4c0fc9 100644 --- a/packages/designer/src/designer/setting/setting-top-entry.ts +++ b/packages/designer/src/designer/setting/setting-top-entry.ts @@ -228,6 +228,9 @@ export class SettingTopEntry implements SettingEntry { /** * @deprecated */ + get node() { + return this.getNode(); + } getNode() { return this.nodes[0]; } diff --git a/packages/editor-preset-vision/src/bundle/bundle.ts b/packages/editor-preset-vision/src/bundle/bundle.ts index 1835bd8f0..d22b14af3 100644 --- a/packages/editor-preset-vision/src/bundle/bundle.ts +++ b/packages/editor-preset-vision/src/bundle/bundle.ts @@ -2,6 +2,7 @@ import lg from '@ali/vu-logger'; import { ComponentClass, ComponentType } from 'react'; import Prototype, { isPrototype } from './prototype'; import { designer } from '../editor'; +import { upgradeMetadata } from './upgrade-metadata'; import trunk from './trunk'; function basename(name: string) { @@ -125,6 +126,8 @@ export default class Bundle { */ if (bundles.length >= 2) { const prototype = bundles[0]; + // const metadata = upgradeMetadata(prototype.options); + // prototype.meta = designer.createComponentMeta(metadata); const prototypeView = bundles[1]; prototype.setView(prototypeView); this.registerPrototype(prototype); diff --git a/packages/editor-preset-vision/src/bundle/prototype.ts b/packages/editor-preset-vision/src/bundle/prototype.ts index 313e3bc5b..a031cb9db 100644 --- a/packages/editor-preset-vision/src/bundle/prototype.ts +++ b/packages/editor-preset-vision/src/bundle/prototype.ts @@ -17,7 +17,6 @@ import { } from './upgrade-metadata'; import { intl } from '@ali/lowcode-editor-core'; import { designer } from '../editor'; -import { uniqueId } from '@ali/lowcode-utils'; const GlobalPropsConfigure: Array<{ position: string; @@ -327,24 +326,14 @@ class Prototype { } setView(view: ComponentType) { - let wrappedView = view; - if (!view?.prototype?.isReactComponent) { - const ViewComponentClass = class extends Component { - render() { - return (view as FunctionComponent)(this.props); - } - } as any; - ViewComponentClass.displayName = view.displayName; - wrappedView = ViewComponentClass; - } - this.view = wrappedView; + this.view = view; const metadata = this.meta.getMetadata(); if (!metadata.experimental) { metadata.experimental = { - view: wrappedView, + view, }; } else { - metadata.experimental.view = wrappedView; + metadata.experimental.view = view; } } diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts index 365b300d7..83ff29a61 100644 --- a/packages/react-simulator-renderer/src/renderer.ts +++ b/packages/react-simulator-renderer/src/renderer.ts @@ -1,4 +1,4 @@ -import React, { createElement, ReactInstance, ComponentType, ReactElement } from 'react'; +import React, { createElement, ReactInstance, ComponentType, ReactElement, FunctionComponent } from 'react'; import { render as reactRender } from 'react-dom'; import { host } from './host'; import SimulatorRendererView from './renderer-view'; @@ -7,7 +7,7 @@ import { Asset, isReactComponent } from '@ali/lowcode-utils'; import { getClientRects } from './utils/get-client-rects'; import loader from './utils/loader'; import { reactFindDOMNodes, FIBER_KEY } from './utils/react-find-dom-nodes'; -import { isESModule, isElement, cursor, setNativeSelection } from '@ali/lowcode-utils'; +import { isESModule, isElement, acceptsRef, wrapReactClass, cursor, setNativeSelection } from '@ali/lowcode-utils'; import { RootSchema, NpmInfo, ComponentSchema, TransformStage, NodeSchema } from '@ali/lowcode-types'; // just use types import { BuiltinSimulatorRenderer, NodeInstance, Component } from '@ali/lowcode-designer'; @@ -443,6 +443,9 @@ function buildComponents(libraryMap: LibraryMap, if (component && (component as ComponentSchema).componentName === 'Component') { components[componentName] = createComponent(component as ComponentSchema); } else if (isReactComponent(component)) { + if (!acceptsRef(component)) { + component = wrapReactClass(component as FunctionComponent); + } components[componentName] = component; } else { component = findComponent(libraryMap, componentName, component); @@ -497,7 +500,7 @@ function getClosestNodeInstance(from: ReactInstance, specId?: string): NodeInsta } function getNodeInstance(fiberNode: any, specId?: string): NodeInstance | null { - const instance = fiberNode.stateNode; + const instance = fiberNode?.stateNode; if (instance && SYMBOL_VNID in instance) { const nodeId = instance[SYMBOL_VNID]; if (!specId || specId === nodeId) { @@ -507,7 +510,7 @@ function getNodeInstance(fiberNode: any, specId?: string): NodeInstance { return obj && obj.prototype && (obj.prototype.isReactComponent || obj.prototype instanceof Component); } +export function acceptsRef(obj: any): boolean { + return obj?.prototype?.isReactComponent || (obj.$$typeof && obj.$$typeof === REACT_FORWARD_REF_TYPE); +} + export function isReactComponent(obj: any): obj is ComponentType { return obj && (isReactClass(obj) || typeof obj === 'function'); } + +export function wrapReactClass(view: FunctionComponent) { + const ViewComponentClass = class extends Component { + render() { + return view(this.props); + } + } as any; + ViewComponentClass.displayName = view.displayName; + return ViewComponentClass; +} From 1b57d5cfdfeea3e8c1737246ae4f8127d31c8d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=86=A0?= Date: Wed, 26 Aug 2020 21:26:08 +0800 Subject: [PATCH 15/17] fix(editor-skeleton): add canSetFixed prop to panel config --- packages/editor-preset-vision/src/panes.ts | 3 ++- .../src/layouts/left-float-pane.tsx | 25 +++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/editor-preset-vision/src/panes.ts b/packages/editor-preset-vision/src/panes.ts index 5d4e063cd..592e1f7c2 100644 --- a/packages/editor-preset-vision/src/panes.ts +++ b/packages/editor-preset-vision/src/panes.ts @@ -68,7 +68,7 @@ function upgradeConfig(config: OldPaneConfig): IWidgetBaseConfig & { area: strin newConfig.type = 'PanelDock'; newConfig.area = 'left'; newConfig.props.description = description || title; - const { contents, hideTitleBar, tip, width, maxWidth, height, maxHeight, menu, isAction } = config; + const { contents, hideTitleBar, tip, width, maxWidth, height, maxHeight, menu, isAction, canSetFixed } = config; if (menu) { newConfig.props.title = menu; } @@ -83,6 +83,7 @@ function upgradeConfig(config: OldPaneConfig): IWidgetBaseConfig & { area: strin maxWidth, height, maxHeight, + canSetFixed, onInit: init, onDestroy: destroy, }; diff --git a/packages/editor-skeleton/src/layouts/left-float-pane.tsx b/packages/editor-skeleton/src/layouts/left-float-pane.tsx index 493490cd7..9b6ed7c31 100644 --- a/packages/editor-skeleton/src/layouts/left-float-pane.tsx +++ b/packages/editor-skeleton/src/layouts/left-float-pane.tsx @@ -91,6 +91,7 @@ export default class LeftFloatPane extends Component<{ area: Area }> if (!current) { return; } + area.skeleton.leftFloatArea.remove(current); area.skeleton.leftFixedArea.add(current); area.skeleton.leftFixedArea.container.active(current); @@ -99,6 +100,12 @@ export default class LeftFloatPane extends Component<{ area: Area }> render() { const { area } = this.props; const width = area.current?.config.props?.width; + // can be set fixed by default + let canSetFixed = true; + if (area.current?.config.props?.canSetFixed === false) { + canSetFixed = false; + } + const hideTitleBar = area.current?.config.props?.hideTitleBar; const style = width ? { width @@ -114,13 +121,17 @@ export default class LeftFloatPane extends Component<{ area: Area }> { !hideTitleBar && ( - + { + canSetFixed && ( + + ) + }