Merge branch fix/regist-setters into release/1.0.24

Title: fix: registSetters in preset general 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/4285715
This commit is contained in:
lihao.ylh 2020-12-11 15:35:22 +08:00
commit c450722b86
2 changed files with 28 additions and 8 deletions

View File

@ -4,15 +4,15 @@
"build-plugin-component", "build-plugin-component",
{ {
"filename": "editor-preset-general", "filename": "editor-preset-general",
"library": "LowcodeEditor", "library": "AliLowCodeEngine",
"libraryTarget": "umd", "libraryTarget": "umd",
"externals": { "externals": {
"react": "var window.React", "react": "var window.React",
"react-dom": "var window.ReactDOM", "react-dom": "var window.ReactDOM",
"prop-types": "var window.PropTypes", "prop-types": "var window.PropTypes",
"monaco-editor/esm/vs/editor/editor.api":"var window.monaco", "@alifd/next": "var window.Next",
"monaco-editor/esm/vs/editor/editor.main.js":"var window.monaco" "@ali/visualengine": "var window.VisualEngine",
"@ali/visualengine-utils": "var window.VisualEngineUtils"
} }
} }
], ],

View File

@ -1,10 +1,10 @@
import { render } from 'react-dom'; import { render } from 'react-dom';
import { createElement } from 'react'; import { createElement } from 'react';
import '@ali/lowcode-editor-setters'; import builtinSetters from '@ali/lowcode-editor-setters';
import DesignerPlugin from '@ali/lowcode-plugin-designer'; import DesignerPlugin from '@ali/lowcode-plugin-designer';
import { Designer, LiveEditing } from '@ali/lowcode-designer'; import { Designer, LiveEditing } from '@ali/lowcode-designer';
import { globalContext, Editor } from '@ali/lowcode-editor-core'; import { globalContext, Editor, registerSetter } from '@ali/lowcode-editor-core';
import { OutlineBackupPane, getTreeMaster } from '@ali/lowcode-plugin-outline-pane'; import { OutlinePane, OutlineBackupPane, getTreeMaster } from '@ali/lowcode-plugin-outline-pane';
import { Workbench, Skeleton, SettingsPrimaryPane, registerDefaults } from '@ali/lowcode-editor-skeleton'; import { Workbench, Skeleton, SettingsPrimaryPane, registerDefaults } from '@ali/lowcode-editor-skeleton';
import { version } from '../package.json'; import { version } from '../package.json';
@ -16,6 +16,8 @@ export * from '@ali/lowcode-editor-core';
export * from '@ali/lowcode-editor-skeleton'; export * from '@ali/lowcode-editor-skeleton';
export * from '@ali/lowcode-designer'; export * from '@ali/lowcode-designer';
registerSetter(builtinSetters);
export const editor = new Editor(); export const editor = new Editor();
globalContext.register(editor, Editor); globalContext.register(editor, Editor);
@ -28,6 +30,21 @@ export const designer = new Designer({ editor });
editor.set(Designer, designer); editor.set(Designer, designer);
editor.set('designer', designer); editor.set('designer', designer);
skeleton.add({
area: 'leftArea',
name: 'outline',
type: 'PanelDock',
props: {
align: 'top',
icon: 'shuxingkongjian',
description: '大纲树',
},
panelProps: {
area: 'leftFixedArea',
},
contentProps: {},
content: OutlinePane,
});
skeleton.add({ skeleton.add({
area: 'mainArea', area: 'mainArea',
name: 'designer', name: 'designer',
@ -52,12 +69,15 @@ skeleton.add({
content: OutlineBackupPane, content: OutlineBackupPane,
}); });
export default function GeneralWorkbench(props: any) { export function GeneralWorkbench(props: any) {
return createElement(Workbench, { return createElement(Workbench, {
skeleton, skeleton,
...props, ...props,
}); });
} }
export default GeneralWorkbench;
window.__ctx = { window.__ctx = {
editor, editor,
appHelper: editor, appHelper: editor,