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

This commit is contained in:
kangwei 2020-05-07 22:12:43 +08:00
commit c773b573b8
11 changed files with 80 additions and 26 deletions

View File

@ -352,6 +352,8 @@ const builtinComponentActions: ComponentAction[] = [
title: intlNode('copy'), title: intlNode('copy'),
action(node: Node) { action(node: Node) {
// node.remove(); // node.remove();
const { document: doc, parent, schema, index } = node;
parent && doc.insertNode(parent, schema, index);
}, },
}, },
important: true, important: true,

View File

@ -58,14 +58,15 @@ hotkey.bind(['command+c', 'ctrl+c', 'command+x', 'ctrl+x'], (e, action) => {
const data = { type: 'nodeSchema', componentsMap, componentsTree }; const data = { type: 'nodeSchema', componentsMap, componentsTree };
clipboard.setData(data); clipboard.setData(data);
/*
const cutMode = action.indexOf('x') > 0; const cutMode = action.indexOf('x') > 0;
if (cutMode) { if (cutMode) {
const parentNode = selected.getParent(); selected.forEach((node) => {
parentNode.select(); const parentNode = node.getParent();
selected.remove(); parentNode?.select();
node.remove();
});
} }
*/
}); });
// command + v paste // command + v paste

View File

@ -41,6 +41,7 @@ export class DocumentModel {
private seqId = 0; private seqId = 0;
private _simulator?: ISimulatorHost; private _simulator?: ISimulatorHost;
/** /**
* *
*/ */
@ -110,6 +111,14 @@ export class DocumentModel {
} }
readonly designer = this.project.designer; readonly designer = this.project.designer;
// getAddonData(name: string) {
// const addon = this.addons.find((item) => item.name === name);
// if (addon) {
// return addon.exportData();
// }
// return this.addonsData[name];
// }
/** /**
* id * id
@ -230,6 +239,14 @@ export class DocumentModel {
this.selection.remove(node.id); this.selection.remove(node.id);
node.remove(); node.remove();
} }
getAddonData(name: string) {
const addon = this.getNode(name)
if (addon) {
// 无法确定是否有这个api
// return addon.exportData();
}
return addon
}
@obx.ref private _dropLocation: DropLocation | null = null; @obx.ref private _dropLocation: DropLocation | null = null;
/** /**

View File

@ -174,6 +174,10 @@ export class History {
this.emitter.removeAllListeners(); this.emitter.removeAllListeners();
this.records = []; this.records = [];
} }
isModified() {
return this.point !== this.session.cursor;
}
} }
class Session { class Session {

View File

@ -45,6 +45,8 @@ export default class Dock implements IWidget {
} else { } else {
this._body = createElement(DockView, props); this._body = createElement(DockView, props);
} }
this.inited = true;
return this._body; return this._body;
} }

View File

@ -1,13 +1,13 @@
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import { ALI_SCHEMA_VERSION } from './base/const'; import { ALI_SCHEMA_VERSION } from './base/const';
import { obx } from '@ali/lowcode-editor-core';
interface ILiteralObject { interface ILiteralObject {
[key: string]: any; [key: string]: any;
} }
export class Env { export class Env {
@obx.val envs: ILiteralObject = {};
public envs: ILiteralObject;
private emitter: EventEmitter; private emitter: EventEmitter;
private featureMap: ILiteralObject; private featureMap: ILiteralObject;
@ -15,23 +15,22 @@ export class Env {
constructor() { constructor() {
this.emitter = new EventEmitter(); this.emitter = new EventEmitter();
this.emitter.setMaxListeners(0); this.emitter.setMaxListeners(0);
this.envs = {};
this.featureMap = {}; this.featureMap = {};
} }
public get(name: string): any { get(name: string): any {
return this.getEnv(name); return this.getEnv(name);
} }
public getEnv(name: string): any { getEnv(name: string): any {
return this.envs[name]; return this.envs[name];
} }
public set(name: string, value: any) { set(name: string, value: any) {
return this.setEnv(name, value); return this.setEnv(name, value);
} }
public setEnv(name: string, value: any) { setEnv(name: string, value: any) {
const orig = this.envs[name]; const orig = this.envs[name];
if (JSON.stringify(orig) === JSON.stringify(value)) { if (JSON.stringify(orig) === JSON.stringify(value)) {
return; return;
@ -40,47 +39,47 @@ export class Env {
this.emitter.emit('envchange', this.envs, name, value); this.emitter.emit('envchange', this.envs, name, value);
} }
public setEnvMap(envs: ILiteralObject): void { setEnvMap(envs: ILiteralObject): void {
this.envs = Object.assign(this.envs, envs); this.envs = Object.assign(this.envs, envs);
this.emitter.emit('envchange', this.envs); this.emitter.emit('envchange', this.envs);
} }
public getLocale(): string { getLocale(): string {
return this.getEnv('locale') || 'zh_CN'; return this.getEnv('locale') || 'zh_CN';
} }
public setLocale(locale: string) { setLocale(locale: string) {
this.setEnv('locale', locale); this.setEnv('locale', locale);
} }
public setExpertMode(flag: string) { setExpertMode(flag: string) {
this.setEnv('expertMode', !!flag); this.setEnv('expertMode', !!flag);
} }
public isExpertMode() { isExpertMode() {
return !!this.getEnv('expertMode'); return !!this.getEnv('expertMode');
} }
public getSupportFeatures() { getSupportFeatures() {
return Object.assign({}, this.featureMap); return Object.assign({}, this.featureMap);
} }
public setSupportFeatures(features: ILiteralObject) { setSupportFeatures(features: ILiteralObject) {
this.featureMap = Object.assign({}, this.featureMap, features); this.featureMap = Object.assign({}, this.featureMap, features);
} }
public supports(name = 'supports') { supports(name = 'supports') {
return !!this.featureMap[name]; return !!this.featureMap[name];
} }
public onEnvChange(func: (envs: ILiteralObject, name: string, value: any) => any) { onEnvChange(func: (envs: ILiteralObject, name: string, value: any) => any) {
this.emitter.on('envchange', func); this.emitter.on('envchange', func);
return () => { return () => {
this.emitter.removeListener('envchange', func); this.emitter.removeListener('envchange', func);
}; };
} }
public getAliSchemaVersion() { getAliSchemaVersion() {
return ALI_SCHEMA_VERSION; return ALI_SCHEMA_VERSION;
} }
} }

View File

@ -1,5 +1,5 @@
const I18nUtil = require('@ali/ve-i18n-util');
import Env from './env'; import Env from './env';
const I18nUtil = require('@ali/ve-i18n-util');
interface I18nObject { interface I18nObject {
type?: string; type?: string;
@ -9,7 +9,9 @@ interface I18nObject {
} }
export function i18nReducer(obj?: any): any { export function i18nReducer(obj?: any): any {
if (!obj) { return obj; } if (!obj) {
return obj;
}
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
return obj.map((item) => i18nReducer(item)); return obj.map((item) => i18nReducer(item));
} }
@ -18,6 +20,7 @@ export function i18nReducer(obj?: any): any {
// FIXME! use editor.get // FIXME! use editor.get
let locale = Env.getLocale(); let locale = Env.getLocale();
if (obj.key) { if (obj.key) {
// FIXME: 此处需要升级I18nUtil改成响应式
return I18nUtil.get(obj.key, locale); return I18nUtil.get(obj.key, locale);
} }
if (locale !== 'zh_CN' && locale !== 'zh_TW' && !obj[locale]) { if (locale !== 'zh_CN' && locale !== 'zh_TW' && !obj[locale]) {

View File

@ -25,6 +25,7 @@ import DragEngine from './drag-engine';
import Viewport from './viewport'; import Viewport from './viewport';
import Project from './project'; import Project from './project';
import { designer, editor } from './editor'; import { designer, editor } from './editor';
import Symbols from './symbols';
import './vision.less'; import './vision.less';
@ -109,6 +110,7 @@ const VisualEngine = {
Version, Version,
Project, Project,
logger, logger,
Symbols,
}; };
(window as any).VisualEngine = VisualEngine; (window as any).VisualEngine = VisualEngine;
@ -156,6 +158,7 @@ export {
Version, Version,
Project, Project,
logger, logger,
Symbols,
}; };

View File

@ -85,10 +85,10 @@ function upgradeConfig(config: OldPaneConfig): IWidgetBaseConfig & { area: strin
}; };
if (contents && Array.isArray(contents)) { if (contents && Array.isArray(contents)) {
newConfig.content = contents.map(({ title, content, tip }) => { newConfig.content = contents.map(({ title, content, tip }, index) => {
return { return {
type: 'Panel', type: 'Panel',
name: title, name: typeof title === 'string' ? title : `${name}:${index}`,
content, content,
props: { props: {
title, title,

View File

@ -0,0 +1,17 @@
export class SymbolManager {
private symbolMap: { [symbolName: string]: symbol } = {};
public create(name: string): symbol {
if (this.symbolMap[name]) {
return this.symbolMap[name];
}
this.symbolMap[name] = Symbol(name);
return this.symbolMap[name];
}
public get(name: string) {
return this.symbolMap[name];
}
}
export default new SymbolManager();

View File

@ -101,3 +101,9 @@ html.engine-blur #engine {
.lc-left-float-pane { .lc-left-float-pane {
font-size: 14px; font-size: 14px;
} }
html.engine-preview-mode {
.lc-left-area, .lc-right-area {
display: none !important;
}
}