diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md
index 2c8ba16a9..ff001d83f 100644
--- a/packages/demo/CHANGELOG.md
+++ b/packages/demo/CHANGELOG.md
@@ -3,22 +3,9 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
## [1.0.5-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@1.0.4-0...@ali/lowcode-demo@1.0.5-0) (2020-08-20)
-
-
-**Note:** Version bump only for package @ali/lowcode-demo
-
-
-## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@1.0.3-0...@ali/lowcode-demo@1.0.4-0) (2020-08-20)
-
-
-
-
-**Note:** Version bump only for package @ali/lowcode-demo
-
## [1.0.3-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@1.0.2-0...@ali/lowcode-demo@1.0.3-0) (2020-08-20)
diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md
index 8bd58db84..daf2968c0 100644
--- a/packages/designer/CHANGELOG.md
+++ b/packages/designer/CHANGELOG.md
@@ -3,14 +3,20 @@
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.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
**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)
@@ -65,6 +71,8 @@ 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-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)
diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md
index 114296a0c..f9123ee80 100644
--- a/packages/editor-core/CHANGELOG.md
+++ b/packages/editor-core/CHANGELOG.md
@@ -3,14 +3,20 @@
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.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
**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)
@@ -46,6 +52,8 @@ 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
diff --git a/packages/editor-core/src/utils/get-public-path.ts b/packages/editor-core/src/utils/get-public-path.ts
index 72627b4f3..1bdb162a4 100644
--- a/packages/editor-core/src/utils/get-public-path.ts
+++ b/packages/editor-core/src/utils/get-public-path.ts
@@ -1,5 +1,5 @@
-const publicPath = (document.currentScript as HTMLScriptElement).src.replace(/^(.*\/)[^/]+$/, '$1');
+const publicPath = (document.currentScript as HTMLScriptElement)?.src.replace(/^(.*\/)[^/]+$/, '$1');
export function getPublicPath(): string {
- return publicPath;
+ return publicPath || '';
}
diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md
index 4ebc35dab..578f65c5d 100644
--- a/packages/editor-preset-general/CHANGELOG.md
+++ b/packages/editor-preset-general/CHANGELOG.md
@@ -3,14 +3,20 @@
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.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
**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)
@@ -47,6 +53,8 @@ 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)
diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md
index 1511ba2f9..f0deef790 100644
--- a/packages/editor-preset-vision/CHANGELOG.md
+++ b/packages/editor-preset-vision/CHANGELOG.md
@@ -3,6 +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)
@@ -55,6 +56,19 @@ 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)
+
+
+### Bug Fixes
+
+* 兼容原来 prototype 的 componentName/view ([d542a40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d542a40))
+
+
+
+
+>>>>>>> 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)
diff --git a/packages/editor-preset-vision/src/bundle/prototype.ts b/packages/editor-preset-vision/src/bundle/prototype.ts
index 7499f899e..5ef238f78 100644
--- a/packages/editor-preset-vision/src/bundle/prototype.ts
+++ b/packages/editor-preset-vision/src/bundle/prototype.ts
@@ -220,6 +220,11 @@ 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;
}
@@ -322,6 +327,7 @@ class Prototype {
}
setView(view: ComponentType) {
+ this.view = view;
const metadata = this.meta.getMetadata();
if (!metadata.experimental) {
metadata.experimental = {
diff --git a/packages/editor-preset-vision/src/bundle/trunk.ts b/packages/editor-preset-vision/src/bundle/trunk.ts
index 4ae5ed640..e452a8b6e 100644
--- a/packages/editor-preset-vision/src/bundle/trunk.ts
+++ b/packages/editor-preset-vision/src/bundle/trunk.ts
@@ -1,8 +1,9 @@
import { ReactElement, ComponentType } from 'react';
import { EventEmitter } from 'events';
import { registerSetter, RegisteredSetter, getSetter } from '@ali/lowcode-editor-core';
-import Bundle from './bundle';
+import lg from '@ali/vu-logger';
import { CustomView } from '@ali/lowcode-types';
+import Bundle from './bundle';
import Prototype from './prototype';
export class Trunk {
diff --git a/packages/editor-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md
index f1b9af5e4..7bad2a1c8 100644
--- a/packages/editor-setters/CHANGELOG.md
+++ b/packages/editor-setters/CHANGELOG.md
@@ -3,14 +3,20 @@
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
**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)
@@ -57,6 +63,8 @@ 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
diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md
index be9884188..45605ef87 100644
--- a/packages/editor-skeleton/CHANGELOG.md
+++ b/packages/editor-skeleton/CHANGELOG.md
@@ -3,14 +3,20 @@
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.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
**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)
@@ -59,6 +65,8 @@ 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)
diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md
index ff8948e42..d54225f29 100644
--- a/packages/plugin-components-pane/CHANGELOG.md
+++ b/packages/plugin-components-pane/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-components-pane@1.0.4-0...@ali/lowcode-plugin-components-pane@1.0.5-0) (2020-08-20)
+=======
+
+## [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
**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@1.0.3-0...@ali/lowcode-plugin-components-pane@1.0.4-0) (2020-08-20)
@@ -47,6 +53,8 @@ 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-components-pane@0.13.0...@ali/lowcode-plugin-components-pane@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.48...@ali/lowcode-plugin-components-pane@0.8.49) (2020-08-19)
diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md
index c6462ca4b..6cc241d70 100644
--- a/packages/plugin-designer/CHANGELOG.md
+++ b/packages/plugin-designer/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-designer@1.0.4-0...@ali/lowcode-plugin-designer@1.0.5-0) (2020-08-20)
+=======
+
+## [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
**Note:** Version bump only for package @ali/lowcode-plugin-designer
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@1.0.3-0...@ali/lowcode-plugin-designer@1.0.4-0) (2020-08-20)
@@ -47,6 +53,8 @@ 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-designer@0.14.0...@ali/lowcode-plugin-designer@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.9.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.46...@ali/lowcode-plugin-designer@0.9.47) (2020-08-19)
diff --git a/packages/plugin-event-bind-dialog/CHANGELOG.md b/packages/plugin-event-bind-dialog/CHANGELOG.md
index a007fb184..f29ab0ec0 100644
--- a/packages/plugin-event-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-event-bind-dialog/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-event-bind-dialog@1.0.4-0...@ali/lowcode-plugin-event-bind-dialog@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.29...@ali/lowcode-plugin-event-bind-dialog@0.8.30) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@1.0.3-0...@ali/lowcode-plugin-event-bind-dialog@1.0.4-0) (2020-08-20)
@@ -49,6 +55,8 @@ 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)
=======
+=======
+>>>>>>> master
## [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 ddc94b1f0..44135a1a3 100644
--- a/packages/plugin-outline-pane/CHANGELOG.md
+++ b/packages/plugin-outline-pane/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-outline-pane@1.0.4-0...@ali/lowcode-plugin-outline-pane@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.53...@ali/lowcode-plugin-outline-pane@0.8.54) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@1.0.3-0...@ali/lowcode-plugin-outline-pane@1.0.4-0) (2020-08-20)
@@ -50,6 +56,8 @@ 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-outline-pane@0.13.0...@ali/lowcode-plugin-outline-pane@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.52...@ali/lowcode-plugin-outline-pane@0.8.53) (2020-08-19)
diff --git a/packages/plugin-sample-logo/CHANGELOG.md b/packages/plugin-sample-logo/CHANGELOG.md
index 27d3b216c..caf2f6350 100644
--- a/packages/plugin-sample-logo/CHANGELOG.md
+++ b/packages/plugin-sample-logo/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-sample-logo@1.0.4-0...@ali/lowcode-plugin-sample-logo@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.28...@ali/lowcode-plugin-sample-logo@0.8.29) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@1.0.3-0...@ali/lowcode-plugin-sample-logo@1.0.4-0) (2020-08-20)
@@ -46,6 +52,8 @@ 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-sample-logo@0.13.0...@ali/lowcode-plugin-sample-logo@1.0.0) (2020-08-17)
=======
+=======
+>>>>>>> master
## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.27...@ali/lowcode-plugin-sample-logo@0.8.28) (2020-08-19)
>>>>>>> master
diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md
index cec09c837..8bee6ede1 100644
--- a/packages/plugin-sample-preview/CHANGELOG.md
+++ b/packages/plugin-sample-preview/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-sample-preview@1.0.4-0...@ali/lowcode-plugin-sample-preview@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.51...@ali/lowcode-plugin-sample-preview@0.8.52) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@1.0.3-0...@ali/lowcode-plugin-sample-preview@1.0.4-0) (2020-08-20)
@@ -57,6 +63,8 @@ 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-sample-preview@0.15.0...@ali/lowcode-plugin-sample-preview@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.50...@ali/lowcode-plugin-sample-preview@0.8.51) (2020-08-19)
diff --git a/packages/plugin-source-editor/CHANGELOG.md b/packages/plugin-source-editor/CHANGELOG.md
index 8d01bf231..a0dcc8afd 100644
--- a/packages/plugin-source-editor/CHANGELOG.md
+++ b/packages/plugin-source-editor/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-source-editor@1.0.4-0...@ali/lowcode-plugin-source-editor@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.26...@ali/lowcode-plugin-source-editor@0.8.27) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@1.0.3-0...@ali/lowcode-plugin-source-editor@1.0.4-0) (2020-08-20)
@@ -49,6 +55,8 @@ 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-source-editor@0.13.0...@ali/lowcode-plugin-source-editor@1.0.0) (2020-08-17)
=======
+=======
+>>>>>>> master
## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.25...@ali/lowcode-plugin-source-editor@0.8.26) (2020-08-19)
>>>>>>> master
diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md
index ed042be3e..d1849b6e4 100644
--- a/packages/plugin-undo-redo/CHANGELOG.md
+++ b/packages/plugin-undo-redo/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-undo-redo@1.0.4-0...@ali/lowcode-plugin-undo-redo@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.51...@ali/lowcode-plugin-undo-redo@0.8.52) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@1.0.3-0...@ali/lowcode-plugin-undo-redo@1.0.4-0) (2020-08-20)
@@ -50,6 +56,8 @@ 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-undo-redo@0.13.0...@ali/lowcode-plugin-undo-redo@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.50...@ali/lowcode-plugin-undo-redo@0.8.51) (2020-08-19)
diff --git a/packages/plugin-variable-bind-dialog/CHANGELOG.md b/packages/plugin-variable-bind-dialog/CHANGELOG.md
index c2645a8fc..81179567c 100644
--- a/packages/plugin-variable-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-variable-bind-dialog/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-variable-bind-dialog@1.0.4-0...@ali/lowcode-plugin-variable-bind-dialog@1.0.5-0) (2020-08-20)
+=======
+
+## [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
**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@1.0.3-0...@ali/lowcode-plugin-variable-bind-dialog@1.0.4-0) (2020-08-20)
@@ -46,6 +52,8 @@ 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)
=======
+=======
+>>>>>>> master
## [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 784cda7dc..ab5c4a30c 100644
--- a/packages/plugin-zh-en/CHANGELOG.md
+++ b/packages/plugin-zh-en/CHANGELOG.md
@@ -3,14 +3,20 @@
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-plugin-zh-en@1.0.4-0...@ali/lowcode-plugin-zh-en@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.31...@ali/lowcode-plugin-zh-en@0.8.32) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@1.0.3-0...@ali/lowcode-plugin-zh-en@1.0.4-0) (2020-08-20)
@@ -46,6 +52,8 @@ 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)
=======
+=======
+>>>>>>> master
## [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-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md
index 18ed3b7aa..723a3a614 100644
--- a/packages/rax-simulator-renderer/CHANGELOG.md
+++ b/packages/rax-simulator-renderer/CHANGELOG.md
@@ -3,6 +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-rax-simulator-renderer@1.0.4-0...@ali/lowcode-rax-simulator-renderer@1.0.5-0) (2020-08-20)
@@ -37,6 +38,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [1.0.1-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.51...@ali/lowcode-rax-simulator-renderer@1.0.1-0) (2020-08-20)
+=======
+
+## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.51...@ali/lowcode-rax-simulator-renderer@0.8.52) (2020-08-20)
+>>>>>>> master
### Bug Fixes
@@ -46,10 +51,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
+<<<<<<< HEAD
# [1.0.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.15.0...@ali/lowcode-rax-simulator-renderer@1.0.0) (2020-08-17)
=======
=======
+=======
+>>>>>>> master
## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.50...@ali/lowcode-rax-simulator-renderer@0.8.51) (2020-08-19)
diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md
index ef4e00712..dc88eeda4 100644
--- a/packages/react-simulator-renderer/CHANGELOG.md
+++ b/packages/react-simulator-renderer/CHANGELOG.md
@@ -3,14 +3,20 @@
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-react-simulator-renderer@1.0.4-0...@ali/lowcode-react-simulator-renderer@1.0.5-0) (2020-08-20)
+=======
+
+## [0.8.54](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.53...@ali/lowcode-react-simulator-renderer@0.8.54) (2020-08-20)
+>>>>>>> master
**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+<<<<<<< HEAD
## [1.0.4-0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@1.0.3-0...@ali/lowcode-react-simulator-renderer@1.0.4-0) (2020-08-20)
@@ -46,6 +52,8 @@ 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-react-simulator-renderer@0.15.0...@ali/lowcode-react-simulator-renderer@1.0.0) (2020-08-17)
=======
+=======
+>>>>>>> master
## [0.8.53](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.52...@ali/lowcode-react-simulator-renderer@0.8.53) (2020-08-19)
>>>>>>> master