From d2aed7d78d6689022801a74b48130e3de985fe0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Wed, 13 Jan 2021 20:50:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=86=20typings=20=E5=9C=A8?= =?UTF-8?q?=E9=A1=B6=E5=B1=82=E5=AF=BC=E5=87=BA=20refactor:=20=E5=B0=86=20?= =?UTF-8?q?designerHelper=20=E7=AD=89=E6=94=B9=E6=88=90=20designerCabin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 11 ++++ lerna.json | 2 +- packages/designer/CHANGELOG.md | 8 +++ packages/designer/package.json | 8 +-- .../designer/src/plugin/plugin-context.ts | 8 +-- packages/editor-core/CHANGELOG.md | 8 +++ packages/editor-core/package.json | 6 +- packages/editor-preset-general/CHANGELOG.md | 8 +++ packages/editor-preset-general/package.json | 14 ++--- packages/editor-preset-vision/CHANGELOG.md | 8 +++ packages/editor-preset-vision/package.json | 14 ++--- packages/editor-skeleton/CHANGELOG.md | 11 ++++ packages/editor-skeleton/package.json | 12 ++-- packages/engine/CHANGELOG.md | 11 ++++ packages/engine/build.json | 2 +- packages/engine/package.json | 14 ++--- packages/engine/src/engine.ts | 60 +++++++++++-------- packages/engine/src/index.ts | 2 + packages/engine/src/modules/designer-types.ts | 10 ++++ packages/engine/src/modules/editor-types.ts | 3 + .../engine/src/{ => modules}/live-editing.ts | 5 +- packages/engine/src/modules/lowcode-types.ts | 6 ++ packages/engine/src/modules/skeleton-types.ts | 3 + packages/ignitor/CHANGELOG.md | 8 +++ packages/ignitor/package.json | 2 +- packages/plugin-designer/CHANGELOG.md | 11 ++++ packages/plugin-designer/package.json | 8 +-- packages/plugin-outline-pane/CHANGELOG.md | 8 +++ packages/plugin-outline-pane/package.json | 10 ++-- packages/rax-renderer/CHANGELOG.md | 12 +++- packages/rax-renderer/package.json | 4 +- packages/rax-simulator-renderer/CHANGELOG.md | 8 +++ packages/rax-simulator-renderer/package.json | 12 ++-- packages/react-renderer/CHANGELOG.md | 8 +++ packages/react-renderer/package.json | 2 +- .../react-simulator-renderer/CHANGELOG.md | 8 +++ .../react-simulator-renderer/package.json | 10 ++-- packages/types/CHANGELOG.md | 8 +++ packages/types/package.json | 2 +- packages/types/src/plugin.ts | 4 +- packages/utils/CHANGELOG.md | 8 +++ packages/utils/package.json | 4 +- packages/vision-polyfill/CHANGELOG.md | 11 ++++ packages/vision-polyfill/build.json | 1 + packages/vision-polyfill/package.json | 10 ++-- .../vision-polyfill/src/bundle/prototype.ts | 6 +- .../src/bundle/upgrade-metadata.ts | 6 +- .../vision-polyfill/src/components/index.tsx | 4 +- packages/vision-polyfill/src/drag-engine.ts | 4 +- packages/vision-polyfill/src/env.ts | 4 +- .../src/fields/settingField.tsx | 4 +- .../vision-polyfill/src/i18n-util/index.js | 4 +- packages/vision-polyfill/src/index.ts | 15 ++--- .../src/props-reducers/upgrade-reducer.ts | 4 +- packages/vision-polyfill/src/reducers.ts | 4 +- scripts/watchdog.js | 2 +- 56 files changed, 315 insertions(+), 135 deletions(-) create mode 100644 packages/engine/src/modules/designer-types.ts create mode 100644 packages/engine/src/modules/editor-types.ts rename packages/engine/src/{ => modules}/live-editing.ts (89%) create mode 100644 packages/engine/src/modules/lowcode-types.ts create mode 100644 packages/engine/src/modules/skeleton-types.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 22471c82b..fa8eeb85a 100644 --- a/CHANGELOG.md +++ b/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + +### Features + +* 将 typings 在顶层导出 ([9d9b6f4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/9d9b6f4)) + + + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/lerna.json b/lerna.json index 692dfe7e1..b867938de 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.11.0", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "npmClient": "tyarn", "registry": "http://registry.npm.alibaba-inc.com", "useWorkspaces": true, diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index 965b64e6c..5e95608fe 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-designer + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/designer/package.json b/packages/designer/package.json index ff99c33ac..49f8a3848 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-designer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", @@ -14,9 +14,9 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "classnames": "^2.2.6", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/packages/designer/src/plugin/plugin-context.ts b/packages/designer/src/plugin/plugin-context.ts index 72901ab42..b2f02d307 100644 --- a/packages/designer/src/plugin/plugin-context.ts +++ b/packages/designer/src/plugin/plugin-context.ts @@ -1,6 +1,6 @@ import { Editor, Hotkey, hotkey } from '@ali/lowcode-editor-core'; import { Skeleton } from '@ali/lowcode-editor-skeleton'; -import { ILowCodePluginConfig, ILowCodePluginManager, ILowCodePluginContext, IDesignerHelper } from '@ali/lowcode-types'; +import { ILowCodePluginConfig, ILowCodePluginManager, ILowCodePluginContext, IDesignerCabin, ILowCodePlugin } from '@ali/lowcode-types'; import { getLogger, Logger } from '../utils'; import { registerMetadataTransducer, @@ -16,7 +16,7 @@ export default class PluginContext implements ILowCodePluginContext { hotkey: Hotkey; logger: Logger; plugins: ILowCodePluginManager; - designerHelper: IDesignerHelper; + designerCabin: IDesignerCabin; constructor(editor: Editor, plugins: ILowCodePluginManager) { this.editor = editor; @@ -24,10 +24,10 @@ export default class PluginContext implements ILowCodePluginContext { this.skeleton = editor.get('skeleton')!; this.hotkey = hotkey; this.plugins = plugins; - this.designerHelper = this.createDesignerHelper(); + this.designerCabin = this.createDesignerCabin(); } - private createDesignerHelper(): IDesignerHelper { + private createDesignerCabin(): IDesignerCabin { return { registerMetadataTransducer, addBuiltinComponentAction, diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md index eb3725caf..dc18f2864 100644 --- a/packages/editor-core/CHANGELOG.md +++ b/packages/editor-core/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-core + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json index caadb20e0..30300870d 100644 --- a/packages/editor-core/package.json +++ b/packages/editor-core/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-core", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "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": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@alifd/next": "^1.19.16", "@recore/obx": "^1.0.9", "@recore/obx-react": "^1.0.8", diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index 25f063ebe..ed0a9399c 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json index b8dd89502..e56496393 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": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Ali General Editor Preset", "main": "lib/index.js", "files": [ @@ -14,12 +14,12 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-editor-skeleton": "^1.0.30-beta.14", - "@ali/lowcode-plugin-designer": "^1.0.30-beta.14", - "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-editor-skeleton": "^1.0.30-beta.15", + "@ali/lowcode-plugin-designer": "^1.0.30-beta.15", + "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@alifd/next": "^1.19.12", "@alife/theme-lowcode-dark": "^0.1.0", "@alife/theme-lowcode-light": "^0.1.0", diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index 59c5a5ba7..6ce45e14a 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json index 39230a905..0afa67099 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": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Preset Vision for AliLowCode engine", "main": "lib/index.js", "private": true, @@ -18,13 +18,13 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", "@ali/lowcode-editor-setters": "^1.0.22", - "@ali/lowcode-editor-skeleton": "^1.0.30-beta.14", - "@ali/lowcode-plugin-designer": "^1.0.30-beta.14", - "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-editor-skeleton": "^1.0.30-beta.15", + "@ali/lowcode-plugin-designer": "^1.0.30-beta.15", + "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index 24f90d1b2..4b7217883 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + +### Features + +* 将 typings 在顶层导出 ([9d9b6f4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/9d9b6f4)) + + + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 94d4a6eee..0243c46ca 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,10 +19,10 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/ve-icons": "latest", "@ali/ve-less-variables": "^2.0.0", "@alifd/next": "^1.20.12", @@ -35,7 +35,7 @@ "@alib/build-scripts": "^0.1.3", "@types/react": "^16.9.13", "@types/react-dom": "^16.9.4", - "build-plugin-component": "^0.2.7-1", + "build-plugin-component": "^0.2.7", "build-plugin-fusion": "^0.1.0", "build-plugin-moment-locales": "^0.1.0" }, diff --git a/packages/engine/CHANGELOG.md b/packages/engine/CHANGELOG.md index 591280735..2c2af11c0 100644 --- a/packages/engine/CHANGELOG.md +++ b/packages/engine/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + +### Features + +* 将 typings 在顶层导出 ([9d9b6f4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/9d9b6f4)) + + + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/engine/build.json b/packages/engine/build.json index e7b2baf07..40b2aab08 100644 --- a/packages/engine/build.json +++ b/packages/engine/build.json @@ -5,7 +5,7 @@ "build-plugin-component", { "filename": "engine", - "library": "AliLowCodeEngine", + "library": "___AliLowCodeEngine___", "libraryTarget": "umd", "externals": { "react": "var window.React", diff --git a/packages/engine/package.json b/packages/engine/package.json index 8d6a79787..61ec26dd9 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-engine", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Universal API for AliLowCode engine", "main": "lib/engine.js", "module": "es/engine.js", @@ -18,12 +18,12 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-editor-skeleton": "^1.0.30-beta.14", - "@ali/lowcode-plugin-designer": "^1.0.30-beta.14", - "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-editor-skeleton": "^1.0.30-beta.15", + "@ali/lowcode-plugin-designer": "^1.0.30-beta.15", + "@ali/lowcode-plugin-outline-pane": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/engine/src/engine.ts b/packages/engine/src/engine.ts index 4efc839f6..a1be5ab74 100644 --- a/packages/engine/src/engine.ts +++ b/packages/engine/src/engine.ts @@ -1,32 +1,41 @@ import { createElement } from 'react'; import { render } from 'react-dom'; import { globalContext, Editor } from '@ali/lowcode-editor-core'; -import builtinSetters from '@ali/lowcode-editor-setters'; -import { Designer, LiveEditing, TransformStage, Node, getConvertedExtraKey, LowCodePluginManager } from '@ali/lowcode-designer'; -import Outline, { OutlineBackupPane, getTreeMaster } from '@ali/lowcode-plugin-outline-pane'; -import * as editorHelper from '@ali/lowcode-editor-core'; -import * as designerHelper from '@ali/lowcode-designer'; -import * as skeletonHelper from '@ali/lowcode-editor-skeleton'; -import DesignerPlugin from '@ali/lowcode-plugin-designer'; +import * as editorCabin from '@ali/lowcode-editor-core'; +import { + Designer, + LowCodePluginManager, +} from '@ali/lowcode-designer'; +import * as designerCabin from '@ali/lowcode-designer'; import { Skeleton, SettingsPrimaryPane, registerDefaults } from '@ali/lowcode-editor-skeleton'; -import { liveEditingRule, liveEditingSaveHander } from './live-editing'; +import * as skeletonCabin from '@ali/lowcode-editor-skeleton'; +import Outline, { OutlineBackupPane, getTreeMaster } from '@ali/lowcode-plugin-outline-pane'; +import DesignerPlugin from '@ali/lowcode-plugin-designer'; +import builtinSetters from '@ali/lowcode-editor-setters'; +import './modules/live-editing'; -editorHelper.registerSetter(builtinSetters); +export * from './modules/editor-types'; +export * from './modules/skeleton-types'; +export * from './modules/designer-types'; +export * from './modules/lowcode-types'; + +const { hotkey, monitor, getSetter, registerSetter } = editorCabin; +registerSetter(builtinSetters as any); +registerDefaults(); const editor = new Editor(); globalContext.register(editor, Editor); const skeleton = new Skeleton(editor); editor.set(Skeleton, skeleton); -editor.set('skeleton', skeleton); -registerDefaults(); +editor.set('skeleton' as any, skeleton); const designer = new Designer({ editor }); editor.set(Designer, designer); -editor.set('designer', designer); +editor.set('designer' as any, designer); -const plugins = (new LowCodePluginManager(editor)).toProxy(); -editor.set('plugins', plugins); +const plugins = new LowCodePluginManager(editor).toProxy(); +editor.set('plugins' as any, plugins); skeleton.add({ area: 'mainArea', @@ -65,8 +74,7 @@ skeleton.add({ }); const { project, currentSelection: selection } = designer; -const { hotkey, monitor, getSetter, registerSetter } = editorHelper; -const { Workbench } = skeletonHelper; +const { Workbench } = skeletonCabin; const setters = { getSetter, registerSetter, @@ -74,11 +82,11 @@ const setters = { export { editor, - editorHelper, + editorCabin, skeleton, - skeletonHelper, + skeletonCabin, designer, - designerHelper, + designerCabin, plugins, setters, project, @@ -95,18 +103,21 @@ export { monitor, }; +const getSelection = () => designer.currentDocument?.selection; // TODO: build-plugin-component 的 umd 开发态没有导出 AliLowCodeEngine，这里先简单绕过 (window as any).AliLowCodeEngine = { editor, - editorHelper, + editorCabin, skeleton, - skeletonHelper, + skeletonCabin, designer, - designerHelper, + designerCabin, plugins, setters, project, - selection, + get selection() { + return getSelection(); + }, /** * 注册一些全局的切面 */ @@ -138,6 +149,3 @@ export async function init(container?: Element) { engineContainer, ); } - -LiveEditing.addLiveEditingSpecificRule(liveEditingRule); -LiveEditing.addLiveEditingSaveHandler(liveEditingSaveHander); diff --git a/packages/engine/src/index.ts b/packages/engine/src/index.ts index 5ba4e4ecc..970f55233 100644 --- a/packages/engine/src/index.ts +++ b/packages/engine/src/index.ts @@ -2,6 +2,8 @@ export * from './engine'; const version = '{{VERSION_PLACEHOLDER}}'; +(window as any).AliLowCodeEngine.version = version; + console.log( `%c AliLowCodeEngine %c v${version} `, 'padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;', diff --git a/packages/engine/src/modules/designer-types.ts b/packages/engine/src/modules/designer-types.ts new file mode 100644 index 000000000..1c10ed057 --- /dev/null +++ b/packages/engine/src/modules/designer-types.ts @@ -0,0 +1,10 @@ +import * as designerCabin from '@ali/lowcode-designer'; + +// 这样做的目的是为了去除 Node / DocumentModel 等的值属性，仅保留类型属性 +export type Node = designerCabin.Node; +export type ParentalNode = designerCabin.ParentalNode; +export type DocumentModel = designerCabin.DocumentModel; +export type RootNode = designerCabin.RootNode; +export type EditingTarget = designerCabin.EditingTarget; +export type SaveHandler = designerCabin.SaveHandler; +export type ComponentMeta = designerCabin.ComponentMeta; diff --git a/packages/engine/src/modules/editor-types.ts b/packages/engine/src/modules/editor-types.ts new file mode 100644 index 000000000..10623b6f4 --- /dev/null +++ b/packages/engine/src/modules/editor-types.ts @@ -0,0 +1,3 @@ +import * as editorCabin from '@ali/lowcode-editor-core'; + +export type RegisteredSetter = editorCabin.RegisteredSetter; \ No newline at end of file diff --git a/packages/engine/src/live-editing.ts b/packages/engine/src/modules/live-editing.ts similarity index 89% rename from packages/engine/src/live-editing.ts rename to packages/engine/src/modules/live-editing.ts index 0d6131e39..2e60c3e67 100644 --- a/packages/engine/src/live-editing.ts +++ b/packages/engine/src/modules/live-editing.ts @@ -1,4 +1,4 @@ -import { EditingTarget, Node as DocNode, SaveHandler } from '@ali/lowcode-designer'; +import { EditingTarget, Node as DocNode, SaveHandler, LiveEditing } from '@ali/lowcode-designer'; import { isJSExpression } from '@ali/lowcode-types'; function getText(node: DocNode, prop: string) { @@ -78,3 +78,6 @@ export const liveEditingSaveHander: SaveHandler = { // 非文本编辑 // 国际化数据，改变当前 // JSExpression, 改变 mock 或 弹出绑定变量 + +LiveEditing.addLiveEditingSpecificRule(liveEditingRule); +LiveEditing.addLiveEditingSaveHandler(liveEditingSaveHander); diff --git a/packages/engine/src/modules/lowcode-types.ts b/packages/engine/src/modules/lowcode-types.ts new file mode 100644 index 000000000..688a97c12 --- /dev/null +++ b/packages/engine/src/modules/lowcode-types.ts @@ -0,0 +1,6 @@ +export { + ILowCodePluginConfig, + ILowCodePluginManager, + ILowCodePluginContext, + IDesignerCabin, +} from '@ali/lowcode-types'; diff --git a/packages/engine/src/modules/skeleton-types.ts b/packages/engine/src/modules/skeleton-types.ts new file mode 100644 index 000000000..ab0e1ecf9 --- /dev/null +++ b/packages/engine/src/modules/skeleton-types.ts @@ -0,0 +1,3 @@ +import * as skeletonCabin from '@ali/lowcode-editor-skeleton'; + +export type IWidgetBaseConfig = skeletonCabin.IWidgetBaseConfig; \ No newline at end of file diff --git a/packages/ignitor/CHANGELOG.md b/packages/ignitor/CHANGELOG.md index 5cdad6193..6fcd79dca 100644 --- a/packages/ignitor/CHANGELOG.md +++ b/packages/ignitor/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-ignitor + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/ignitor/package.json b/packages/ignitor/package.json index 31e8e710f..aed10cb59 100644 --- a/packages/ignitor/package.json +++ b/packages/ignitor/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-ignitor", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "点火器，bootstrap lce project", "main": "lib/index.js", "private": true, diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index 4bb02ad4f..af0f1864f 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + +### Features + +* 将 typings 在顶层导出 ([9d9b6f4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/9d9b6f4)) + + + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index e83ce6e39..dfbb2632d 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-designer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -20,8 +20,8 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", "react": "^16.8.1", "react-dom": "^16.8.1" }, @@ -29,7 +29,7 @@ "@alib/build-scripts": "^0.1.3", "@types/react": "^16.9.13", "@types/react-dom": "^16.9.4", - "build-plugin-component": "^0.2.7-1" + "build-plugin-component": "^0.2.7" }, "publishConfig": { "registry": "https://registry.npm.alibaba-inc.com" diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md index 685e81093..b9113bb8e 100644 --- a/packages/plugin-outline-pane/CHANGELOG.md +++ b/packages/plugin-outline-pane/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index f2c45f076..367a6a098 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": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -14,10 +14,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@alifd/next": "^1.19.16", "classnames": "^2.2.6", "react": "^16", diff --git a/packages/rax-renderer/CHANGELOG.md b/packages/rax-renderer/CHANGELOG.md index 6a24296f5..7d0643a8d 100644 --- a/packages/rax-renderer/CHANGELOG.md +++ b/packages/rax-renderer/CHANGELOG.md @@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-renderer + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) @@ -11,7 +19,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline **Note:** Version bump only for package @ali/lowcode-rax-renderer - + ## [1.0.30-beta.13](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.12...v1.0.30-beta.13) (2021-01-13) diff --git a/packages/rax-renderer/package.json b/packages/rax-renderer/package.json index 521c91ef3..4d57bacce 100644 --- a/packages/rax-renderer/package.json +++ b/packages/rax-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-rax-renderer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Rax renderer for Ali lowCode engine", "main": "lib/index.js", "module": "lib/index.js", @@ -36,7 +36,7 @@ "@ali/bzb-request": "2.6.1", "@ali/lib-mtop": "^2.5.1", "@ali/lowcode-datasource-engine": "^1.0.22", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/ui-table": "^1.0.1-beta.6", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/rax-simulator-renderer/CHANGELOG.md b/packages/rax-simulator-renderer/CHANGELOG.md index 5c0bd32b7..ac7442ab4 100644 --- a/packages/rax-simulator-renderer/CHANGELOG.md +++ b/packages/rax-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-rax-simulator-renderer + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 1d2417ef7..56362a461 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-rax-simulator-renderer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "rax 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": "^1.0.30-beta.14", - "@ali/lowcode-rax-renderer": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-rax-renderer": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/recore-rax": "^1.2.4", "@ali/vu-css-style": "^1.0.2", "@recore/obx": "^1.0.8", @@ -57,5 +57,5 @@ "publishConfig": { "registry": "https://registry.npm.alibaba-inc.com" }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.30-beta.12/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.30-beta.14/build/index.html" } diff --git a/packages/react-renderer/CHANGELOG.md b/packages/react-renderer/CHANGELOG.md index dc208cb2e..4d3fcdd2d 100644 --- a/packages/react-renderer/CHANGELOG.md +++ b/packages/react-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-react-renderer + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json index 4b9344a2e..e9305b2b0 100644 --- a/packages/react-renderer/package.json +++ b/packages/react-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-react-renderer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "react renderer for ali lowcode engine", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md index c8457531f..56151ffbe 100644 --- a/packages/react-simulator-renderer/CHANGELOG.md +++ b/packages/react-simulator-renderer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 9fa85cdfd..467f0c6f6 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-react-simulator-renderer", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -16,10 +16,10 @@ "build": "build-scripts build --skip-demo" }, "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-react-renderer": "^1.0.30-beta.14", - "@ali/lowcode-types": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-react-renderer": "^1.0.30-beta.15", + "@ali/lowcode-types": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@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 6e75b8c4b..3f716dd0c 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-types + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/types/package.json b/packages/types/package.json index de4c95c4c..d0b5e4c77 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-types", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Types for Ali lowCode engine", "files": [ "es", diff --git a/packages/types/src/plugin.ts b/packages/types/src/plugin.ts index 3a2e179f3..d7dfc1f8a 100644 --- a/packages/types/src/plugin.ts +++ b/packages/types/src/plugin.ts @@ -31,7 +31,7 @@ export interface ILowCodePlugin { setDisabled(flag: boolean): void; } -export interface IDesignerHelper { +export interface IDesignerCabin { registerMetadataTransducer: (transducer: MetadataTransducer, level: number, id?: string) => void; addBuiltinComponentAction: (action: ComponentAction) => void; removeBuiltinComponentAction: (actionName: string) => void; @@ -44,7 +44,7 @@ export interface ILowCodePluginContext { hotkey: Hotkey; logger: Logger; plugins: ILowCodePluginManager; - designerHelper: IDesignerHelper; + designerCabin: IDesignerCabin; /** 其他暂不增加，按需增加 */ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 3e2bdb93e..deb928109 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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + + + +**Note:** Version bump only for package @ali/lowcode-utils + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/utils/package.json b/packages/utils/package.json index a11550f7a..de19aa89f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-utils", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Utils for Ali lowCode engine", "files": [ "es", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-types": "^1.0.30-beta.14", + "@ali/lowcode-types": "^1.0.30-beta.15", "@alifd/next": "^1.19.16", "lodash.get": "^4.4.2", "react": "^16" diff --git a/packages/vision-polyfill/CHANGELOG.md b/packages/vision-polyfill/CHANGELOG.md index 902437cdc..b9630ab6a 100644 --- a/packages/vision-polyfill/CHANGELOG.md +++ b/packages/vision-polyfill/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. + +## [1.0.30-beta.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.14...v1.0.30-beta.15) (2021-01-13) + + +### Features + +* 将 typings 在顶层导出 ([9d9b6f4](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/9d9b6f4)) + + + + ## [1.0.30-beta.14](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/v1.0.30-beta.13...v1.0.30-beta.14) (2021-01-13) diff --git a/packages/vision-polyfill/build.json b/packages/vision-polyfill/build.json index a1ab0f015..840dbe2c5 100644 --- a/packages/vision-polyfill/build.json +++ b/packages/vision-polyfill/build.json @@ -15,6 +15,7 @@ "@ali/lowcode-engine": "var window.AliLowCodeEngine", "@ali/visualengine-utils": "var window.VisualEngineUtils", "rax": "var window.Rax", + "moment": "var window.moment", "monaco-editor/esm/vs/editor/editor.api": "var window.monaco", "monaco-editor/esm/vs/editor/editor.main.js": "var window.monaco" } diff --git a/packages/vision-polyfill/package.json b/packages/vision-polyfill/package.json index cfd15d567..39996007b 100644 --- a/packages/vision-polyfill/package.json +++ b/packages/vision-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-vision-polyfill", - "version": "1.0.30-beta.14", + "version": "1.0.30-beta.15", "description": "Vision Polyfill for Ali lowCode engine", "main": "lib/index.js", "files": [ @@ -17,10 +17,10 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^1.0.30-beta.14", - "@ali/lowcode-editor-core": "^1.0.30-beta.14", - "@ali/lowcode-editor-skeleton": "^1.0.30-beta.14", - "@ali/lowcode-utils": "^1.0.30-beta.14", + "@ali/lowcode-designer": "^1.0.30-beta.15", + "@ali/lowcode-editor-core": "^1.0.30-beta.15", + "@ali/lowcode-editor-skeleton": "^1.0.30-beta.15", + "@ali/lowcode-utils": "^1.0.30-beta.15", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/vision-polyfill/src/bundle/prototype.ts b/packages/vision-polyfill/src/bundle/prototype.ts index 65e40dc17..6c6937040 100644 --- a/packages/vision-polyfill/src/bundle/prototype.ts +++ b/packages/vision-polyfill/src/bundle/prototype.ts @@ -12,15 +12,15 @@ import { upgradeConfigure, } from './upgrade-metadata'; import { accessLibrary } from '@ali/lowcode-utils'; -import { designer, designerHelper, editorHelper } from '@ali/lowcode-engine'; +import { designer, designerCabin, editorCabin } from '@ali/lowcode-engine'; const { addBuiltinComponentAction, isComponentMeta, registerMetadataTransducer, TransformStage, -} = designerHelper; -const { intl } = editorHelper; +} = designerCabin; +const { intl } = editorCabin; const GlobalPropsConfigure: Array<{ position: string; diff --git a/packages/vision-polyfill/src/bundle/upgrade-metadata.ts b/packages/vision-polyfill/src/bundle/upgrade-metadata.ts index ffc2158a1..027d655be 100644 --- a/packages/vision-polyfill/src/bundle/upgrade-metadata.ts +++ b/packages/vision-polyfill/src/bundle/upgrade-metadata.ts @@ -1,10 +1,10 @@ import { ComponentType, ReactElement, isValidElement, ComponentClass } from 'react'; import { isPlainObject, uniqueId } from '@ali/lowcode-utils'; import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem, isJSBlock } from '@ali/lowcode-types'; -import { editorHelper, designerHelper } from '@ali/lowcode-engine'; +import { editorCabin, designerCabin } from '@ali/lowcode-engine'; -const { SettingField } = designerHelper; -const { untracked } = editorHelper; +const { SettingField } = designerCabin; +const { untracked } = editorCabin; type Field = SettingTarget; diff --git a/packages/vision-polyfill/src/components/index.tsx b/packages/vision-polyfill/src/components/index.tsx index c005f2f9a..f3c0500a2 100644 --- a/packages/vision-polyfill/src/components/index.tsx +++ b/packages/vision-polyfill/src/components/index.tsx @@ -1,11 +1,11 @@ import { Overlay } from '@alifd/next'; import React from 'react'; import { Node, ParentalNode } from '@ali/lowcode-designer'; -import { editorHelper } from '@ali/lowcode-engine'; +import { editorCabin } from '@ali/lowcode-engine'; import './index.less'; const { Popup } = Overlay; -const { Title } = editorHelper; +const { Title } = editorCabin; export interface IProps { node: Node; diff --git a/packages/vision-polyfill/src/drag-engine.ts b/packages/vision-polyfill/src/drag-engine.ts index e1cca3ba4..82915e059 100644 --- a/packages/vision-polyfill/src/drag-engine.ts +++ b/packages/vision-polyfill/src/drag-engine.ts @@ -1,7 +1,7 @@ -import { designer, designerHelper } from '@ali/lowcode-engine'; +import { designer, designerCabin } from '@ali/lowcode-engine'; import { isPrototype } from './bundle/prototype'; -const { DragObjectType, isNode, isDragNodeDataObject } = designerHelper; +const { DragObjectType, isNode, isDragNodeDataObject } = designerCabin; const { dragon } = designer; const DragEngine = { from(shell: Element, boost: (e: MouseEvent) => any): any { diff --git a/packages/vision-polyfill/src/env.ts b/packages/vision-polyfill/src/env.ts index 7853167b3..3c4b1bcd0 100644 --- a/packages/vision-polyfill/src/env.ts +++ b/packages/vision-polyfill/src/env.ts @@ -1,8 +1,8 @@ import { EventEmitter } from 'events'; import { ALI_SCHEMA_VERSION } from './base/const'; -import { editorHelper } from '@ali/lowcode-engine'; +import { editorCabin } from '@ali/lowcode-engine'; -const { obx } = editorHelper; +const { obx } = editorCabin; interface ILiteralObject { [key: string]: any; diff --git a/packages/vision-polyfill/src/fields/settingField.tsx b/packages/vision-polyfill/src/fields/settingField.tsx index ad8f8b34a..ffe3ab416 100644 --- a/packages/vision-polyfill/src/fields/settingField.tsx +++ b/packages/vision-polyfill/src/fields/settingField.tsx @@ -11,10 +11,10 @@ import { } from './fields'; import { ComponentClass, Component, isValidElement, createElement } from 'react'; -import { editorHelper, setters } from '@ali/lowcode-engine'; +import { editorCabin, setters } from '@ali/lowcode-engine'; const { getSetter } = setters; -const { createSetterContent } = editorHelper; +const { createSetterContent } = editorCabin; function isReactClass(obj: any): obj is ComponentClass { return ( diff --git a/packages/vision-polyfill/src/i18n-util/index.js b/packages/vision-polyfill/src/i18n-util/index.js index 86f0bb3b7..f6bc3d606 100644 --- a/packages/vision-polyfill/src/i18n-util/index.js +++ b/packages/vision-polyfill/src/i18n-util/index.js @@ -1,8 +1,8 @@ import { EventEmitter } from 'events'; -import { editorHelper } from '@ali/lowcode-engine'; +import { editorCabin } from '@ali/lowcode-engine'; -const { obx } = editorHelper; +const { obx } = editorCabin; let keybase = Date.now(); function keygen(maps) { diff --git a/packages/vision-polyfill/src/index.ts b/packages/vision-polyfill/src/index.ts index 95c2a49ff..e8a902c4a 100644 --- a/packages/vision-polyfill/src/index.ts +++ b/packages/vision-polyfill/src/index.ts @@ -7,7 +7,7 @@ import logger from '@ali/vu-logger'; import I18nUtil from './i18n-util'; import { VE_EVENTS as EVENTS, VE_HOOKS as HOOKS, VERSION as Version } from './base/const'; import Bus from './bus'; -import { skeleton, designer, editor, plugins, init, hotkey as Hotkey, monitor, designerHelper } from '@ali/lowcode-engine'; +import { skeleton, designer, editor, plugins, init, hotkey as Hotkey, monitor, designerCabin } from '@ali/lowcode-engine'; import Panes from './panes'; import Exchange from './exchange'; import context from './context'; @@ -26,7 +26,6 @@ import Viewport from './viewport'; import Project from './project'; import Symbols from './symbols'; import { invariant } from './utils'; -import '@ali/lowcode-editor-setters'; import './reducers'; import './vision.less'; @@ -52,17 +51,11 @@ const modules = { Prop, }; -// const designerHelper = { -// registerMetadataTransducer, -// addBuiltinComponentAction, -// removeBuiltinComponentAction, -// // modifyBuiltinComponentAction, -// }; -const { registerMetadataTransducer } = designerHelper; +const { registerMetadataTransducer } = designerCabin; const VisualEngine = { designer, - designerHelper, + designerCabin, editor, skeleton, /** @@ -115,7 +108,7 @@ export default VisualEngine; export { designer, - designerHelper, + designerCabin, editor, skeleton, /** diff --git a/packages/vision-polyfill/src/props-reducers/upgrade-reducer.ts b/packages/vision-polyfill/src/props-reducers/upgrade-reducer.ts index acb7a4883..d20248a4b 100644 --- a/packages/vision-polyfill/src/props-reducers/upgrade-reducer.ts +++ b/packages/vision-polyfill/src/props-reducers/upgrade-reducer.ts @@ -3,9 +3,9 @@ import { } from '@ali/lowcode-utils'; import { isJSBlock } from '@ali/lowcode-types'; import { isVariable } from '../utils'; -import { designerHelper } from '@ali/lowcode-engine'; +import { designerCabin } from '@ali/lowcode-engine'; -const { getConvertedExtraKey } = designerHelper; +const { getConvertedExtraKey } = designerCabin; export function upgradePropsReducer(props: any) { if (!props || !isPlainObject(props)) { diff --git a/packages/vision-polyfill/src/reducers.ts b/packages/vision-polyfill/src/reducers.ts index b3976c289..c7135181c 100644 --- a/packages/vision-polyfill/src/reducers.ts +++ b/packages/vision-polyfill/src/reducers.ts @@ -1,6 +1,6 @@ import { isJSBlock, isJSExpression, isJSSlot } from '@ali/lowcode-types'; import { isPlainObject, hasOwnProperty, cloneDeep, isI18NObject, isUseI18NSetter, convertToI18NObject, isString } from '@ali/lowcode-utils'; -import { editor, designer, designerHelper } from '@ali/lowcode-engine'; +import { editor, designer, designerCabin } from '@ali/lowcode-engine'; import bus from './bus'; import { VE_EVENTS } from './base/const'; @@ -18,7 +18,7 @@ import { nodeTopFixedReducer, } from './props-reducers'; -const { LiveEditing, TransformStage } = designerHelper; +const { LiveEditing, TransformStage } = designerCabin; // LiveEditing.addLiveEditingSpecificRule(liveEditingRule); // LiveEditing.addLiveEditingSaveHandler(liveEditingSaveHander); diff --git a/scripts/watchdog.js b/scripts/watchdog.js index 1fb040958..c52d42945 100755 --- a/scripts/watchdog.js +++ b/scripts/watchdog.js @@ -15,7 +15,7 @@ dirs files.forEach(file => { const fileDir = join(pkgDir, file); if (!fs.existsSync(fileDir)) { - throw new Error(`${fileDir} not exists, plz run build`); + throw new Error(`${fileDir} does not exist, plz run build`); } }); });