Merge branch 'polyfill/vision' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into polyfill/vision

This commit is contained in:
kangwei 2020-04-21 21:56:03 +08:00
commit 4e00dc0434
3 changed files with 22 additions and 3 deletions

View File

@ -25,12 +25,12 @@
"@ali/ve-icons": "^4.1.9",
"@ali/ve-less-variables": "2.0.3",
"@ali/ve-popups": "^4.2.5",
"@ali/ve-trunk-pane": "^5.1.0-beta.14",
"@ali/ve-utils": "^1.1.0",
"@ali/vu-css-style": "^1.1.3",
"@ali/vu-logger": "^1.0.7",
"@ali/vu-style-sheet": "^2.4.0",
"@alifd/next": "^1.19.12",
"@ali/ve-stage-box": "^4.0.0",
"@alife/theme-lowcode-dark": "^0.1.0",
"@alife/theme-lowcode-light": "^0.1.0",
"react": "^16.8.1",

View File

@ -1,10 +1,12 @@
// @ts-ignore
import Engine from '@ali/visualengine';
import Engine, { Panes } from '@ali/visualengine';
import getTrunkPane from '@ali/ve-trunk-pane';
import loadUrls from './loader';
import { upgradeAssetsBundle } from './upgrade-assets';
const { editor } = Engine;
initTrunkPane();
Engine.init();
load();
@ -52,3 +54,19 @@ async function loadSchema() {
const schema = await editor.utils.get('./schema.json');
editor.set('schema', schema);
}
async function initTrunkPane() {
const assets = await editor.onceGot('legao-assets');
const config = {
disableLowCodeComponent: true,
disableComponentStore: true,
app: {
getAssetsData() {
return assets;
// return data;
},
},
};
const TrunkPane = getTrunkPane(config);
Panes.add(TrunkPane);
}

View File

@ -18,6 +18,7 @@ import PanelDock from './panel-dock';
import Dock from './dock';
import { Stage, StageConfig } from './stage';
import { isValidElement } from 'react';
import { isPlainObject } from 'globals/src/utils';
export enum SkeletonEvents {
PANEL_DOCK_ACTIVE = 'skeleton.panel-dock.active',
@ -230,7 +231,7 @@ export class Skeleton {
add(config: IWidgetBaseConfig & { area: string }) {
const { content, ...restConfig } = config;
if (content) {
if (typeof content === 'object' && !isValidElement(content)) {
if (isPlainObject(content) && !isValidElement(content)) {
Object.keys(content).forEach((key) => {
if (/props$/i.test(key) && restConfig[key]) {
restConfig[key] = {