diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index daf2968c0..6eca1f53d 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,10 +3,56 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD + ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.4-0...@ali/lowcode-designer@1.0.5-0) (2020-08-20) -======= + + +## [0.9.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.51...@ali/lowcode-designer@0.9.52) (2020-08-27) + + +### Bug Fixes + +* 在 renderer 层面做 function component 包装，避免影响 rax 等其他场景 ([1f920dd](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1f920dd)) + + + + + +## [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) + + +### 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) + + +### 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) >>>>>>> master @@ -16,63 +62,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-designer -<<<<<<< HEAD - -## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.3-0...@ali/lowcode-designer@1.0.4-0) (2020-08-20) - - - - -**Note:** Version bump only for package @ali/lowcode-designer - - -## [1.0.3-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.2-0...@ali/lowcode-designer@1.0.3-0) (2020-08-20) - - - - -**Note:** Version bump only for package @ali/lowcode-designer - - -## [1.0.2-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.1-0...@ali/lowcode-designer@1.0.2-0) (2020-08-20) - - - - -**Note:** Version bump only for package @ali/lowcode-designer - - -## [1.0.1-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.47...@ali/lowcode-designer@1.0.1-0) (2020-08-20) - - -### Bug Fixes - -* 兼容modal模式 ([1092ee9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1092ee9)) - - - - - -# [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.14.0...@ali/lowcode-designer@1.0.0) (2020-08-17) - - - - -**Note:** Version bump only for package @ali/lowcode-designer - - -# [0.14.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.13.0...@ali/lowcode-designer@0.14.0) (2020-08-17) - - - - -**Note:** Version bump only for package @ali/lowcode-designer - - -# [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.11.0...@ali/lowcode-designer@0.13.0) (2020-08-17) -======= -======= ->>>>>>> master ## [0.9.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.46...@ali/lowcode-designer@0.9.47) (2020-08-19) @@ -96,7 +85,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-designer @@ -117,37 +105,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.10.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.37...@ali/lowcode-designer@0.10.0) (2020-08-14) -======= -======= - -## [0.9.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.44...@ali/lowcode-designer@0.9.45) (2020-08-19) - - -### Bug Fixes - -* **designer/node.ts:** fix hasLoop logic ([99a7288](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/99a7288)) -* currentPage.id 返回 formUuid ([775725d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/775725d)) -* 优化画布中点击事件屏蔽，增加富文本组件的部分屏蔽 ([ec08c6c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ec08c6c)) -* 优化画布中点击事件屏蔽，增加富文本组件的部分屏蔽 ([a5b6557](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a5b6557)) -* 区块组件无法删除 ([d936d2b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d936d2b)) - - - - - -## [0.9.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.43...@ali/lowcode-designer@0.9.44) (2020-08-17) - - -### Bug Fixes - -* fieldId 重复 ([5d64312](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/5d64312)) -* 去掉根据 componentName 判断 isModal 的逻辑 ([28f0213](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/28f0213)) -* 页面加载之后就被标记位 isModified ([2840d27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2840d27)) - - - - ->>>>>>> master ## [0.9.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.42...@ali/lowcode-designer@0.9.43) (2020-08-14) @@ -222,11 +179,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -<<<<<<< HEAD * 兼容modal模式 ([1092ee9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1092ee9)) -======= -* 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 ([7cf6d24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7cf6d24)) ->>>>>>> master @@ -715,12 +668,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -<<<<<<< HEAD * 🎸 merge material-parser ([b40c286](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b40c286)) * history log ([fbb3577](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fbb3577)) * import react-docgen to parse propTypes ([6e66168](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6e66168)) -======= -* 🎸 merge material-parser ([b40c286](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b40c2869a0bc901d855279735fe86b84dabaa04d)) -* history log ([fbb3577](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fbb3577bd434c0ac77cc907abc36e3efe110fe8c)) -* import react-docgen to parse propTypes ([6e66168](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6e661686e4693e69279c496f3be1dd173703c55e)) ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc 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/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 239560c35..7a7666d63 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -20,20 +20,20 @@ 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 { /** * 根节点 类型有：Page/Component/Block */ - readonly rootNode: RootNode; + rootNode: RootNode | null; /** * 文档编号 */ @@ -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; } /** @@ -456,12 +461,16 @@ export class DocumentModel { * 从项目中移除 */ remove() { - // this.project.removeDocument(this); - // todo: ... + this.designer.postEvent('document.remove', { id: this.id }); + this.purge(); + this.project.removeDocument(this); } 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 4aaca47ef..c69f780d5 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, { @@ -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/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; 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); + } + /** * 分字段设置储存数据，不记录操作记录 */ diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md index f9123ee80..b9c731593 100644 --- a/packages/editor-core/CHANGELOG.md +++ b/packages/editor-core/CHANGELOG.md @@ -3,10 +3,29 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@1.0.4-0...@ali/lowcode-editor-core@1.0.5-0) (2020-08-20) -======= + + +## [0.8.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.33...@ali/lowcode-editor-core@0.8.34) (2020-08-27) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-core + + +## [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)) + + + + +>>>>>>> master ## [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) >>>>>>> master @@ -16,7 +35,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-core -<<<<<<< HEAD ## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@1.0.3-0...@ali/lowcode-editor-core@1.0.4-0) (2020-08-20) @@ -51,9 +69,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.13.0...@ali/lowcode-editor-core@1.0.0) (2020-08-17) -======= -======= ->>>>>>> master ## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.29...@ali/lowcode-editor-core@0.8.30) (2020-08-19) >>>>>>> master @@ -63,7 +78,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-core -<<<<<<< HEAD # [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.12.0...@ali/lowcode-editor-core@0.13.0) (2020-08-17) @@ -98,10 +112,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.9.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.28...@ali/lowcode-editor-core@0.9.0) (2020-08-14) -======= - -## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.28...@ali/lowcode-editor-core@0.8.29) (2020-08-17) ->>>>>>> master diff --git a/packages/editor-core/src/editor.ts b/packages/editor-core/src/editor.ts index db9e0d784..6f8c22dc0 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/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index 578f65c5d..d3834c491 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,10 +3,42 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@1.0.4-0...@ali/lowcode-editor-preset-general@1.0.5-0) (2020-08-20) -======= + + +## [0.9.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.36...@ali/lowcode-editor-preset-general@0.9.37) (2020-08-27) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + + +## [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) + + + + +**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) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + +>>>>>>> master ## [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) >>>>>>> master @@ -16,7 +48,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-preset-general -<<<<<<< HEAD ## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@1.0.3-0...@ali/lowcode-editor-preset-general@1.0.4-0) (2020-08-20) @@ -51,10 +82,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general-beta@0.14.0...@ali/lowcode-editor-preset-general-beta@1.0.0) (2020-08-17) -======= -======= -======= ->>>>>>> master ## [0.9.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.31...@ali/lowcode-editor-preset-general@0.9.32) (2020-08-19) @@ -98,77 +125,42 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-general-beta # [0.14.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general-beta@0.13.0...@ali/lowcode-editor-preset-general-beta@0.14.0) (2020-08-17) -======= -**Note:** Version bump only for package @ali/lowcode-editor-preset-general - - -## [0.9.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.26...@ali/lowcode-editor-preset-general@0.9.27) (2020-08-14) ->>>>>>> master -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-general-beta # [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general-beta@0.11.0...@ali/lowcode-editor-preset-general-beta@0.13.0) (2020-08-17) -======= -**Note:** Version bump only for package @ali/lowcode-editor-preset-general - - -## [0.9.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.25...@ali/lowcode-editor-preset-general@0.9.26) (2020-08-07) ->>>>>>> master -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-general-beta # [0.12.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general-beta@0.11.0...@ali/lowcode-editor-preset-general-beta@0.12.0) (2020-08-17) -======= -**Note:** Version bump only for package @ali/lowcode-editor-preset-general - - -## [0.9.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.24...@ali/lowcode-editor-preset-general@0.9.25) (2020-08-06) ->>>>>>> master -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-general-beta # 0.11.0 (2020-08-16) -======= -**Note:** Version bump only for package @ali/lowcode-editor-preset-general - - -## [0.9.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.23...@ali/lowcode-editor-preset-general@0.9.24) (2020-08-06) ->>>>>>> master -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-general-beta # [0.10.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.22...@ali/lowcode-editor-preset-general@0.10.0) (2020-08-14) -======= -**Note:** Version bump only for package @ali/lowcode-editor-preset-general - - -## [0.9.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.22...@ali/lowcode-editor-preset-general@0.9.23) (2020-08-06) ->>>>>>> master diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index f0deef790..0092b78e0 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD + ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@1.0.4-0...@ali/lowcode-editor-preset-vision@1.0.5-0) (2020-08-20) @@ -22,6 +22,26 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ## [1.0.3-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@1.0.2-0...@ali/lowcode-editor-preset-vision@1.0.3-0) (2020-08-20) +======= + +## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.53...@ali/lowcode-editor-preset-vision@0.8.54) (2020-08-27) + + +### Bug Fixes + +* 在 renderer 层面做 function component 包装，避免影响 rax 等其他场景 ([1f920dd](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1f920dd)) +* **editor-skeleton:** add canSetFixed prop to panel config ([1b57d5c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1b57d5c)) + + + + + +## [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)) @@ -54,9 +74,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.12.0...@ali/lowcode-editor-preset-vision@0.13.0) (2020-08-17) -======= -======= -======= ## [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) @@ -121,7 +138,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ->>>>>>> master ## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.44...@ali/lowcode-editor-preset-vision@0.8.45) (2020-08-14) @@ -142,7 +158,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-preset-vision -<<<<<<< HEAD # [0.12.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.10.0...@ali/lowcode-editor-preset-vision@0.12.0) (2020-08-17) @@ -161,35 +176,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.10.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.9.0...@ali/lowcode-editor-preset-vision@0.10.0) (2020-08-16) -======= - -## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.42...@ali/lowcode-editor-preset-vision@0.8.43) (2020-08-14) - - -### Bug Fixes - -* createComponent 支持所有 schema ([7f946f5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7f946f5)) -* upgradePropsReducer ([e68977f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e68977f)) -* vision 大包 window 指向问题 ([aa1b526](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/aa1b526)) -* 不对外暴露 Node ([05957ce](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/05957ce)) -* 支持 AC 组件 ([c287bad](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c287bad)) - -## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.41...@ali/lowcode-editor-preset-vision@0.8.42) (2020-08-07) - - -### Bug Fixes - -* vision API 兼容 DockPane.getDocks() ([f72fb66](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f72fb66)) ->>>>>>> master - - - - -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-preset-vision @@ -199,42 +189,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-preset-vision -======= - -## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.40...@ali/lowcode-editor-preset-vision@0.8.41) (2020-08-06) - - -### Bug Fixes - -* fieldId 重复问题 ([e761b1a](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e761b1a)) - - - - - -## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.39...@ali/lowcode-editor-preset-vision@0.8.40) (2020-08-06) - - -### Bug Fixes - -* 保存区块按钮渲染异常 ([33a7227](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/33a7227)) -* 增加兼容 API ([2960446](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2960446)) - - - - - -## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.38...@ali/lowcode-editor-preset-vision@0.8.39) (2020-08-06) - - -### Bug Fixes - -* 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 ([7cf6d24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7cf6d24)) -* 框架样式调整 ([58790c5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/58790c5)) - - - ->>>>>>> master ## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.37...@ali/lowcode-editor-preset-vision@0.8.38) (2020-08-04) diff --git a/packages/editor-preset-vision/src/bundle/bundle.ts b/packages/editor-preset-vision/src/bundle/bundle.ts index 8b0ce27d5..0c49bc098 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) { @@ -69,8 +70,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) { @@ -127,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 5ef238f78..a031cb9db 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, @@ -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; @@ -220,14 +219,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) { @@ -340,6 +339,7 @@ class Prototype { 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 a349295e7..a2da42e50 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,12 +98,16 @@ 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); } }); - 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/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-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md index 7bad2a1c8..7793b29b4 100644 --- a/packages/editor-setters/CHANGELOG.md +++ b/packages/editor-setters/CHANGELOG.md @@ -3,20 +3,33 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@1.0.4-0...@ali/lowcode-editor-setters@1.0.5-0) (2020-08-20) -======= - -## [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) ->>>>>>> master + + +## [0.9.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.18...@ali/lowcode-editor-setters@0.9.19) (2020-08-27) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-setters + + +## [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) **Note:** Version bump only for package @ali/lowcode-editor-setters -<<<<<<< HEAD ## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@1.0.3-0...@ali/lowcode-editor-setters@1.0.4-0) (2020-08-20) @@ -62,9 +75,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.14.0...@ali/lowcode-editor-setters@1.0.0) (2020-08-17) -======= -======= ->>>>>>> master ## [0.9.16](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.15...@ali/lowcode-editor-setters@0.9.16) (2020-08-19) >>>>>>> master @@ -74,20 +84,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-setters -<<<<<<< HEAD # [0.14.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.13.0...@ali/lowcode-editor-setters@0.14.0) (2020-08-17) -======= - -## [0.9.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.14...@ali/lowcode-editor-setters@0.9.15) (2020-08-17) ->>>>>>> master **Note:** Version bump only for package @ali/lowcode-editor-setters -<<<<<<< HEAD # [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.11.0...@ali/lowcode-editor-setters@0.13.0) (2020-08-17) @@ -123,8 +127,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline -======= ->>>>>>> master ## [0.9.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.13...@ali/lowcode-editor-setters@0.9.14) (2020-08-04) @@ -365,8 +367,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -<<<<<<< HEAD * ts type ([1732e7d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1732e7d)) -======= -* ts type ([1732e7d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1732e7db5fccb6e185cfa12e197ae698932fe127)) ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index 45605ef87..7353e0563 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,10 +3,48 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -<<<<<<< HEAD ## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@1.0.4-0...@ali/lowcode-editor-skeleton@1.0.5-0) (2020-08-20) -======= + + +## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.57...@ali/lowcode-editor-skeleton@0.8.58) (2020-08-27) + + +### Bug Fixes + +* **editor-skeleton:** add canSetFixed prop to panel config ([1b57d5c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/1b57d5c)) + + + + + +## [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) + + +### 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) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-skeleton + +>>>>>>> master ## [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) >>>>>>> master @@ -16,7 +54,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-skeleton -<<<<<<< HEAD ## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@1.0.3-0...@ali/lowcode-editor-skeleton@1.0.4-0) (2020-08-20) @@ -63,10 +100,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.13.0...@ali/lowcode-editor-skeleton@1.0.0) (2020-08-17) -======= -======= -======= ->>>>>>> master ## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.52...@ali/lowcode-editor-skeleton@0.8.53) (2020-08-19) @@ -106,17 +139,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-editor-skeleton ->>>>>>> master ## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.48...@ali/lowcode-editor-skeleton@0.8.49) (2020-08-14) ->>>>>>> master **Note:** Version bump only for package @ali/lowcode-editor-skeleton -<<<<<<< HEAD # [0.13.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.12.0...@ali/lowcode-editor-skeleton@0.13.0) (2020-08-17) @@ -127,51 +157,28 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline # [0.12.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.10.0...@ali/lowcode-editor-skeleton@0.12.0) (2020-08-17) -======= - -## [0.8.48](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.47...@ali/lowcode-editor-skeleton@0.8.48) (2020-08-14) - - -### Bug Fixes - -* remove console ([6889123](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6889123)) -* setter 报错不影响页面渲染 ([c0a6022](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c0a6022)) -* vision 大包 window 指向问题 ([aa1b526](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/aa1b526)) -* 钉住行为调整 ([91a390e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/91a390e)) ->>>>>>> master -<<<<<<< HEAD **Note:** Version bump only for package @ali/lowcode-editor-skeleton # [0.11.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.10.0...@ali/lowcode-editor-skeleton@0.11.0) (2020-08-17) -======= - -## [0.8.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.46...@ali/lowcode-editor-skeleton@0.8.47) (2020-08-07) ->>>>>>> master **Note:** Version bump only for package @ali/lowcode-editor-skeleton -<<<<<<< HEAD # [0.10.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.9.0...@ali/lowcode-editor-skeleton@0.10.0) (2020-08-16) -======= - -## [0.8.46](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.45...@ali/lowcode-editor-skeleton@0.8.46) (2020-08-06) ->>>>>>> master **Note:** Version bump only for package @ali/lowcode-editor-skeleton -<<<<<<< HEAD # [0.9.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.43...@ali/lowcode-editor-skeleton@0.9.0) (2020-08-14) @@ -190,23 +197,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline -======= - -## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.44...@ali/lowcode-editor-skeleton@0.8.45) (2020-08-06) - - - - -**Note:** Version bump only for package @ali/lowcode-editor-skeleton - - -## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.43...@ali/lowcode-editor-skeleton@0.8.44) (2020-08-06) - - - - -**Note:** Version bump only for package @ali/lowcode-editor-skeleton ->>>>>>> master ## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.42...@ali/lowcode-editor-skeleton@0.8.43) (2020-08-04) @@ -633,8 +623,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -<<<<<<< HEAD * 🎸 merge material-parser ([b40c286](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b40c286)) -======= -* 🎸 merge material-parser ([b40c286](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b40c2869a0bc901d855279735fe86b84dabaa04d)) ->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx index 95b554e89..b299e810a 100644 --- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx @@ -25,7 +25,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); } 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 && ( + + ) + }