diff --git a/packages/code-generator/CHANGELOG.md b/packages/code-generator/CHANGELOG.md
index 8ebc3cde2..16d59a80d 100644
--- a/packages/code-generator/CHANGELOG.md
+++ b/packages/code-generator/CHANGELOG.md
@@ -238,14 +238,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Features
-<<<<<<< HEAD
* code generator main process ([021d6e0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/021d6e0))
* demo schema & complex children type ([a5ee6bd](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a5ee6bd))
* fix gaps ([32af3d3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/32af3d3))
* project builder fix & publish demo to disk ([26983b3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/26983b3))
-=======
* code generator main process ([021d6e0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/021d6e0fe9fb29a8b6c1c5d5f4d06ec71896faa5))
* demo schema & complex children type ([a5ee6bd](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a5ee6bd55806fc9aea695096ccd4c7f50b8e31c4))
* fix gaps ([32af3d3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/32af3d3a3ca4d5aca15be25e05c840c8ea0cb6ae))
* project builder fix & publish demo to disk ([26983b3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/26983b38c2b0f1d39d79964eb54d8ce60250dd82))
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md
index 241ff0218..145484a81 100644
--- a/packages/demo/CHANGELOG.md
+++ b/packages/demo/CHANGELOG.md
@@ -7,6 +7,30 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@1.0.6-0...@ali/lowcode-demo@1.0.7-0) (2020-09-02)
+
+## [0.8.65](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.64...@ali/lowcode-demo@0.8.65) (2020-09-08)
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.64](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.63...@ali/lowcode-demo@0.8.64) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.63](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.62...@ali/lowcode-demo@0.8.63) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.62](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.61...@ali/lowcode-demo@0.8.62) (2020-08-27)
**Note:** Version bump only for package @ali/lowcode-demo
diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md
index 86d68e285..1aadd8b58 100644
--- a/packages/designer/CHANGELOG.md
+++ b/packages/designer/CHANGELOG.md
@@ -7,6 +7,26 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@1.0.6-0...@ali/lowcode-designer@1.0.7-0) (2020-09-02)
+
+## [0.9.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.54...@ali/lowcode-designer@0.9.55) (2020-09-08)
+
+
+### Bug Fixes
+
+* 拖拽时要解除与原来节点的关系 ([7a6bf2c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7a6bf2c))
+
+
+
+
+
+## [0.9.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.53...@ali/lowcode-designer@0.9.54) (2020-09-03)
+
+
+**Note:** Version bump only for package @ali/lowcode-designer
+
+
+## [0.9.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.52...@ali/lowcode-designer@0.9.53) (2020-09-03)
+
**Note:** Version bump only for package @ali/lowcode-designer
@@ -29,6 +49,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
+**Note:** Version bump only for package @ali/lowcode-designer
## [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)
@@ -80,7 +101,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [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
@@ -105,7 +125,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Bug Fixes
* support dropObject is data ([809fda7](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/809fda7))
->>>>>>> master
@@ -199,7 +218,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [0.9.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.37...@ali/lowcode-designer@0.9.38) (2020-08-06)
->>>>>>> master
### Bug Fixes
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 20e417675..01924b4e6 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -87,7 +87,7 @@ const defaultRaxSimulatorUrl = (() => {
const defaultEnvironment = [
// https://g.alicdn.com/mylib/??react/16.11.0/umd/react.production.min.js,react-dom/16.8.6/umd/react-dom.production.min.js,prop-types/15.7.2/prop-types.min.js
- assetItem(AssetType.JSText, 'window.React=parent.React;window.ReactDOM=parent.ReactDOM;', undefined, 'react'),
+ assetItem(AssetType.JSText, 'window.React=parent.React;window.ReactDOM=parent.ReactDOM;window.__is_simulator_env__=true;', undefined, 'react'),
assetItem(
AssetType.JSText,
'window.PropTypes=parent.PropTypes;React.PropTypes=parent.PropTypes; window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;',
diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts
index 6cb074f11..9ec44fd1d 100644
--- a/packages/designer/src/document/document-model.ts
+++ b/packages/designer/src/document/document-model.ts
@@ -11,6 +11,7 @@ import { History } from './history';
import { TransformStage } from './node';
import { uniqueId } from '@ali/lowcode-utils';
import { ModalNodesManager } from './node';
+import { foreachReverse } from '../utils/tree';
export type GetDataType = T extends undefined
? NodeType extends {
@@ -267,14 +268,16 @@ export class DocumentModel {
/**
* 内部方法，请勿调用
*/
- internalRemoveAndPurgeNode(node: Node) {
+ internalRemoveAndPurgeNode(node: Node, useMutator = false) {
if (!this.nodes.has(node)) {
return;
}
- this._nodesMap.delete(node.id);
+ node.remove(useMutator);
+ }
+
+ unlinkNode(node: Node) {
this.nodes.delete(node);
- this.selection.remove(node.id);
- node.remove();
+ this._nodesMap.delete(node.id);
}
@obx.ref private _dropLocation: DropLocation | null = null;
@@ -318,20 +321,23 @@ export class DocumentModel {
* 导出 schema 数据
*/
get schema(): RootSchema {
- return this.rootNode.schema as any;
+ return this.rootNode?.schema as any;
}
import(schema: RootSchema, checkId = false) {
- // TODO: do purge
+ // TODO: 暂时用饱和式删除，原因是 Slot 节点并不是树节点，无法正常递归删除
this.nodes.forEach(node => {
- this.destroyNode(node);
+ this.internalRemoveAndPurgeNode(node, true);
});
- this.rootNode.import(schema as any, checkId);
+ // foreachReverse(this.rootNode?.children, (node: Node) => {
+ // this.internalRemoveAndPurgeNode(node, true);
+ // });
+ this.rootNode?.import(schema as any, checkId);
// todo: select added and active track added
}
export(stage: TransformStage = TransformStage.Serilize) {
- return this.rootNode.export(stage);
+ return this.rootNode?.export(stage);
}
/**
diff --git a/packages/designer/src/document/node/node-children.ts b/packages/designer/src/document/node/node-children.ts
index f89e55008..3f4bc4a27 100644
--- a/packages/designer/src/document/node/node-children.ts
+++ b/packages/designer/src/document/node/node-children.ts
@@ -4,6 +4,7 @@ import { TransformStage } from './transform-stage';
import { NodeData, isNodeSchema } from '@ali/lowcode-types';
import { shallowEqual } from '@ali/lowcode-utils';
import { EventEmitter } from 'events';
+import { foreachReverse } from '../../utils/tree';
export class NodeChildren {
@obx.val private children: Node[];
@@ -13,9 +14,10 @@ export class NodeChildren {
this.children = (Array.isArray(data) ? data : [data]).map(child => {
return this.owner.document.createNode(child);
});
+
}
- interalInitParent() {
+ internalInitParent() {
this.children.forEach(child => child.internalSetParent(this.owner));
}
@@ -55,7 +57,7 @@ export class NodeChildren {
}
this.children = children;
- this.interalInitParent();
+ this.internalInitParent();
if (!shallowEqual(children, originChildren)) {
this.emitter.emit('change');
}
@@ -63,7 +65,7 @@ export class NodeChildren {
/**
* @deprecated
- * @param nodes
+ * @param nodes
*/
concat(nodes: Node[]) {
return this.children.concat(nodes);
@@ -91,24 +93,58 @@ export class NodeChildren {
return this.children.length;
}
+ private purged = false;
/**
- * 删除一个节点
+ * 回收销毁
*/
- delete(node: Node, purge = false, useMutator = true): boolean {
+ purge(useMutator = true) {
+ if (this.purged) {
+ return;
+ }
+ this.purged = true;
+ this.children.forEach((child) => {
+ child.purge(useMutator);
+ });
+ }
+
+ unlinkChild(node: Node) {
const i = this.children.indexOf(node);
if (i < 0) {
return false;
}
- const deleted = this.children.splice(i, 1)[0];
+ this.children.splice(i, 1);
+ }
+ /**
+ * 删除一个节点
+ */
+ delete(node: Node, purge = false, useMutator = true): boolean {
+ if (node.isParental()) {
+ foreachReverse(node.children, (subNode: Node) => {
+ subNode.remove(useMutator, purge);
+ });
+ }
if (purge) {
// should set parent null
- deleted.internalSetParent(null, useMutator);
- deleted.purge(useMutator);
+ node.internalSetParent(null, useMutator);
+ try {
+ node.purge(useMutator);
+ } catch(err) {
+ console.error(err);
+ }
}
+ const document = node.document;
+ document.unlinkNode(node);
+ document.selection.remove(node.id);
+ document.destroyNode(node);
this.emitter.emit('change');
+ const i = this.children.indexOf(node);
if (useMutator) {
this.reportModified(node, this.owner, {type: 'remove', removeIndex: i, removeNode: node});
}
+ if (i < 0) {
+ return false;
+ }
+ this.children.splice(i, 1);
return false;
}
@@ -235,7 +271,6 @@ export class NodeChildren {
return fn(child, index);
});
}
-
every(fn: (item: Node, index: number) => any): boolean {
return this.children.every((child, index) => fn(child, index));
}
@@ -248,6 +283,10 @@ export class NodeChildren {
return this.children.filter(fn);
}
+ find(fn: (item: Node, index: number) => Node) {
+ return this.children.find(fn);
+ }
+
mergeChildren(remover: () => any, adder: (children: Node[]) => NodeData[] | null, sorter: () => any) {
let changed = false;
if (remover) {
@@ -290,18 +329,6 @@ export class NodeChildren {
};
}
- private purged = false;
- /**
- * 回收销毁
- */
- purge(useMutator = true) {
- if (this.purged) {
- return;
- }
- this.purged = true;
- this.children.forEach((child) => child.purge(useMutator));
- }
-
get [Symbol.toStringTag]() {
// 保证向前兼容性
return 'Array';
@@ -327,7 +354,7 @@ export class NodeChildren {
try {
callbacks?.onSubtreeModified.call(node, owner, options);
} catch (e) {
- console.error('error when excute experimental.callbacks.onNodeAdd', e);
+ console.error('error when excute experimental.callbacks.onSubtreeModified', e);
}
}
diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts
index c69f780d5..589cd8a15 100644
--- a/packages/designer/src/document/node/node.ts
+++ b/packages/designer/src/document/node/node.ts
@@ -155,9 +155,12 @@ export class Node {
children: isDOMText(children) || isJSExpression(children) ? children : '',
});
} else {
+ // 这里 props 被初始化两次，一次 new，一次 import，new 的实例需要给 propsReducer 的钩子去使用，
+ // import 是为了使用钩子返回的值，并非完全幂等的操作，部分行为执行两次会有 bug，
+ // 所以在 props 里会对 new / import 做一些区别化的解析
this.props = new Props(this, props, extras);
this._children = new NodeChildren(this as ParentalNode, this.initialChildren(children));
- this._children.interalInitParent();
+ this._children.internalInitParent();
this.props.import(this.upgradeProps(this.initProps(props || {})), this.upgradeProps(extras || {}));
this.setupAutoruns();
}
@@ -258,14 +261,15 @@ export class Node {
return;
}
- if (this._parent) {
+ // 解除老的父子关系，但不需要真的删除节点
+ if (this._parent && !parent) {
if (this.isSlot()) {
- this._parent.removeSlot(this, false);
+ this._parent.unlinkSlot(this);
} else {
- this._parent.children.delete(this, false, useMutator);
+ this._parent.children.unlinkChild(this);
}
}
-
+ // 建立新的父子关系
this._parent = parent;
if (parent) {
this.document.removeWillPurge(this);
@@ -298,12 +302,12 @@ export class Node {
/**
* 移除当前节点
*/
- remove(useMutator = true) {
+ remove(useMutator = true, purge = true) {
if (this.parent) {
if (this.isSlot()) {
- this.parent.removeSlot(this, true);
+ this.parent.removeSlot(this, purge);
} else {
- this.parent.children.delete(this, true, useMutator);
+ this.parent.children.delete(this, purge, useMutator);
}
}
}
@@ -645,20 +649,30 @@ export class Node {
return comparePosition(this, otherNode);
}
- /**
- * 删除一个Slot节点
- */
- removeSlot(slotNode: Node, purge = false): boolean {
+ unlinkSlot(slotNode: Node) {
const i = this._slots.indexOf(slotNode);
if (i < 0) {
return false;
}
- const deleted = this._slots.splice(i, 1)[0];
+ this._slots.splice(i, 1);
+ }
+
+ /**
+ * 删除一个Slot节点
+ */
+ removeSlot(slotNode: Node, purge = false): boolean {
if (purge) {
// should set parent null
- deleted.internalSetParent(null);
- deleted.purge();
+ slotNode?.internalSetParent(null, false);
+ slotNode?.purge();
}
+ this.document.unlinkNode(slotNode);
+ this.document.selection.remove(slotNode.id);
+ const i = this._slots.indexOf(slotNode);
+ if (i < 0) {
+ return false;
+ }
+ this._slots.splice(i, 1);
return false;
}
@@ -699,20 +713,10 @@ export class Node {
if (this.purged) {
return;
}
- // if (this._parent) {
- // // should remove thisNode before purge
- // this.remove(useMutator);
- // return;
- // }
this.purged = true;
- if (this.isParental()) {
- this.children.purge(useMutator);
- }
this.autoruns?.forEach((dispose) => dispose());
this.props.purge();
- this.document.internalRemoveAndPurgeNode(this);
this.document.destroyNode(this);
- this.remove(useMutator);
}
/**
diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts
index b27b6e60b..5acfcc757 100644
--- a/packages/designer/src/document/node/props/prop.ts
+++ b/packages/designer/src/document/node/props/prop.ts
@@ -22,6 +22,37 @@ export class Prop implements IPropParent {
readonly isProp = true;
readonly owner: Node;
+ private stash: PropStash | undefined;
+
+ /**
+ * 键值
+ */
+ @obx key: string | number | undefined;
+ /**
+ * 扩展值
+ */
+ @obx spread: boolean;
+
+ readonly props: Props;
+ readonly options: any;
+
+ constructor(
+ public parent: IPropParent,
+ value: CompositeValue | UNSET = UNSET,
+ key?: string | number,
+ spread = false,
+ options = {},
+ ) {
+ this.owner = parent.owner;
+ this.props = parent.props;
+ this.key = key;
+ this.spread = spread;
+ this.options = options;
+ if (value !== UNSET) {
+ this.setValue(value);
+ }
+ }
+
/**
* @see SettingTarget
*/
@@ -197,7 +228,7 @@ export class Prop implements IPropParent {
} else if (Array.isArray(val)) {
this._type = 'list';
} else if (isPlainObject(val)) {
- if (isJSSlot(val)) {
+ if (isJSSlot(val) && this.options.propsMode !== 'init') {
this.setAsSlot(val);
return;
}
@@ -347,34 +378,6 @@ export class Prop implements IPropParent {
return this._maps;
}
- private stash: PropStash | undefined;
-
- /**
- * 键值
- */
- @obx key: string | number | undefined;
- /**
- * 扩展值
- */
- @obx spread: boolean;
-
- readonly props: Props;
-
- constructor(
- public parent: IPropParent,
- value: CompositeValue | UNSET = UNSET,
- key?: string | number,
- spread = false,
- ) {
- this.owner = parent.owner;
- this.props = parent.props;
- if (value !== UNSET) {
- this.setValue(value);
- }
- this.key = key;
- this.spread = spread;
- }
-
/**
* 获取某个属性
* @param stash 如果不存在，临时获取一个待写入
diff --git a/packages/designer/src/document/node/props/props.ts b/packages/designer/src/document/node/props/props.ts
index 02852816f..e9c73ccd3 100644
--- a/packages/designer/src/document/node/props/props.ts
+++ b/packages/designer/src/document/node/props/props.ts
@@ -57,9 +57,9 @@ export class Props implements IPropParent {
constructor(readonly owner: Node, value?: PropsMap | PropsList | null, extras?: object) {
if (Array.isArray(value)) {
this.type = 'list';
- this.items = value.map(item => new Prop(this, item.value, item.name, item.spread));
+ this.items = value.map(item => new Prop(this, item.value, item.name, item.spread, { propsMode: 'init' }));
} else if (value != null) {
- this.items = Object.keys(value).map(key => new Prop(this, value[key], key));
+ this.items = Object.keys(value).map(key => new Prop(this, value[key], key, false, { propsMode: 'init' }));
}
if (extras) {
Object.keys(extras).forEach(key => {
diff --git a/packages/designer/src/utils/tree.ts b/packages/designer/src/utils/tree.ts
new file mode 100644
index 000000000..2cd8ff515
--- /dev/null
+++ b/packages/designer/src/utils/tree.ts
@@ -0,0 +1,7 @@
+import { NodeChildren } from '../document/node/node-children';
+
+export function foreachReverse(arr: NodeChildren, fn: Function, context: any = {}) {
+ for (let i = arr.length - 1; i >= 0; i--) {
+ fn.call(context, arr.get(i));
+ }
+}
\ No newline at end of file
diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md
index 74ddda28e..8fdfb9476 100644
--- a/packages/editor-core/CHANGELOG.md
+++ b/packages/editor-core/CHANGELOG.md
@@ -6,13 +6,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@1.0.6-0...@ali/lowcode-editor-core@1.0.7-0) (2020-09-02)
-
+**Note:** Version bump only for package @ali/lowcode-editor-core
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.34...@ali/lowcode-editor-core@1.0.6-0) (2020-09-02)
**Note:** Version bump only for package @ali/lowcode-editor-core
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.34...@ali/lowcode-editor-core@1.0.6-0) (2020-09-02)
+
+## [0.8.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.35...@ali/lowcode-editor-core@0.8.36) (2020-09-03)
+
+
+## [0.8.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.34...@ali/lowcode-editor-core@0.8.35) (2020-09-03)
+
### Bug Fixes
@@ -45,10 +51,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
->>>>>>> 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
@@ -91,7 +95,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)
## [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
diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md
index ea6bfd4df..e0ab87e24 100644
--- a/packages/editor-preset-general/CHANGELOG.md
+++ b/packages/editor-preset-general/CHANGELOG.md
@@ -7,12 +7,28 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@1.0.6-0...@ali/lowcode-editor-preset-general@1.0.7-0) (2020-09-02)
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.37...@ali/lowcode-editor-preset-general@1.0.6-0) (2020-09-02)
+
+
+
+## [0.9.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.39...@ali/lowcode-editor-preset-general@0.9.40) (2020-09-08)
+
**Note:** Version bump only for package @ali/lowcode-editor-preset-general
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.37...@ali/lowcode-editor-preset-general@1.0.6-0) (2020-09-02)
+
+## [0.9.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.38...@ali/lowcode-editor-preset-general@0.9.39) (2020-09-03)
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.37...@ali/lowcode-editor-preset-general@0.9.38) (2020-09-03)
+
+
### Bug Fixes
@@ -57,10 +73,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**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
@@ -136,10 +150,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-editor-preset-general
->>>>>>> master
## [0.9.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.27...@ali/lowcode-editor-preset-general@0.9.28) (2020-08-14)
->>>>>>> master
diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md
index 86cb46b24..32b810d5e 100644
--- a/packages/editor-preset-vision/CHANGELOG.md
+++ b/packages/editor-preset-vision/CHANGELOG.md
@@ -6,14 +6,24 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@1.0.6-0...@ali/lowcode-editor-preset-vision@1.0.7-0) (2020-09-02)
-
-
-
**Note:** Version bump only for package @ali/lowcode-editor-preset-vision
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.54...@ali/lowcode-editor-preset-vision@1.0.6-0) (2020-09-02)
+
+## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.56...@ali/lowcode-editor-preset-vision@0.8.57) (2020-09-08)
+
+
+### Bug Fixes
+
+* 移除 isInSimulator 函数 ([6370889](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6370889))
+* 补全 packageName, 否则在组件面板会被隐藏 ([88e5008](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/88e5008))
+
+
+
+## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.55...@ali/lowcode-editor-preset-vision@0.8.56) (2020-09-03)
+
### Bug Fixes
@@ -23,6 +33,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
+
+## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.54...@ali/lowcode-editor-preset-vision@0.8.55) (2020-09-03)
## [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)
@@ -41,7 +53,6 @@ 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)
@@ -104,7 +115,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
->>>>>>> master
## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.48...@ali/lowcode-editor-preset-vision@0.8.49) (2020-08-19)
@@ -170,7 +180,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.43...@ali/lowcode-editor-preset-vision@0.8.44) (2020-08-14)
->>>>>>> master
diff --git a/packages/editor-preset-vision/src/bundle/bundle.ts b/packages/editor-preset-vision/src/bundle/bundle.ts
index 0c49bc098..4e2cc3f6e 100644
--- a/packages/editor-preset-vision/src/bundle/bundle.ts
+++ b/packages/editor-preset-vision/src/bundle/bundle.ts
@@ -126,7 +126,7 @@ export default class Bundle {
*/
if (bundles.length >= 2) {
const prototype = bundles[0];
- const metadata = upgradeMetadata(prototype.options);
+ const metadata = upgradeMetadata({ ...prototype.options, packageName: prototype.packageName });
prototype.meta = designer.createComponentMeta(metadata);
const prototypeView = bundles[1];
prototype.setView(prototypeView);
diff --git a/packages/editor-preset-vision/src/bundle/prototype.ts b/packages/editor-preset-vision/src/bundle/prototype.ts
index a031cb9db..d842563b1 100644
--- a/packages/editor-preset-vision/src/bundle/prototype.ts
+++ b/packages/editor-preset-vision/src/bundle/prototype.ts
@@ -1,5 +1,5 @@
import { ComponentType, ReactElement, Component, FunctionComponent } from 'react';
-import { ComponentMetadata, FieldConfig, InitialItem, FilterItem, AutorunItem, isI18nData } from '@ali/lowcode-types';
+import { ComponentMetadata, FieldConfig, InitialItem, FilterItem, AutorunItem } from '@ali/lowcode-types';
import {
ComponentMeta,
addBuiltinComponentAction,
@@ -7,6 +7,7 @@ import {
registerMetadataTransducer,
TransformStage,
} from '@ali/lowcode-designer';
+import { intl } from '@ali/lowcode-editor-core';
import {
OldPropConfig,
OldPrototypeConfig,
@@ -15,7 +16,7 @@ import {
upgradePropConfig,
upgradeConfigure,
} from './upgrade-metadata';
-import { intl } from '@ali/lowcode-editor-core';
+
import { designer } from '../editor';
const GlobalPropsConfigure: Array<{
diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts
index a2da42e50..a47c9eb76 100644
--- a/packages/editor-preset-vision/src/editor.ts
+++ b/packages/editor-preset-vision/src/editor.ts
@@ -26,21 +26,10 @@ export const designer = new Designer({ editor: editor });
editor.set(Designer, designer);
editor.set('designer', designer);
-let nodeCache: any = {};
designer.project.onCurrentDocumentChange((doc) => {
- nodeCache = {};
- doc.nodesMap.forEach((node) => {
- nodeCache[node.id] = node;
- });
doc.onRendererReady(() => {
bus.emit(VE_EVENTS.VE_PAGE_PAGE_READY);
});
- doc.onNodeCreate((node) => {
- nodeCache[node.id] = node;
- });
- doc.onNodeDestroy((node) => {
- delete nodeCache[node.id];
- });
});
interface Variable {
@@ -89,6 +78,18 @@ function upgradePropsReducer(props: any) {
// 升级 Props
designer.addPropsReducer(upgradePropsReducer, TransformStage.Upgrade);
+function getCurrentFieldIds() {
+ const fieldIds: any = [];
+ const nodesMap = designer?.currentDocument?.nodesMap || new Map();
+ nodesMap.forEach((curNode: any) => {
+ const fieldId = nodesMap?.get(curNode.id)?.getPropValue('fieldId');
+ if (fieldId) {
+ fieldIds.push(fieldId);
+ }
+ });
+ return fieldIds;
+}
+
// 节点 props 初始化
designer.addPropsReducer((props, node) => {
// run initials
@@ -96,18 +97,10 @@ designer.addPropsReducer((props, node) => {
...props,
};
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);
- }
- });
+ const fieldIds = getCurrentFieldIds();
+
// 全局的关闭 uniqueIdChecker 信号，在 ve-utils 中实现
- if (fieldIds.indexOf(props.fieldId) >= 0 && !window.__disable_unique_id_checker__) {
+ if (fieldIds.indexOf(props.fieldId) >= 0 && !(window as any).__disable_unique_id_checker__) {
newProps.fieldId = undefined;
}
}
diff --git a/packages/editor-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md
index e425a44a4..4a7538d89 100644
--- a/packages/editor-setters/CHANGELOG.md
+++ b/packages/editor-setters/CHANGELOG.md
@@ -3,16 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@1.0.6-0...@ali/lowcode-editor-setters@1.0.7-0) (2020-09-02)
+**Note:** Version bump only for package @ali/lowcode-editor-setters
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.19...@ali/lowcode-editor-setters@1.0.6-0) (2020-09-02)
-
+
+## [0.9.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.20...@ali/lowcode-editor-setters@0.9.21) (2020-09-03)
**Note:** Version bump only for package @ali/lowcode-editor-setters
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.19...@ali/lowcode-editor-setters@1.0.6-0) (2020-09-02)
+
+## [0.9.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.19...@ali/lowcode-editor-setters@0.9.20) (2020-09-03)
+
### Bug Fixes
@@ -111,7 +117,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)
## [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
diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md
index 2deae1e92..36147f732 100644
--- a/packages/editor-skeleton/CHANGELOG.md
+++ b/packages/editor-skeleton/CHANGELOG.md
@@ -6,13 +6,27 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@1.0.6-0...@ali/lowcode-editor-skeleton@1.0.7-0) (2020-09-02)
+**Note:** Version bump only for package @ali/lowcode-editor-skeleton
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.58...@ali/lowcode-editor-skeleton@1.0.6-0) (2020-09-02)
+
+
+
+## [0.8.61](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.60...@ali/lowcode-editor-skeleton@0.8.61) (2020-09-08)
+
+**Note:** Version bump only for package @ali/lowcode-editor-skeleton
+
+
+## [0.8.60](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.59...@ali/lowcode-editor-skeleton@0.8.60) (2020-09-03)
+
**Note:** Version bump only for package @ali/lowcode-editor-skeleton
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.58...@ali/lowcode-editor-skeleton@1.0.6-0) (2020-09-02)
+
+## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.58...@ali/lowcode-editor-skeleton@0.8.59) (2020-09-03)
+
### Bug Fixes
@@ -75,10 +89,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**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
diff --git a/packages/material-parser/CHANGELOG.md b/packages/material-parser/CHANGELOG.md
index 8c5bf393c..af2ebc4c8 100644
--- a/packages/material-parser/CHANGELOG.md
+++ b/packages/material-parser/CHANGELOG.md
@@ -202,41 +202,32 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Bug Fixes
-<<<<<<< HEAD
* 🐛 fix bug of transforming type ([ebbe58d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ebbe58d))
* 🐛 fix bug of validate schema ([3f97523](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3f97523))
-=======
* 🐛 fix bug of transforming type ([ebbe58d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ebbe58df70f047f4b5fe367ac4b4a08de8a65e5d))
* 🐛 fix bug of validate schema ([3f97523](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3f975232c7cd551bc9c74962095dcc9b127af489))
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
### Code Refactoring
-<<<<<<< HEAD
* 💡 refactor with react-docgen ([64c9daa](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/64c9daa))
-=======
* 💡 refactor with react-docgen ([64c9daa](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/64c9daa1f451fdfeab2777e4beefc5d5e1890ba1))
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
### Features
-<<<<<<< HEAD
* complete component protocol json schema & validate method ([3df360d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3df360d))
* immigrate aimake materialin ([44ac85f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/44ac85f))
* import react-docgen to parse propTypes ([6e66168](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6e66168))
* remove -p tslint.json for test ([6d013e1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6d013e1))
* remove useless codes & modify generator ([dcd1b33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/dcd1b33))
* support multiple exported components ([db1b6de](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/db1b6de))
-=======
* complete component protocol json schema & validate method ([3df360d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3df360de85d425b2926ea50ff26a8df27ec36a78))
* immigrate aimake materialin ([44ac85f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/44ac85f8a6a35bcd50f2e2b74a022e3cebe3cdef))
* import react-docgen to parse propTypes ([6e66168](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6e661686e4693e69279c496f3be1dd173703c55e))
* remove -p tslint.json for test ([6d013e1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6d013e18f93bad5647cb9ea0a497336f64e1459a))
* remove useless codes & modify generator ([dcd1b33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/dcd1b33d3bf8bdf5577dcc980608d9eac8d99372))
* support multiple exported components ([db1b6de](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/db1b6deaca256b0d107fe607de6cd0fc90517a9c))
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
### BREAKING CHANGES
diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md
index b93be3466..d956123ea 100644
--- a/packages/plugin-components-pane/CHANGELOG.md
+++ b/packages/plugin-components-pane/CHANGELOG.md
@@ -6,13 +6,29 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@1.0.6-0...@ali/lowcode-plugin-components-pane@1.0.7-0) (2020-09-02)
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.54...@ali/lowcode-plugin-components-pane@1.0.6-0) (2020-09-02)
+
+
+## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.56...@ali/lowcode-plugin-components-pane@0.8.57) (2020-09-08)
+
**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.54...@ali/lowcode-plugin-components-pane@1.0.6-0) (2020-09-02)
+
+## [0.8.56](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.55...@ali/lowcode-plugin-components-pane@0.8.56) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.54...@ali/lowcode-plugin-components-pane@0.8.55) (2020-09-03)
+
### Bug Fixes
@@ -57,10 +73,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
->>>>>>> master
## [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)
->>>>>>> master
@@ -133,10 +147,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
->>>>>>> master
## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.44...@ali/lowcode-plugin-components-pane@0.8.45) (2020-08-14)
->>>>>>> master
diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md
index ebea4766f..32ad8d7ba 100644
--- a/packages/plugin-designer/CHANGELOG.md
+++ b/packages/plugin-designer/CHANGELOG.md
@@ -3,6 +3,8 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.9.55](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.54...@ali/lowcode-plugin-designer@0.9.55) (2020-09-08)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@1.0.6-0...@ali/lowcode-plugin-designer@1.0.7-0) (2020-09-02)
@@ -11,6 +13,21 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+## [0.9.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.53...@ali/lowcode-plugin-designer@0.9.54) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+
+## [0.9.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.52...@ali/lowcode-plugin-designer@0.9.53) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.52...@ali/lowcode-plugin-designer@1.0.6-0) (2020-09-02)
@@ -62,10 +79,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-designer
->>>>>>> master
## [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)
->>>>>>> master
@@ -138,10 +153,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-designer
->>>>>>> master
## [0.9.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.42...@ali/lowcode-plugin-designer@0.9.43) (2020-08-14)
->>>>>>> master
diff --git a/packages/plugin-event-bind-dialog/CHANGELOG.md b/packages/plugin-event-bind-dialog/CHANGELOG.md
index e8a0bb544..57d523051 100644
--- a/packages/plugin-event-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-event-bind-dialog/CHANGELOG.md
@@ -3,16 +3,23 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@1.0.6-0...@ali/lowcode-plugin-event-bind-dialog@1.0.7-0) (2020-09-02)
-
+**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.32...@ali/lowcode-plugin-event-bind-dialog@1.0.6-0) (2020-09-02)
**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.32...@ali/lowcode-plugin-event-bind-dialog@1.0.6-0) (2020-09-02)
+
+## [0.8.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.33...@ali/lowcode-plugin-event-bind-dialog@0.8.34) (2020-09-03)
+
+
+## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.32...@ali/lowcode-plugin-event-bind-dialog@0.8.33) (2020-09-03)
+
### Bug Fixes
@@ -31,8 +38,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@1.0.4-0...@ali/lowcode-plugin-event-bind-dialog@1.0.5-0) (2020-08-20)
-=======
-=======
## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.31...@ali/lowcode-plugin-event-bind-dialog@0.8.32) (2020-08-27)
@@ -96,7 +101,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-plugin-event-bind-dialog@0.13.0...@ali/lowcode-plugin-event-bind-dialog@1.0.0) (2020-08-17)
## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.28...@ali/lowcode-plugin-event-bind-dialog@0.8.29) (2020-08-19)
->>>>>>> master
diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md
index b1c2f065f..d64662608 100644
--- a/packages/plugin-outline-pane/CHANGELOG.md
+++ b/packages/plugin-outline-pane/CHANGELOG.md
@@ -7,6 +7,32 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@1.0.6-0...@ali/lowcode-plugin-outline-pane@1.0.7-0) (2020-09-02)
+
+## [0.8.61](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.60...@ali/lowcode-plugin-outline-pane@0.8.61) (2020-09-08)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.60](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.59...@ali/lowcode-plugin-outline-pane@0.8.60) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.58...@ali/lowcode-plugin-outline-pane@0.8.59) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.57...@ali/lowcode-plugin-outline-pane@0.8.58) (2020-08-27)
**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
@@ -102,10 +128,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
->>>>>>> master
## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.48...@ali/lowcode-plugin-outline-pane@0.8.49) (2020-08-14)
->>>>>>> master
diff --git a/packages/plugin-sample-logo/CHANGELOG.md b/packages/plugin-sample-logo/CHANGELOG.md
index 7d2871265..643e13b15 100644
--- a/packages/plugin-sample-logo/CHANGELOG.md
+++ b/packages/plugin-sample-logo/CHANGELOG.md
@@ -3,6 +3,8 @@
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-sample-logo@0.8.32...@ali/lowcode-plugin-sample-logo@0.8.33) (2020-09-03)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@1.0.6-0...@ali/lowcode-plugin-sample-logo@1.0.7-0) (2020-09-02)
@@ -11,6 +13,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
+
+## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.31...@ali/lowcode-plugin-sample-logo@0.8.32) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.31...@ali/lowcode-plugin-sample-logo@1.0.6-0) (2020-09-02)
diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md
index cc228c0ad..1ec1da9cc 100644
--- a/packages/plugin-sample-preview/CHANGELOG.md
+++ b/packages/plugin-sample-preview/CHANGELOG.md
@@ -6,13 +6,27 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@1.0.6-0...@ali/lowcode-plugin-sample-preview@1.0.7-0) (2020-09-02)
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.56...@ali/lowcode-plugin-sample-preview@1.0.6-0) (2020-09-02)
+
+
+## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.58...@ali/lowcode-plugin-sample-preview@0.8.59) (2020-09-08)
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.57...@ali/lowcode-plugin-sample-preview@0.8.58) (2020-09-03)
+
**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
-
-## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.56...@ali/lowcode-plugin-sample-preview@1.0.6-0) (2020-09-02)
+
+## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.56...@ali/lowcode-plugin-sample-preview@0.8.57) (2020-09-03)
+
### Bug Fixes
diff --git a/packages/plugin-source-editor/CHANGELOG.md b/packages/plugin-source-editor/CHANGELOG.md
index ca431929e..9bd2f1b72 100644
--- a/packages/plugin-source-editor/CHANGELOG.md
+++ b/packages/plugin-source-editor/CHANGELOG.md
@@ -3,6 +3,8 @@
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-source-editor@0.8.30...@ali/lowcode-plugin-source-editor@0.8.31) (2020-09-03)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@1.0.6-0...@ali/lowcode-plugin-source-editor@1.0.7-0) (2020-09-02)
@@ -11,6 +13,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
+
+## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.29...@ali/lowcode-plugin-source-editor@0.8.30) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.29...@ali/lowcode-plugin-source-editor@1.0.6-0) (2020-09-02)
diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md
index 7e37ae42d..de6aca161 100644
--- a/packages/plugin-undo-redo/CHANGELOG.md
+++ b/packages/plugin-undo-redo/CHANGELOG.md
@@ -3,6 +3,8 @@
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-plugin-undo-redo@0.8.58...@ali/lowcode-plugin-undo-redo@0.8.59) (2020-09-08)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@1.0.6-0...@ali/lowcode-plugin-undo-redo@1.0.7-0) (2020-09-02)
@@ -11,6 +13,21 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.57...@ali/lowcode-plugin-undo-redo@0.8.58) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.56...@ali/lowcode-plugin-undo-redo@0.8.57) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.56...@ali/lowcode-plugin-undo-redo@1.0.6-0) (2020-09-02)
@@ -136,7 +153,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
->>>>>>> master
## [0.8.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.46...@ali/lowcode-plugin-undo-redo@0.8.47) (2020-08-14)
diff --git a/packages/plugin-variable-bind-dialog/CHANGELOG.md b/packages/plugin-variable-bind-dialog/CHANGELOG.md
index ec96f176e..be8912db0 100644
--- a/packages/plugin-variable-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-variable-bind-dialog/CHANGELOG.md
@@ -3,6 +3,8 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.31...@ali/lowcode-plugin-variable-bind-dialog@0.8.32) (2020-09-03)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@1.0.6-0...@ali/lowcode-plugin-variable-bind-dialog@1.0.7-0) (2020-09-02)
@@ -11,6 +13,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
+
+## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.30...@ali/lowcode-plugin-variable-bind-dialog@0.8.31) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.30...@ali/lowcode-plugin-variable-bind-dialog@1.0.6-0) (2020-09-02)
@@ -41,10 +50,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
->>>>>>> master
## [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)
->>>>>>> master
@@ -87,7 +94,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-plugin-variable-bind-dialog@0.13.0...@ali/lowcode-plugin-variable-bind-dialog@1.0.0) (2020-08-17)
## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.26...@ali/lowcode-plugin-variable-bind-dialog@0.8.27) (2020-08-19)
->>>>>>> master
diff --git a/packages/plugin-zh-en/CHANGELOG.md b/packages/plugin-zh-en/CHANGELOG.md
index 2fb746250..6a920c55a 100644
--- a/packages/plugin-zh-en/CHANGELOG.md
+++ b/packages/plugin-zh-en/CHANGELOG.md
@@ -3,6 +3,8 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.35...@ali/lowcode-plugin-zh-en@0.8.36) (2020-09-03)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@1.0.6-0...@ali/lowcode-plugin-zh-en@1.0.7-0) (2020-09-02)
@@ -11,6 +13,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
+
+## [0.8.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.34...@ali/lowcode-plugin-zh-en@0.8.35) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.34...@ali/lowcode-plugin-zh-en@1.0.6-0) (2020-09-02)
@@ -86,7 +95,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-plugin-zh-en@0.13.0...@ali/lowcode-plugin-zh-en@1.0.0) (2020-08-17)
## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.30...@ali/lowcode-plugin-zh-en@0.8.31) (2020-08-19)
->>>>>>> master
diff --git a/packages/rax-render/CHANGELOG.md b/packages/rax-render/CHANGELOG.md
index eb2a037ea..4fb680d27 100644
--- a/packages/rax-render/CHANGELOG.md
+++ b/packages/rax-render/CHANGELOG.md
@@ -119,7 +119,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
->>>>>>> master
## [0.1.6](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-renderer@0.1.5...@ali/lowcode-rax-renderer@0.1.6) (2020-07-22)
@@ -188,11 +187,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Features
* init rax-render ([7167767](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7167767))
-<<<<<<< HEAD
-
-=======
-
->>>>>>> master
&&
&&
||
diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md
index f8dc9f200..ce63b2148 100644
--- a/packages/rax-simulator-renderer/CHANGELOG.md
+++ b/packages/rax-simulator-renderer/CHANGELOG.md
@@ -3,6 +3,32 @@
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-rax-simulator-renderer@0.8.59...@ali/lowcode-rax-simulator-renderer@0.8.60) (2020-09-08)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
+
+## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.58...@ali/lowcode-rax-simulator-renderer@0.8.59) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
+
+## [0.8.58](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.57...@ali/lowcode-rax-simulator-renderer@0.8.58) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
+
+## [0.8.57](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.56...@ali/lowcode-rax-simulator-renderer@0.8.57) (2020-08-27)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@1.0.6-0...@ali/lowcode-rax-simulator-renderer@1.0.7-0) (2020-09-02)
diff --git a/packages/react-renderer/CHANGELOG.md b/packages/react-renderer/CHANGELOG.md
index 9ad93d3e6..a8fa78928 100644
--- a/packages/react-renderer/CHANGELOG.md
+++ b/packages/react-renderer/CHANGELOG.md
@@ -110,12 +110,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Bug Fixes
* 修复判断动态 setter 的逻辑 ([d195d7f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d195d7f))
->>>>>>> master
-<<<<<<< HEAD
**Note:** Version bump only for package @ali/lowcode-react-renderer
@@ -152,17 +150,12 @@ 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-react-renderer@0.8.17...@ali/lowcode-react-renderer@0.9.0) (2020-08-14)
-=======
-=======
->>>>>>> master
## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-renderer@0.8.17...@ali/lowcode-react-renderer@0.8.18) (2020-08-14)
->>>>>>> master
### Bug Fixes
-<<<<<<< HEAD
* dropdown and menu schema ([ae1d125](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/ae1d125))
* parse custom methods function ([87d8b86](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/87d8b86))
@@ -170,11 +163,9 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Features
* 🎸 add demo-server ([df35c6a](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/df35c6a))
-=======
* remove debugger ([a835dc6](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a835dc6))
* render error样式 ([d601d5e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d601d5e))
* 组件缺失占位 ([aff2f34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/aff2f34))
->>>>>>> master
diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md
index 204b2a3a7..98775cea3 100644
--- a/packages/react-simulator-renderer/CHANGELOG.md
+++ b/packages/react-simulator-renderer/CHANGELOG.md
@@ -3,6 +3,8 @@
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-react-simulator-renderer@0.8.60...@ali/lowcode-react-simulator-renderer@0.8.61) (2020-09-08)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@1.0.6-0...@ali/lowcode-react-simulator-renderer@1.0.7-0) (2020-09-02)
@@ -11,6 +13,21 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+## [0.8.60](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.59...@ali/lowcode-react-simulator-renderer@0.8.60) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+
+## [0.8.59](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.58...@ali/lowcode-react-simulator-renderer@0.8.59) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.58...@ali/lowcode-react-simulator-renderer@1.0.6-0) (2020-09-02)
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 20914973a..d9994c37e 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,24 @@
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-types@0.8.18...@ali/lowcode-types@0.8.19) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-types
+
+
+## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.17...@ali/lowcode-types@0.8.18) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-types
+
+
+## [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)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@1.0.6-0...@ali/lowcode-types@1.0.7-0) (2020-09-02)
@@ -99,7 +117,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Bug Fixes
* 修复判断动态 setter 的逻辑 ([d195d7f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d195d7f))
->>>>>>> master
diff --git a/packages/types/src/schema.ts b/packages/types/src/schema.ts
index 0356e6c2b..b645c3e7d 100644
--- a/packages/types/src/schema.ts
+++ b/packages/types/src/schema.ts
@@ -92,4 +92,4 @@ export function isNodeSchema(data: any): data is NodeSchema {
export function isProjectSchema(data: any): data is ProjectSchema {
return data && data.componentsTree;
-}
+}
\ No newline at end of file
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index e83dfef3d..5f2d87bf7 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -3,6 +3,8 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.21...@ali/lowcode-utils@0.8.22) (2020-09-03)
## [1.0.7-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@1.0.6-0...@ali/lowcode-utils@1.0.7-0) (2020-09-02)
@@ -11,6 +13,16 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
**Note:** Version bump only for package @ali/lowcode-utils
+
+## [0.8.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.20...@ali/lowcode-utils@0.8.21) (2020-09-03)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-utils
+
+
+## [0.8.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.19...@ali/lowcode-utils@0.8.20) (2020-08-27)
## [1.0.6-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.20...@ali/lowcode-utils@1.0.6-0) (2020-09-02)
diff --git a/packages/utils/src/env.ts b/packages/utils/src/env.ts
new file mode 100644
index 000000000..4770bd46f
--- /dev/null
+++ b/packages/utils/src/env.ts
@@ -0,0 +1,3 @@
+export function isInSimulator() {
+ return Boolean((window as any).__is_simulator_env__);
+}
\ No newline at end of file
diff --git a/packages/utils/src/is-react.ts b/packages/utils/src/is-react.ts
index cb5059505..fdaed5f45 100644
--- a/packages/utils/src/is-react.ts
+++ b/packages/utils/src/is-react.ts
@@ -10,8 +10,12 @@ export function acceptsRef(obj: any): boolean {
return obj?.prototype?.isReactComponent || (obj.$$typeof && obj.$$typeof === REACT_FORWARD_REF_TYPE);
}
+function isForwardRefType(obj: any): boolean {
+ return obj?.$$typeof && obj?.$$typeof === REACT_FORWARD_REF_TYPE;
+}
+
export function isReactComponent(obj: any): obj is ComponentType {
- return obj && (isReactClass(obj) || typeof obj === 'function');
+ return obj && (isReactClass(obj) || typeof obj === 'function' || isForwardRefType(obj));
}
export function wrapReactClass(view: FunctionComponent) {