diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md
index d38b988c6..7b5a96f31 100644
--- a/packages/demo/CHANGELOG.md
+++ b/packages/demo/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.49...@ali/lowcode-demo@0.8.50) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.48...@ali/lowcode-demo@0.8.49) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.48](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.47...@ali/lowcode-demo@0.8.48) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.46...@ali/lowcode-demo@0.8.47) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.46](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.44...@ali/lowcode-demo@0.8.46) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
+
+## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.44...@ali/lowcode-demo@0.8.45) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-demo
+
## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.43...@ali/lowcode-demo@0.8.44) (2020-07-29)
diff --git a/packages/demo/cloud-build.json b/packages/demo/cloud-build.json
index 934ab050f..1d0afbef7 100644
--- a/packages/demo/cloud-build.json
+++ b/packages/demo/cloud-build.json
@@ -12,9 +12,9 @@
"@ali/lowcode-editor-preset-general": "window.LowcodeEditor",
"@ali/lowcode-editor-core": "window.LowcodeEditor",
"@ali/lowcode-editor-skeleton": "window.LowcodeEditor",
- "@ali/lowcode-designer": "window.LowcodeEditor"
+ "@ali/lowcode-designer": "window.LowcodeEditor",
+ "rax": "var window.Rax"
},
- "minify": false,
"sourcemap": true,
"outputAssetsPath": {
"js": "", "css": ""
diff --git a/packages/demo/package.json b/packages/demo/package.json
index 1a2f81f16..524095452 100644
--- a/packages/demo/package.json
+++ b/packages/demo/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-demo",
- "version": "0.8.44",
+ "version": "0.8.50",
"private": true,
"description": "低代码引擎 DEMO",
"scripts": {
@@ -9,21 +9,21 @@
},
"config": {},
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-editor-skeleton": "^0.8.40",
- "@ali/lowcode-plugin-components-pane": "^0.8.36",
- "@ali/lowcode-plugin-designer": "^0.9.34",
- "@ali/lowcode-plugin-event-bind-dialog": "^0.8.24",
- "@ali/lowcode-plugin-outline-pane": "^0.8.40",
- "@ali/lowcode-plugin-sample-logo": "^0.8.23",
- "@ali/lowcode-plugin-sample-preview": "^0.8.38",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-editor-skeleton": "^0.8.46",
+ "@ali/lowcode-plugin-components-pane": "^0.8.42",
+ "@ali/lowcode-plugin-designer": "^0.9.40",
+ "@ali/lowcode-plugin-event-bind-dialog": "^0.8.27",
+ "@ali/lowcode-plugin-outline-pane": "^0.8.46",
+ "@ali/lowcode-plugin-sample-logo": "^0.8.26",
+ "@ali/lowcode-plugin-sample-preview": "^0.8.44",
"@ali/lowcode-plugin-settings-pane": "^0.8.8",
- "@ali/lowcode-plugin-undo-redo": "^0.8.38",
- "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.22",
- "@ali/lowcode-plugin-zh-en": "^0.8.26",
+ "@ali/lowcode-plugin-undo-redo": "^0.8.44",
+ "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.25",
+ "@ali/lowcode-plugin-zh-en": "^0.8.29",
"@ali/lowcode-react-renderer": "^0.8.17",
"@ali/lowcode-runtime": "^0.8.16",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-utils": "^0.8.16",
"@ali/ve-action-pane": "^4.7.0-beta.0",
"@ali/ve-datapool-pane": "^6.4.3",
"@ali/ve-history-pane": "4.0.0",
diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md
index dc1f9f9c5..d490d1b95 100644
--- a/packages/designer/CHANGELOG.md
+++ b/packages/designer/CHANGELOG.md
@@ -3,6 +3,72 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.9.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.39...@ali/lowcode-designer@0.9.40) (2020-08-06)
+
+
+### Bug Fixes
+
+* fieldId 重复问题 ([e761b1a](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e761b1a))
+
+
+
+
+
+## [0.9.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.38...@ali/lowcode-designer@0.9.39) (2020-08-06)
+
+
+### Bug Fixes
+
+* 增加兼容 API ([2960446](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2960446))
+* 复制之后 fieldId 重复 ([36621ea](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/36621ea))
+
+
+
+
+
+## [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)
+
+
+### Bug Fixes
+
+* 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 ([7cf6d24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7cf6d24))
+
+
+
+
+
+## [0.9.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.36...@ali/lowcode-designer@0.9.37) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-designer
+
+
+## [0.9.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.34...@ali/lowcode-designer@0.9.36) (2020-08-04)
+
+
+### Bug Fixes
+
+* 修复js面板引用计数问题 ([fcc1a6f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fcc1a6f))
+* 灵犀vc组件中调用config, 补充进去 ([7171aa2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7171aa2))
+
+
+
+
+
+## [0.9.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.34...@ali/lowcode-designer@0.9.35) (2020-08-04)
+
+
+### Bug Fixes
+
+* 修复js面板引用计数问题 ([fcc1a6f](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fcc1a6f))
+* 灵犀vc组件中调用config, 补充进去 ([7171aa2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7171aa2))
+
+
+
+
## [0.9.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.33...@ali/lowcode-designer@0.9.34) (2020-07-29)
diff --git a/packages/designer/package.json b/packages/designer/package.json
index caa129048..dab57b968 100644
--- a/packages/designer/package.json
+++ b/packages/designer/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-designer",
- "version": "0.9.34",
+ "version": "0.9.40",
"description": "Designer for Ali LowCode Engine",
"main": "lib/index.js",
"module": "es/index.js",
@@ -15,9 +15,9 @@
},
"license": "MIT",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"classnames": "^2.2.6",
"event": "^1.0.0",
"react": "^16",
diff --git a/packages/designer/src/component-meta.ts b/packages/designer/src/component-meta.ts
index b7aab79e2..0bf8e3891 100644
--- a/packages/designer/src/component-meta.ts
+++ b/packages/designer/src/component-meta.ts
@@ -383,7 +383,10 @@ const builtinComponentActions: ComponentAction[] = [
action(node: Node) {
// node.remove();
const { document: doc, parent, index } = node;
- parent && doc.insertNode(parent, node, index, true);
+ if (parent) {
+ const newNode = doc.insertNode(parent, node, index + 1, true);
+ newNode.select();
+ }
},
},
important: true,
diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts
index 6609e25c8..6a5eade7e 100644
--- a/packages/designer/src/document/document-model.ts
+++ b/packages/designer/src/document/document-model.ts
@@ -310,8 +310,11 @@ export class DocumentModel {
}
import(schema: RootSchema, checkId = false) {
+ // TODO: do purge
+ this.nodes.forEach(node => {
+ this.destroyNode(node);
+ });
this.rootNode.import(schema as any, checkId);
- // todo: purge something
// todo: select added and active track added
}
@@ -628,6 +631,13 @@ export class DocumentModel {
refresh() {
console.warn('refresh method is deprecated');
}
+
+ /**
+ * @deprecated
+ */
+ onRefresh(func: () => void) {
+ console.warn('onRefresh method is deprecated');
+ }
}
export function isDocumentModel(obj: any): obj is DocumentModel {
diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts
index 40e8a502b..3ba60b5f3 100644
--- a/packages/designer/src/document/node/props/prop.ts
+++ b/packages/designer/src/document/node/props/prop.ts
@@ -71,6 +71,10 @@ export class Prop implements IPropParent {
}
if (type === 'literal' || type === 'expression') {
+ // TODO 后端改造之后删除此逻辑
+ if (this._value === null && stage === TransformStage.Save) {
+ return '';
+ }
return this._value;
}
@@ -181,7 +185,7 @@ export class Prop implements IPropParent {
this._code = null;
const t = typeof val;
if (val == null) {
- this._value = undefined;
+ // this._value = undefined;
this._type = 'literal';
} else if (t === 'string' || t === 'number' || t === 'boolean') {
this._type = 'literal';
diff --git a/packages/designer/src/document/node/props/props.ts b/packages/designer/src/document/node/props/props.ts
index 91f598a7e..02852816f 100644
--- a/packages/designer/src/document/node/props/props.ts
+++ b/packages/designer/src/document/node/props/props.ts
@@ -336,4 +336,12 @@ export class Props implements IPropParent {
getNode() {
return this.owner;
}
+
+ /**
+ * @deprecated
+ * 获取 props 对应的 node
+ */
+ toData() {
+ return this.export()?.props;
+ }
}
diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md
index bde78bd2b..04371622d 100644
--- a/packages/editor-core/CHANGELOG.md
+++ b/packages/editor-core/CHANGELOG.md
@@ -3,6 +3,33 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.27...@ali/lowcode-editor-core@0.8.28) (2020-08-04)
+
+
+### Bug Fixes
+
+* 增加try catch ([6f5d11c](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6f5d11c))
+
+
+
+
+
+## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.25...@ali/lowcode-editor-core@0.8.27) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-core
+
+
+## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.25...@ali/lowcode-editor-core@0.8.26) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-core
+
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.24...@ali/lowcode-editor-core@0.8.25) (2020-07-28)
diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json
index b906952b9..6c7c08de8 100644
--- a/packages/editor-core/package.json
+++ b/packages/editor-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-core",
- "version": "0.8.25",
+ "version": "0.8.28",
"description": "Core Api for Ali lowCode engine",
"license": "MIT",
"main": "lib/index.js",
@@ -15,8 +15,8 @@
"cloud-build": "build-scripts build --skip-demo"
},
"dependencies": {
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@alifd/next": "^1.19.16",
"@recore/obx": "^1.0.9",
"@recore/obx-react": "^1.0.8",
diff --git a/packages/editor-core/src/hotkey.ts b/packages/editor-core/src/hotkey.ts
index 50cca63ca..f991aaeab 100644
--- a/packages/editor-core/src/hotkey.ts
+++ b/packages/editor-core/src/hotkey.ts
@@ -328,23 +328,27 @@ function getKeyInfo(combination: string, action?: string): KeyInfo {
* convention - prevent default and stop propogation on the event
*/
function fireCallback(callback: HotkeyCallback, e: KeyboardEvent, combo?: string, sequence?: string): void {
- const editor = globalContext.get(Editor);
- const designer = editor.get('designer');
- const node = designer?.currentSelection?.getNodes()?.[0];
- const npm = node?.componentMeta?.npm;
- const selected =
- [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || '';
- if (callback(e, combo) === false) {
- e.preventDefault();
- e.stopPropagation();
+ try {
+ const editor = globalContext.get(Editor);
+ const designer = editor.get('designer');
+ const node = designer?.currentSelection?.getNodes()?.[0];
+ const npm = node?.componentMeta?.npm;
+ const selected =
+ [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || '';
+ if (callback(e, combo) === false) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ editor?.emit('hotkey.callback.call', {
+ callback,
+ e,
+ combo,
+ sequence,
+ selected,
+ });
+ } catch(err) {
+ console.error(err.message);
}
- editor?.emit('hotkey.callback.call', {
- callback,
- e,
- combo,
- sequence,
- selected,
- });
}
export class Hotkey {
diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md
index 6562dbdaa..72b507173 100644
--- a/packages/editor-preset-general/CHANGELOG.md
+++ b/packages/editor-preset-general/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.9.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.24...@ali/lowcode-editor-preset-general@0.9.25) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.23...@ali/lowcode-editor-preset-general@0.9.24) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.22...@ali/lowcode-editor-preset-general@0.9.23) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.21...@ali/lowcode-editor-preset-general@0.9.22) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.19...@ali/lowcode-editor-preset-general@0.9.21) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
+
+## [0.9.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.19...@ali/lowcode-editor-preset-general@0.9.20) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-preset-general
+
## [0.9.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.18...@ali/lowcode-editor-preset-general@0.9.19) (2020-07-29)
diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json
index b944ab0a6..6029012c6 100644
--- a/packages/editor-preset-general/package.json
+++ b/packages/editor-preset-general/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-preset-general",
- "version": "0.9.19",
+ "version": "0.9.25",
"private": true,
"description": "Ali General Editor Preset",
"main": "lib/index.js",
@@ -15,12 +15,12 @@
},
"license": "MIT",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-editor-skeleton": "^0.8.40",
- "@ali/lowcode-plugin-designer": "^0.9.34",
- "@ali/lowcode-plugin-outline-pane": "^0.8.40",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-editor-skeleton": "^0.8.46",
+ "@ali/lowcode-plugin-designer": "^0.9.40",
+ "@ali/lowcode-plugin-outline-pane": "^0.8.46",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@alifd/next": "^1.19.12",
"@alife/theme-lowcode-dark": "^0.1.0",
"@alife/theme-lowcode-light": "^0.1.0",
@@ -28,7 +28,7 @@
"react-dom": "^16.8.1"
},
"devDependencies": {
- "@ali/lowcode-editor-setters": "^0.9.11",
+ "@ali/lowcode-editor-setters": "^0.9.14",
"@alib/build-scripts": "^0.1.18",
"@types/events": "^3.0.0",
"@types/react": "^16.8.3",
diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md
index c63915776..df4ae4c09 100644
--- a/packages/editor-preset-vision/CHANGELOG.md
+++ b/packages/editor-preset-vision/CHANGELOG.md
@@ -3,6 +3,76 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.40...@ali/lowcode-editor-preset-vision@0.8.41) (2020-08-06)
+
+
+### Bug Fixes
+
+* fieldId 重复问题 ([e761b1a](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e761b1a))
+
+
+
+
+
+## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.39...@ali/lowcode-editor-preset-vision@0.8.40) (2020-08-06)
+
+
+### Bug Fixes
+
+* 保存区块按钮渲染异常 ([33a7227](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/33a7227))
+* 增加兼容 API ([2960446](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2960446))
+
+
+
+
+
+## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.38...@ali/lowcode-editor-preset-vision@0.8.39) (2020-08-06)
+
+
+### Bug Fixes
+
+* 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 ([7cf6d24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7cf6d24))
+* 框架样式调整 ([58790c5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/58790c5))
+
+
+
+
+
+## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.37...@ali/lowcode-editor-preset-vision@0.8.38) (2020-08-04)
+
+
+### Bug Fixes
+
+* 🐛 解决点击组件时无法聚焦到点中的组件上的问题 ([852d882](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/852d882))
+
+
+
+
+
+## [0.8.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.35...@ali/lowcode-editor-preset-vision@0.8.37) (2020-08-04)
+
+
+### Bug Fixes
+
+* 修复 slot 获取初始值异常的 bug ([63b19f1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/63b19f1))
+* 兼容 listSetter 内部变量，修复回退 fieldId 重置问题 ([c95e618](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c95e618))
+
+
+
+
+
+## [0.8.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.35...@ali/lowcode-editor-preset-vision@0.8.36) (2020-08-04)
+
+
+### Bug Fixes
+
+* 修复 slot 获取初始值异常的 bug ([63b19f1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/63b19f1))
+* 兼容 listSetter 内部变量，修复回退 fieldId 重置问题 ([c95e618](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c95e618))
+
+
+
+
## [0.8.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.34...@ali/lowcode-editor-preset-vision@0.8.35) (2020-07-29)
diff --git a/packages/editor-preset-vision/build.json b/packages/editor-preset-vision/build.json
index b9babfe67..8df991958 100644
--- a/packages/editor-preset-vision/build.json
+++ b/packages/editor-preset-vision/build.json
@@ -9,7 +9,8 @@
"externals": {
"react": "var window.React",
"react-dom": "var window.ReactDOM",
- "prop-types": "var window.PropTypes"
+ "prop-types": "var window.PropTypes",
+ "rax": "var window.Rax"
}
}
],
diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json
index 4a114aaec..5a4d3e787 100644
--- a/packages/editor-preset-vision/package.json
+++ b/packages/editor-preset-vision/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-preset-vision",
- "version": "0.8.35",
+ "version": "0.8.41",
"private": true,
"description": "Vision Polyfill for Ali lowCode engine",
"main": "lib/index.js",
@@ -15,11 +15,11 @@
},
"license": "MIT",
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-editor-skeleton": "^0.8.40",
- "@ali/lowcode-plugin-designer": "^0.9.34",
- "@ali/lowcode-plugin-outline-pane": "^0.8.40",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-editor-skeleton": "^0.8.46",
+ "@ali/lowcode-plugin-designer": "^0.9.40",
+ "@ali/lowcode-plugin-outline-pane": "^0.8.46",
"@ali/ve-i18n-util": "^2.0.0",
"@ali/ve-icons": "^4.1.9",
"@ali/ve-less-variables": "2.0.3",
diff --git a/packages/editor-preset-vision/src/bundle/trunk.ts b/packages/editor-preset-vision/src/bundle/trunk.ts
index b8e0f19d6..831919a09 100644
--- a/packages/editor-preset-vision/src/bundle/trunk.ts
+++ b/packages/editor-preset-vision/src/bundle/trunk.ts
@@ -113,6 +113,10 @@ export class Trunk {
}
return setter;
}
+
+ getRecents(limit: number) {
+ return this.getList().filter((prototype) => prototype.getCategory()).slice(0, limit);
+ }
}
export default new Trunk();
diff --git a/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts b/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts
index 42ed2ad27..c03b7f82e 100644
--- a/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts
+++ b/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts
@@ -1,6 +1,6 @@
import { ComponentType, ReactElement, isValidElement, ComponentClass } from 'react';
import { isPlainObject, uniqueId } from '@ali/lowcode-utils';
-import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem } from '@ali/lowcode-types';
+import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem, isJSBlock } from '@ali/lowcode-types';
import { untracked } from '@ali/lowcode-editor-core';
import { editor, designer } from '../editor';
import { SettingField } from '@ali/lowcode-designer';
@@ -281,24 +281,19 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
}
let initialFn = (slotName ? null : initial) || initialValue;
- // 在 upgrade reducer 做了 JSBlock ——> JSSlot
- // if (slotName && initialValue === true) {
- // initialFn = (value: any, defaultValue: any) => {
- // if (isJSSlot(value)) {
- // return {
- // title: slotTitle || title,
- // name: slotName,
- // ...value,
- // };
- // }
- // return {
- // type: 'JSSlot',
- // title: slotTitle || title,
- // name: slotName,
- // value: initialChildren,
- // };
- // };
- // }
+ if (slotName && initialValue === true) {
+ initialFn = (value: any, defaultValue: any) => {
+ if (isJSBlock(value)) {
+ return value;
+ }
+ return {
+ type: 'JSSlot',
+ title: slotTitle || title,
+ name: slotName,
+ value: initialChildren,
+ };
+ };
+ }
if (!slotName) {
if (accessor) {
@@ -347,22 +342,22 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
initial: (field: Field, currentValue: any) => {
// FIXME! read from prototype.defaultProps
const defaults = extraProps.defaultValue;
-
+
if (typeof initialFn !== 'function') {
initialFn = defaultInitial;
}
-
+
const v = initialFn.call(field, currentValue, defaults);
-
+
if (setterInitial) {
return setterInitial.call(field, v, defaults);
}
-
+
return v;
},
});
}
-
+
if (ignore != null || disabled != null) {
collector.addFilter({
// FIXME! name should be "xxx.xxx"
@@ -569,7 +564,7 @@ export function upgradeActions(actions?: Array | ReactElement
if (typeof content === 'function') {
const fn = content as () => ReactElement;
content = (({ node }: any) => {
- fn.call(node);
+ return fn.call(node);
}) as any;
}
return {
diff --git a/packages/editor-preset-vision/src/deep-value-parser.ts b/packages/editor-preset-vision/src/deep-value-parser.ts
index 227e5da09..e5270264a 100644
--- a/packages/editor-preset-vision/src/deep-value-parser.ts
+++ b/packages/editor-preset-vision/src/deep-value-parser.ts
@@ -3,11 +3,19 @@ import { isJSSlot, isI18nData, isJSExpression } from '@ali/lowcode-types';
import { isPlainObject } from '@ali/lowcode-utils';
import i18nUtil from './i18n-util';
+function isVariable(obj: any) {
+ return obj && obj.type === 'variable';
+}
+
// FIXME: 表达式使用 mock 值，未来live 模式直接使用原始值
export function deepValueParser(obj?: any): any {
if (isJSExpression(obj)) {
obj = obj.mock;
}
+ // 兼容 ListSetter 中的变量结构
+ if (isVariable(obj)) {
+ obj = obj.value;
+ }
if (!obj) {
return obj;
}
diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts
index a24b57c61..d26ba0512 100644
--- a/packages/editor-preset-vision/src/editor.ts
+++ b/packages/editor-preset-vision/src/editor.ts
@@ -1,7 +1,7 @@
import { isJSBlock, isJSExpression, isJSSlot, isI18nData } from '@ali/lowcode-types';
import { isPlainObject, hasOwnProperty } from '@ali/lowcode-utils';
import { globalContext, Editor } from '@ali/lowcode-editor-core';
-import { Designer, LiveEditing, TransformStage, Node } from '@ali/lowcode-designer';
+import { Designer, LiveEditing, TransformStage, Node, getConvertedExtraKey } from '@ali/lowcode-designer';
import Outline, { OutlineBackupPane, getTreeMaster } from '@ali/lowcode-plugin-outline-pane';
import { toCss } from '@ali/vu-css-style';
import logger from '@ali/vu-logger';
@@ -25,10 +25,17 @@ export const designer = new Designer({ editor: editor });
editor.set(Designer, designer);
editor.set('designer', designer);
+const nodeCache: any = {};
designer.project.onCurrentDocumentChange((doc) => {
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 {
@@ -56,7 +63,7 @@ function upgradePropsReducer(props: any) {
type: 'JSSlot',
title: (val.value.props as any)?.slotTitle,
name: (val.value.props as any)?.slotName,
- value: val.value.children
+ value: val.value.children,
};
} else {
val = val.value;
@@ -80,11 +87,23 @@ designer.addPropsReducer(upgradePropsReducer, TransformStage.Upgrade);
// 节点 props 初始化
designer.addPropsReducer((props, node) => {
// run initials
+ const newProps: any = {
+ ...props,
+ };
+ if (newProps.fieldId) {
+ const fieldIds: any = [];
+ Object.keys(nodeCache).forEach(nodeId => {
+ const fieldId = nodeCache[nodeId].getPropValue('fieldId');
+ if (fieldId) {
+ fieldIds.push(fieldId);
+ }
+ });
+ if (fieldIds.indexOf(props.fieldId) >= 0) {
+ newProps.fieldId = undefined;
+ }
+ }
const initials = node.componentMeta.getMetadata().experimental?.initials;
if (initials) {
- const newProps: any = {
- ...props,
- };
const getRealValue = (propValue: any) => {
if (isVariable(propValue)) {
return propValue.value;
@@ -98,22 +117,10 @@ designer.addPropsReducer((props, node) => {
// FIXME! this implements SettingTarget
try {
// FIXME! item.name could be 'xxx.xxx'
- const ov = props[item.name];
+ const ov = newProps[item.name];
const v = item.initial(node as any, getRealValue(ov));
- if (v !== undefined) {
- if (isVariable(ov)) {
- newProps[item.name] = {
- ...ov,
- value: v,
- };
- } else if (isJSExpression(ov)) {
- newProps[item.name] = {
- ...ov,
- mock: v,
- };
- } else {
- newProps[item.name] = v;
- }
+ if (ov === undefined && v !== undefined) {
+ newProps[item.name] = v;
}
} catch (e) {
if (hasOwnProperty(props, item.name)) {
@@ -124,12 +131,19 @@ designer.addPropsReducer((props, node) => {
node.props.add(newProps[item.name], item.name);
}
});
-
- return newProps;
}
- return props;
+ return newProps;
}, TransformStage.Init);
+designer.addPropsReducer((props: any, node: Node) => {
+ if (node.isRoot() && props && props.lifeCycles) {
+ return {
+ ...props,
+ lifeCycles: {},
+ }
+ }
+ return props;
+}, TransformStage.Render);
function filterReducer(props: any, node: Node): any {
const filters = node.componentMeta.getMetadata().experimental?.filters;
@@ -173,7 +187,7 @@ function compatiableReducer(props: any) {
slotName: val.name,
},
},
- }
+ };
}
// 为了能降级到老版本，建议在后期版本去掉以下代码
if (isJSExpression(val) && !val.events) {
@@ -189,6 +203,20 @@ function compatiableReducer(props: any) {
}
// FIXME: Dirty fix, will remove this reducer
designer.addPropsReducer(compatiableReducer, TransformStage.Save);
+// 兼容历史版本的 Page 组件
+designer.addPropsReducer((props: any, node: Node) => {
+ const lifeCycleNames = ['didMount', 'willUnmount'];
+ if (node.isRoot()) {
+ lifeCycleNames.forEach(key => {
+ if (props[key]) {
+ const lifeCycles = node.props.getPropValue(getConvertedExtraKey('lifeCycles')) || {};
+ lifeCycles[key] = props[key];
+ node.props.setPropValue(getConvertedExtraKey('lifeCycles'), lifeCycles);
+ }
+ });
+ }
+ return props;
+}, TransformStage.Save);
// 设计器组件样式处理
function stylePropsReducer(props: any, node: any) {
@@ -268,7 +296,7 @@ skeleton.add({
props: {
condition: () => {
return designer.dragon.dragging && !getTreeMaster(designer).hasVisibleTreeBoard();
- }
+ },
},
content: OutlineBackupPane,
});
diff --git a/packages/editor-preset-vision/src/pages.ts b/packages/editor-preset-vision/src/pages.ts
index 504b544ba..2a4d723b5 100644
--- a/packages/editor-preset-vision/src/pages.ts
+++ b/packages/editor-preset-vision/src/pages.ts
@@ -43,7 +43,6 @@ const pages = Object.assign(project, {
// FIXME
if (componentsTree[0].componentName === 'Page' ||
componentsTree[0].componentName === 'Component') {
- componentsTree[0].lifeCycles = {};
componentsTree[0].methods = {};
}
}
diff --git a/packages/editor-preset-vision/src/panes.ts b/packages/editor-preset-vision/src/panes.ts
index 5f4b9fdce..5a239d0fe 100644
--- a/packages/editor-preset-vision/src/panes.ts
+++ b/packages/editor-preset-vision/src/panes.ts
@@ -161,6 +161,9 @@ const actionPane = Object.assign(skeleton.topArea, {
setActions() {
// empty
},
+ get actions() {
+ return skeleton.topArea.container.items;
+ },
});
const dockPane = Object.assign(skeleton.leftArea, {
/**
diff --git a/packages/editor-preset-vision/src/vision.less b/packages/editor-preset-vision/src/vision.less
index df469d567..ffaff2b83 100644
--- a/packages/editor-preset-vision/src/vision.less
+++ b/packages/editor-preset-vision/src/vision.less
@@ -49,7 +49,7 @@ html.engine-blur #engine {
.engine-main {
width: 100%;
height: 100%;
- position: relative;
+ position: fixed;
.ve-icon-button {
> .ve-icon-contents {
@@ -121,4 +121,4 @@ html.engine-preview-mode {
align-items: center;
line-height: 22px;
}
-}
\ No newline at end of file
+}
diff --git a/packages/editor-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md
index 4d5684f09..7bd50d569 100644
--- a/packages/editor-setters/CHANGELOG.md
+++ b/packages/editor-setters/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.9.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.13...@ali/lowcode-editor-setters@0.9.14) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-setters
+
+
+## [0.9.13](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.11...@ali/lowcode-editor-setters@0.9.13) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-setters
+
+
+## [0.9.12](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.11...@ali/lowcode-editor-setters@0.9.12) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-setters
+
## [0.9.11](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.10...@ali/lowcode-editor-setters@0.9.11) (2020-07-28)
diff --git a/packages/editor-setters/package.json b/packages/editor-setters/package.json
index 688df401d..f60979c40 100644
--- a/packages/editor-setters/package.json
+++ b/packages/editor-setters/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-setters",
- "version": "0.9.11",
+ "version": "0.9.14",
"description": "Builtin setters for Ali lowCode engine",
"files": [
"es",
@@ -22,7 +22,7 @@
"@ali/iceluna-comp-react-node": "^1.0.5",
"@ali/iceluna-sdk": "^1.0.5-beta.24",
"@ali/lc-style-setter": "^0.0.1",
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-editor-core": "^0.8.28",
"@alifd/next": "^1.19.16",
"acorn": "^6.4.1",
"classnames": "^2.2.6",
diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md
index c5bbd29c6..3d5578227 100644
--- a/packages/editor-skeleton/CHANGELOG.md
+++ b/packages/editor-skeleton/CHANGELOG.md
@@ -3,6 +3,73 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.46](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.45...@ali/lowcode-editor-skeleton@0.8.46) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-skeleton
+
+
+## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.44...@ali/lowcode-editor-skeleton@0.8.45) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-skeleton
+
+
+## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.43...@ali/lowcode-editor-skeleton@0.8.44) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-editor-skeleton
+
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.42...@ali/lowcode-editor-skeleton@0.8.43) (2020-08-04)
+
+
+### Bug Fixes
+
+* 🐛 mainArea 画布切换，MainArea 重新初始化导致 iframe 初始化报错 ([5054d06](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/5054d06))
+
+
+
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.40...@ali/lowcode-editor-skeleton@0.8.42) (2020-08-04)
+
+
+### Bug Fixes
+
+* condition增加异常保护 ([8324368](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8324368))
+* CR 问题修复 ([f054cbf](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f054cbf))
+* remove console ([6c703d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6c703d8))
+* 兼容vision体系代码面板中引用计数功能 ([8ade6d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8ade6d8))
+* 导入的组件默认怎么变量绑定 ([fc398c2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fc398c2))
+* 导入的组件默认怎么变量绑定 ([194d8d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/194d8d8))
+
+
+
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.40...@ali/lowcode-editor-skeleton@0.8.41) (2020-08-04)
+
+
+### Bug Fixes
+
+* condition增加异常保护 ([8324368](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8324368))
+* CR 问题修复 ([f054cbf](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/f054cbf))
+* remove console ([6c703d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6c703d8))
+* 兼容vision体系代码面板中引用计数功能 ([8ade6d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/8ade6d8))
+* 导入的组件默认怎么变量绑定 ([fc398c2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/fc398c2))
+* 导入的组件默认怎么变量绑定 ([194d8d8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/194d8d8))
+
+
+
+
## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.39...@ali/lowcode-editor-skeleton@0.8.40) (2020-07-29)
diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json
index 11adbd24f..102f327ed 100644
--- a/packages/editor-skeleton/package.json
+++ b/packages/editor-skeleton/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-skeleton",
- "version": "0.8.40",
+ "version": "0.8.46",
"description": "alibaba lowcode editor skeleton",
"main": "lib/index.js",
"module": "es/index.js",
@@ -19,10 +19,10 @@
"editor"
],
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@alifd/next": "^1.20.12",
"classnames": "^2.2.6",
"react": "^16.8.1",
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 6ad763ac1..a0341a002 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -16,8 +16,9 @@ class SettingFieldView extends Component<{ field: SettingField }> {
render() {
const { field } = this.props;
- const { extraProps } = field;
+ const { extraProps, componentMeta } = field;
const { condition, defaultValue, display } = extraProps;
+ const { prototype } = componentMeta;
let visible;
try {
visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true;
@@ -33,6 +34,8 @@ class SettingFieldView extends Component<{ field: SettingField }> {
let setterProps: any = {};
let setterType: any;
let initialValue: any = null;
+ const isReactComponent = prototype === null || prototype === undefined;
+
if (Array.isArray(setter)) {
setterType = 'MixedSetter';
setterProps = {
@@ -49,9 +52,15 @@ class SettingFieldView extends Component<{ field: SettingField }> {
if (setter.initialValue != null) {
initialValue = setter.initialValue;
}
+ } else if (isReactComponent) {
+ setterType = 'MixedSetter';
+ setterProps = {
+ setters: [setter, 'VariableSetter'],
+ };
} else if (setter) {
setterType = setter;
}
+
let value = null;
if (defaultValue != null && !('defaultValue' in setterProps)) {
setterProps.defaultValue = defaultValue;
diff --git a/packages/editor-skeleton/src/components/widget-views/index.less b/packages/editor-skeleton/src/components/widget-views/index.less
new file mode 100644
index 000000000..1241b0dde
--- /dev/null
+++ b/packages/editor-skeleton/src/components/widget-views/index.less
@@ -0,0 +1,8 @@
+.lc-widget-view-container {
+ height: 100%;
+ width: 100%;
+
+ &.hidden {
+ display: none;
+ }
+}
diff --git a/packages/editor-skeleton/src/components/widget-views.tsx b/packages/editor-skeleton/src/components/widget-views/index.tsx
similarity index 93%
rename from packages/editor-skeleton/src/components/widget-views.tsx
rename to packages/editor-skeleton/src/components/widget-views/index.tsx
index e14b2e2df..cb29ce451 100644
--- a/packages/editor-skeleton/src/components/widget-views.tsx
+++ b/packages/editor-skeleton/src/components/widget-views/index.tsx
@@ -2,13 +2,15 @@ import { Component, ReactElement } from 'react';
import { Icon } from '@alifd/next';
import classNames from 'classnames';
import { Title, observer, Tip, globalContext, Editor } from '@ali/lowcode-editor-core';
-import { DockProps } from '../types';
-import PanelDock from '../widget/panel-dock';
-import { composeTitle } from '../widget/utils';
-import WidgetContainer from '../widget/widget-container';
-import Panel from '../widget/panel';
-import { IWidget } from '../widget/widget';
-import { SkeletonEvents } from '../skeleton';
+import { DockProps } from '../../types';
+import PanelDock from '../../widget/panel-dock';
+import { composeTitle } from '../../widget/utils';
+import WidgetContainer from '../../widget/widget-container';
+import Panel from '../../widget/panel';
+import { IWidget } from '../../widget/widget';
+import { SkeletonEvents } from '../../skeleton';
+
+import './index.less';
export function DockView({ title, icon, description, size, className, onClick }: DockProps) {
return (
@@ -262,9 +264,6 @@ export class WidgetView extends Component<{ widget: IWidget }> {
}
render() {
const { widget } = this.props;
- if (!widget.visible) {
- return null;
- }
- return widget.body;
+ return {widget.body}
;
}
}
diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md
index c503d52c8..9fe28f0cb 100644
--- a/packages/plugin-components-pane/CHANGELOG.md
+++ b/packages/plugin-components-pane/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.41...@ali/lowcode-plugin-components-pane@0.8.42) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.40...@ali/lowcode-plugin-components-pane@0.8.41) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.39...@ali/lowcode-plugin-components-pane@0.8.40) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.38...@ali/lowcode-plugin-components-pane@0.8.39) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.36...@ali/lowcode-plugin-components-pane@0.8.38) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
+
+## [0.8.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.36...@ali/lowcode-plugin-components-pane@0.8.37) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
+
## [0.8.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.35...@ali/lowcode-plugin-components-pane@0.8.36) (2020-07-29)
diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json
index b0cb52123..568d80896 100644
--- a/packages/plugin-components-pane/package.json
+++ b/packages/plugin-components-pane/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-components-pane",
- "version": "0.8.36",
+ "version": "0.8.42",
"description": "alibaba lowcode editor component-list plugin",
"files": [
"es/",
@@ -20,9 +20,9 @@
],
"author": "xiayang.xy",
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
"@ali/ve-component-list": "^1.1.1",
"@alifd/next": "^1.19.19",
"react": "^16.8.1"
diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md
index 650f250be..ee3829bf4 100644
--- a/packages/plugin-designer/CHANGELOG.md
+++ b/packages/plugin-designer/CHANGELOG.md
@@ -3,6 +3,60 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.9.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.39...@ali/lowcode-plugin-designer@0.9.40) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+
+## [0.9.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.38...@ali/lowcode-plugin-designer@0.9.39) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+
+## [0.9.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.37...@ali/lowcode-plugin-designer@0.9.38) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+
+## [0.9.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.36...@ali/lowcode-plugin-designer@0.9.37) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-designer
+
+
+## [0.9.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.34...@ali/lowcode-plugin-designer@0.9.36) (2020-08-04)
+
+
+### Bug Fixes
+
+* plugin-desiger 支持从 editor 获取 device 参数 ([43bc29b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/43bc29b))
+
+
+
+
+
+## [0.9.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.34...@ali/lowcode-plugin-designer@0.9.35) (2020-08-04)
+
+
+### Bug Fixes
+
+* plugin-desiger 支持从 editor 获取 device 参数 ([43bc29b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/43bc29b))
+
+
+
+
## [0.9.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.33...@ali/lowcode-plugin-designer@0.9.34) (2020-07-29)
diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json
index acd8b78e7..3148ad3d2 100644
--- a/packages/plugin-designer/package.json
+++ b/packages/plugin-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-designer",
- "version": "0.9.34",
+ "version": "0.9.40",
"description": "alibaba lowcode editor designer plugin",
"files": [
"es",
@@ -20,8 +20,8 @@
],
"author": "xiayang.xy",
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
diff --git a/packages/plugin-designer/src/index.tsx b/packages/plugin-designer/src/index.tsx
index 817eb30de..cc09a7310 100644
--- a/packages/plugin-designer/src/index.tsx
+++ b/packages/plugin-designer/src/index.tsx
@@ -12,6 +12,7 @@ interface DesignerPluginState {
library?: any[] | null;
extraEnvironment?: any[] | null;
renderEnv?: string;
+ device?: string;
}
export default class DesignerPlugin extends PureComponent {
@@ -22,6 +23,7 @@ export default class DesignerPlugin extends PureComponent
);
diff --git a/packages/plugin-event-bind-dialog/CHANGELOG.md b/packages/plugin-event-bind-dialog/CHANGELOG.md
index b179ceeff..b6b855eaf 100644
--- a/packages/plugin-event-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-event-bind-dialog/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.26...@ali/lowcode-plugin-event-bind-dialog@0.8.27) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
+
+
+## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.24...@ali/lowcode-plugin-event-bind-dialog@0.8.26) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
+
+
+## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.24...@ali/lowcode-plugin-event-bind-dialog@0.8.25) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog
+
## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.23...@ali/lowcode-plugin-event-bind-dialog@0.8.24) (2020-07-28)
diff --git a/packages/plugin-event-bind-dialog/package.json b/packages/plugin-event-bind-dialog/package.json
index 6a837a28d..421d67b0c 100644
--- a/packages/plugin-event-bind-dialog/package.json
+++ b/packages/plugin-event-bind-dialog/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-event-bind-dialog",
- "version": "0.8.24",
+ "version": "0.8.27",
"description": "alibaba lowcode editor event bind dialog plugin",
"files": [
"es",
@@ -19,8 +19,8 @@
],
"author": "zude.hzd",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
"@alifd/next": "^1.19.16",
"react": "^16.8.1",
"react-dom": "^16.8.1"
diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md
index 114e65695..5699f6da2 100644
--- a/packages/plugin-outline-pane/CHANGELOG.md
+++ b/packages/plugin-outline-pane/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.46](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.45...@ali/lowcode-plugin-outline-pane@0.8.46) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.44...@ali/lowcode-plugin-outline-pane@0.8.45) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.43...@ali/lowcode-plugin-outline-pane@0.8.44) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.42...@ali/lowcode-plugin-outline-pane@0.8.43) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.40...@ali/lowcode-plugin-outline-pane@0.8.42) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.40...@ali/lowcode-plugin-outline-pane@0.8.41) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
+
## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.39...@ali/lowcode-plugin-outline-pane@0.8.40) (2020-07-29)
diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json
index 9a2d6d41a..20ef76d84 100644
--- a/packages/plugin-outline-pane/package.json
+++ b/packages/plugin-outline-pane/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-outline-pane",
- "version": "0.8.40",
+ "version": "0.8.46",
"description": "Outline pane for Ali lowCode engine",
"files": [
"es",
@@ -14,10 +14,10 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@alifd/next": "^1.19.16",
"classnames": "^2.2.6",
"react": "^16",
diff --git a/packages/plugin-sample-logo/CHANGELOG.md b/packages/plugin-sample-logo/CHANGELOG.md
index fb5b40aac..fa431fcc3 100644
--- a/packages/plugin-sample-logo/CHANGELOG.md
+++ b/packages/plugin-sample-logo/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.25...@ali/lowcode-plugin-sample-logo@0.8.26) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
+
+
+## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.23...@ali/lowcode-plugin-sample-logo@0.8.25) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
+
+
+## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.23...@ali/lowcode-plugin-sample-logo@0.8.24) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo
+
## [0.8.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.22...@ali/lowcode-plugin-sample-logo@0.8.23) (2020-07-28)
diff --git a/packages/plugin-sample-logo/package.json b/packages/plugin-sample-logo/package.json
index f3d8502b7..c39f822ab 100644
--- a/packages/plugin-sample-logo/package.json
+++ b/packages/plugin-sample-logo/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-sample-logo",
- "version": "0.8.23",
+ "version": "0.8.26",
"description": "alibaba lowcode editor logo plugin",
"files": [
"es/",
@@ -20,7 +20,7 @@
],
"author": "xiayang.xy",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-editor-core": "^0.8.28",
"react": "^16.8.1"
},
"devDependencies": {
diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md
index 18979e973..b49427f87 100644
--- a/packages/plugin-sample-preview/CHANGELOG.md
+++ b/packages/plugin-sample-preview/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.43...@ali/lowcode-plugin-sample-preview@0.8.44) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.42...@ali/lowcode-plugin-sample-preview@0.8.43) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.41...@ali/lowcode-plugin-sample-preview@0.8.42) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.40...@ali/lowcode-plugin-sample-preview@0.8.41) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.38...@ali/lowcode-plugin-sample-preview@0.8.40) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
+
+## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.38...@ali/lowcode-plugin-sample-preview@0.8.39) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
+
## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.37...@ali/lowcode-plugin-sample-preview@0.8.38) (2020-07-29)
diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json
index 5cdd112d6..3848d0e1b 100644
--- a/packages/plugin-sample-preview/package.json
+++ b/packages/plugin-sample-preview/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-sample-preview",
- "version": "0.8.38",
+ "version": "0.8.44",
"description": "alibaba lowcode editor sample preview plugin",
"files": [
"es",
@@ -18,8 +18,8 @@
"editor"
],
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
"@alifd/next": "^1.x",
"react": "^16.8.1"
},
diff --git a/packages/plugin-source-editor/CHANGELOG.md b/packages/plugin-source-editor/CHANGELOG.md
index 8835f9a52..f43540c58 100644
--- a/packages/plugin-source-editor/CHANGELOG.md
+++ b/packages/plugin-source-editor/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.23...@ali/lowcode-plugin-source-editor@0.8.24) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
+
+
+## [0.8.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.21...@ali/lowcode-plugin-source-editor@0.8.23) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
+
+
+## [0.8.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.21...@ali/lowcode-plugin-source-editor@0.8.22) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-source-editor
+
## [0.8.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.20...@ali/lowcode-plugin-source-editor@0.8.21) (2020-07-28)
diff --git a/packages/plugin-source-editor/package.json b/packages/plugin-source-editor/package.json
index 6ae6f48e7..77f693ba7 100644
--- a/packages/plugin-source-editor/package.json
+++ b/packages/plugin-source-editor/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-source-editor",
- "version": "0.8.21",
+ "version": "0.8.24",
"description": "alibaba lowcode editor source-editor plugin",
"files": [
"es",
@@ -19,7 +19,7 @@
],
"author": "zude.hzd",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-editor-core": "^0.8.28",
"@alifd/next": "^1.19.16",
"js-beautify": "^1.10.1",
"prettier": "^1.18.2",
diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md
index 9cc712520..046c20776 100644
--- a/packages/plugin-undo-redo/CHANGELOG.md
+++ b/packages/plugin-undo-redo/CHANGELOG.md
@@ -3,6 +3,54 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.43...@ali/lowcode-plugin-undo-redo@0.8.44) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.42...@ali/lowcode-plugin-undo-redo@0.8.43) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.41...@ali/lowcode-plugin-undo-redo@0.8.42) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.40...@ali/lowcode-plugin-undo-redo@0.8.41) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.38...@ali/lowcode-plugin-undo-redo@0.8.40) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
+
+## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.38...@ali/lowcode-plugin-undo-redo@0.8.39) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
+
## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.37...@ali/lowcode-plugin-undo-redo@0.8.38) (2020-07-29)
diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json
index 3367e6196..442e5cc01 100644
--- a/packages/plugin-undo-redo/package.json
+++ b/packages/plugin-undo-redo/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-undo-redo",
- "version": "0.8.38",
+ "version": "0.8.44",
"description": "alibaba lowcode editor undo redo plugin",
"files": [
"es",
@@ -19,11 +19,11 @@
],
"author": "xiayang.xy",
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-editor-skeleton": "^0.8.40",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-designer": "^0.9.40",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-editor-skeleton": "^0.8.46",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
diff --git a/packages/plugin-variable-bind-dialog/CHANGELOG.md b/packages/plugin-variable-bind-dialog/CHANGELOG.md
index 604ffe18c..0ccac3747 100644
--- a/packages/plugin-variable-bind-dialog/CHANGELOG.md
+++ b/packages/plugin-variable-bind-dialog/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.24...@ali/lowcode-plugin-variable-bind-dialog@0.8.25) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
+
+
+## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.22...@ali/lowcode-plugin-variable-bind-dialog@0.8.24) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
+
+
+## [0.8.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.22...@ali/lowcode-plugin-variable-bind-dialog@0.8.23) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog
+
## [0.8.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.21...@ali/lowcode-plugin-variable-bind-dialog@0.8.22) (2020-07-28)
diff --git a/packages/plugin-variable-bind-dialog/package.json b/packages/plugin-variable-bind-dialog/package.json
index 428c8e4cd..2a3ca0d4b 100644
--- a/packages/plugin-variable-bind-dialog/package.json
+++ b/packages/plugin-variable-bind-dialog/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-variable-bind-dialog",
- "version": "0.8.22",
+ "version": "0.8.25",
"description": "alibaba lowcode editor variable bind dialog plugin",
"files": [
"es",
@@ -19,7 +19,7 @@
],
"author": "zude.hzd",
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
+ "@ali/lowcode-editor-core": "^0.8.28",
"@alifd/next": "^1.19.16",
"react": "^16.8.1",
"react-dom": "^16.8.1"
diff --git a/packages/plugin-zh-en/CHANGELOG.md b/packages/plugin-zh-en/CHANGELOG.md
index 5f2ab9f43..de17902f6 100644
--- a/packages/plugin-zh-en/CHANGELOG.md
+++ b/packages/plugin-zh-en/CHANGELOG.md
@@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.28...@ali/lowcode-plugin-zh-en@0.8.29) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
+
+
+## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.26...@ali/lowcode-plugin-zh-en@0.8.28) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
+
+
+## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.26...@ali/lowcode-plugin-zh-en@0.8.27) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-plugin-zh-en
+
## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.25...@ali/lowcode-plugin-zh-en@0.8.26) (2020-07-28)
diff --git a/packages/plugin-zh-en/package.json b/packages/plugin-zh-en/package.json
index 6dfd15d59..ffeef2306 100644
--- a/packages/plugin-zh-en/package.json
+++ b/packages/plugin-zh-en/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-zh-en",
- "version": "0.8.26",
+ "version": "0.8.29",
"description": "alibaba lowcode editor zhong english plugin",
"files": [
"es",
@@ -14,9 +14,9 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
- "@ali/lowcode-editor-core": "^0.8.25",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-editor-core": "^0.8.28",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
diff --git a/packages/rax-simulator-renderer/.babelrc b/packages/rax-simulator-renderer/.babelrc
new file mode 100644
index 000000000..e0e2e5f34
--- /dev/null
+++ b/packages/rax-simulator-renderer/.babelrc
@@ -0,0 +1,9 @@
+{
+ "plugins": [
+ ["@babel/plugin-transform-react-jsx", {
+ "pragma": "createElement", // default pragma is React.createElement
+ "pragmaFrag": "createFragment", // default is React.Fragment
+ "throwIfNamespace": false // defaults to true
+ }]
+ ]
+}
diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md
index d1c984a55..8ad00f888 100644
--- a/packages/rax-simulator-renderer/CHANGELOG.md
+++ b/packages/rax-simulator-renderer/CHANGELOG.md
@@ -3,6 +3,52 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.42...@ali/lowcode-rax-simulator-renderer@0.8.43) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.41...@ali/lowcode-rax-simulator-renderer@0.8.42) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.40...@ali/lowcode-rax-simulator-renderer@0.8.41) (2020-08-06)
+
+
+### Bug Fixes
+
+* 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 ([7cf6d24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7cf6d24))
+
+
+
+
+
+## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.39...@ali/lowcode-rax-simulator-renderer@0.8.40) (2020-08-04)
+
+
+### Bug Fixes
+
+* 🐛 解决点击组件时无法聚焦到点中的组件上的问题 ([852d882](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/852d882))
+
+
+
+
+
+## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.37...@ali/lowcode-rax-simulator-renderer@0.8.39) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer
+
## [0.8.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-rax-simulator-renderer@0.8.36...@ali/lowcode-rax-simulator-renderer@0.8.37) (2020-07-29)
diff --git a/packages/rax-simulator-renderer/build.json b/packages/rax-simulator-renderer/build.json
index 703b8c7ce..70f118bdf 100644
--- a/packages/rax-simulator-renderer/build.json
+++ b/packages/rax-simulator-renderer/build.json
@@ -6,7 +6,13 @@
"filename": "rax-simulator-renderer",
"library": "SimulatorRenderer",
"libraryExport": "default",
- "libraryTarget": "umd"
+ "libraryTarget": "umd",
+ "externals": {
+ "react": "var window.React",
+ "react-dom": "var window.ReactDOM",
+ "prop-types": "var window.PropTypes",
+ "rax": "var window.Rax"
+ }
}
],
"./build.plugin.js"
diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json
index 74de20d8d..1bd727210 100644
--- a/packages/rax-simulator-renderer/package.json
+++ b/packages/rax-simulator-renderer/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@ali/lowcode-rax-simulator-renderer",
- "version": "0.8.37",
+ "version": "0.8.43",
"description": "rax simulator renderer for alibaba lowcode designer",
"main": "lib/index.js",
"module": "es/index.js",
@@ -14,10 +14,10 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
+ "@ali/lowcode-designer": "^0.9.40",
"@ali/lowcode-rax-renderer": "^0.1.6",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@ali/recore-rax": "^1.2.4",
"@ali/vu-css-style": "^1.0.2",
"@recore/obx": "^1.0.8",
@@ -30,6 +30,8 @@
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18",
+ "@babel/plugin-transform-react-jsx": "^7.10.4",
+ "@recore/obx": "^1.0.8",
"@types/classnames": "^2.2.7",
"@types/node": "^13.7.1",
"@types/rax": "^1.0.0",
@@ -51,5 +53,5 @@
"ts-node/register"
]
},
- "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.36/build/index.html"
+ "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@0.8.42/build/index.html"
}
diff --git a/packages/rax-simulator-renderer/src/renderer.ts b/packages/rax-simulator-renderer/src/renderer.ts
index 67bb30b01..be68ca9ca 100644
--- a/packages/rax-simulator-renderer/src/renderer.ts
+++ b/packages/rax-simulator-renderer/src/renderer.ts
@@ -386,35 +386,34 @@ function getClosestNodeInstance(from: any, specId?: string): NodeInstance |
return null;
}
-function matcher(parent: any) {
- return parent.__isReactiveComponent && parent.props.componentId;
+function isValidDesignModeRaxComponentInstance(
+ raxComponentInst: any,
+): raxComponentInst is {
+ props: {
+ _leaf: Exclude['node'], null | undefined>;
+ };
+} {
+ const leaf = raxComponentInst?.props?._leaf;
+ return leaf && typeof leaf === 'object' && leaf.isNode;
}
function getNodeInstance(dom: HTMLElement): NodeInstance | null {
const INTERNAL = '_internal';
+
let instance = Instance.get(dom);
- let node;
while (instance && instance[INTERNAL]) {
- if (matcher(instance)) {
- node = instance;
- break;
+ if (isValidDesignModeRaxComponentInstance(instance)) {
+ return {
+ nodeId: instance.props._leaf.getId(),
+ instance: instance,
+ node: instance.props._leaf,
+ };
}
+
instance = instance[INTERNAL].__parentInstance;
}
- if (!node) {
- return null;
- }
- return {
- nodeId: node.props.componentId,
- instance: node
- }
- // return parent;
- // const instance = fiberNode.stateNode;
- // if (instance) {
- // console.log(instance);
- // }
- // return getNodeInstance(fiberNode.return);
- // return instance;
+
+ return null;
}
function checkInstanceMounted(instance: any): boolean {
diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md
index 0ed87eaaa..322a14d01 100644
--- a/packages/react-simulator-renderer/CHANGELOG.md
+++ b/packages/react-simulator-renderer/CHANGELOG.md
@@ -3,6 +3,46 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.44...@ali/lowcode-react-simulator-renderer@0.8.45) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+
+## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.43...@ali/lowcode-react-simulator-renderer@0.8.44) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+
+## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.42...@ali/lowcode-react-simulator-renderer@0.8.43) (2020-08-06)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+
+## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.41...@ali/lowcode-react-simulator-renderer@0.8.42) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
+
+## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.40...@ali/lowcode-react-simulator-renderer@0.8.41) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
+
## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.39...@ali/lowcode-react-simulator-renderer@0.8.40) (2020-07-29)
diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json
index e51bc8ba7..158f16adc 100644
--- a/packages/react-simulator-renderer/package.json
+++ b/packages/react-simulator-renderer/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@ali/lowcode-react-simulator-renderer",
- "version": "0.8.40",
+ "version": "0.8.45",
"description": "react simulator renderer for alibaba lowcode designer",
"main": "lib/index.js",
"module": "es/index.js",
@@ -13,10 +13,10 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
- "@ali/lowcode-designer": "^0.9.34",
+ "@ali/lowcode-designer": "^0.9.40",
"@ali/lowcode-react-renderer": "^0.8.17",
- "@ali/lowcode-types": "^0.8.13",
- "@ali/lowcode-utils": "^0.8.15",
+ "@ali/lowcode-types": "^0.8.14",
+ "@ali/lowcode-utils": "^0.8.16",
"@ali/vu-css-style": "^1.0.2",
"@recore/obx": "^1.0.8",
"@recore/obx-react": "^1.0.7",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 891b3bfc1..11e1c7c7d 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.13...@ali/lowcode-types@0.8.14) (2020-08-04)
+
+
+### Bug Fixes
+
+* 修复 slot 获取初始值异常的 bug ([63b19f1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/63b19f1))
+
+
+
+
## [0.8.13](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.12...@ali/lowcode-types@0.8.13) (2020-07-21)
diff --git a/packages/types/package.json b/packages/types/package.json
index 010ae5cd1..c21581d25 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-types",
- "version": "0.8.13",
+ "version": "0.8.14",
"description": "Types for Ali lowCode engine",
"files": [
"es",
diff --git a/packages/types/src/value-type.ts b/packages/types/src/value-type.ts
index 6e5083c0a..34f0c38c5 100644
--- a/packages/types/src/value-type.ts
+++ b/packages/types/src/value-type.ts
@@ -55,5 +55,5 @@ export function isJSSlot(data: any): data is JSSlot {
}
export function isJSBlock(data: any): data is JSBlock {
- return data && data.type === 'JSBlock'
+ return data && data.type === 'JSBlock';
}
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index 094e5a98d..b423c7e5a 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.8.16](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.15...@ali/lowcode-utils@0.8.16) (2020-08-04)
+
+
+
+
+**Note:** Version bump only for package @ali/lowcode-utils
+
## [0.8.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.14...@ali/lowcode-utils@0.8.15) (2020-07-22)
diff --git a/packages/utils/package.json b/packages/utils/package.json
index c1a86b6b8..ceba915a7 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-utils",
- "version": "0.8.15",
+ "version": "0.8.16",
"description": "Utils for Ali lowCode engine",
"files": [
"es",
@@ -14,7 +14,7 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
- "@ali/lowcode-types": "^0.8.13",
+ "@ali/lowcode-types": "^0.8.14",
"@alifd/next": "^1.19.16",
"react": "^16"
},
diff --git a/scripts/build.sh b/scripts/build.sh
index 635bd8bf8..6e8310eaf 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,7 +1,5 @@
#!/usr/bin/env bash
lerna run build --stream
-cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist
-cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist
-cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist
-cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist
+# cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist
+# cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 783994ef6..7e982e943 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -21,18 +21,18 @@ echo ""
# work
mkdir packages
-cp -r $WORK_DIR/packages/demo packages/demo
+# cp -r $WORK_DIR/packages/demo packages/demo
cp -r $WORK_DIR/packages/react-simulator-renderer packages/react-simulator-renderer
-# cp -r $WORK_DIR/packages/rax-simulator-renderer packages/rax-simulator-renderer
+cp -r $WORK_DIR/packages/rax-simulator-renderer packages/rax-simulator-renderer
cp -r $WORK_DIR/packages/editor-preset-vision packages/editor-preset-vision
# cp -r $WORK_DIR/packages/editor-preset-general packages/editor-preset-general
lerna bootstrap
lerna run cloud-build --stream
cd $WORK_DIR
-mv deploy-space/packages/demo/build $BUILD_DEST
-mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST
-# mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST
+# mv deploy-space/packages/demo/build $BUILD_DEST
+mv deploy-space/packages/react-simulator-renderer/dist $BUILD_DEST
+mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST
mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST
# mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST
# cp deploy-space/static/* $BUILD_DEST