mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2026-06-09 08:52:21 +00:00
Compare commits
32 Commits
main
...
v1.1.7-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9940c02a3b | ||
|
|
e66fbd74f6 | ||
|
|
59039d2b86 | ||
|
|
a03bf87de9 | ||
|
|
723f4cdf79 | ||
|
|
ad68052d15 | ||
|
|
a78643fe0a | ||
|
|
703c379473 | ||
|
|
1b292080aa | ||
|
|
bcff28c7a7 | ||
|
|
3a28600abf | ||
|
|
d53d5bbe8b | ||
|
|
032606edf0 | ||
|
|
83267dd68e | ||
|
|
1bdc1065d7 | ||
|
|
e0a01890e4 | ||
|
|
20e67e85c1 | ||
|
|
fdb74f0aeb | ||
|
|
e4f5ff5010 | ||
|
|
0254aa8b01 | ||
|
|
13c5c21a10 | ||
|
|
b0bef21b05 | ||
|
|
3f30f840eb | ||
|
|
1f81f0d85c | ||
|
|
55534f00ce | ||
|
|
386db0ca9a | ||
|
|
309f392b6e | ||
|
|
c64647bf2b | ||
|
|
d60eceda46 | ||
|
|
07f4d68781 | ||
|
|
e977715b86 | ||
|
|
778c8a5d58 |
@ -1,6 +1,6 @@
|
||||
{
|
||||
"lerna": "4.0.0",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"npmClient": "yarn",
|
||||
"useWorkspaces": true,
|
||||
"packages": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-designer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Designer for Ali LowCode Engine",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -15,9 +15,9 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"react": "^16",
|
||||
"react-dom": "^16.7.0",
|
||||
@ -52,5 +52,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/designer"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import React, { Component, Fragment } from 'react';
|
||||
import DragResizeEngine from './drag-resize-engine';
|
||||
import { observer, computed, globalContext } from '@alilc/lowcode-editor-core';
|
||||
import { observer, computed } from '@alilc/lowcode-editor-core';
|
||||
import classNames from 'classnames';
|
||||
import { SimulatorContext } from '../context';
|
||||
import { BuiltinSimulatorHost } from '../host';
|
||||
import { OffsetObserver, Designer } from '../../designer';
|
||||
import { OffsetObserver, Designer, INode } from '../../designer';
|
||||
import { Node } from '../../document';
|
||||
import { normalizeTriggers } from '../../utils/misc';
|
||||
|
||||
@ -135,7 +135,7 @@ export class BoxResizingInstance extends Component<{
|
||||
// this.hoveringCapture.setBoundary(this.outline);
|
||||
this.willBind();
|
||||
|
||||
const resize = (e: MouseEvent, direction: string, node: any, moveX: number, moveY: number) => {
|
||||
const resize = (e: MouseEvent, direction: string, node: INode, moveX: number, moveY: number) => {
|
||||
const { advanced } = node.componentMeta;
|
||||
if (
|
||||
advanced.callbacks &&
|
||||
@ -149,7 +149,7 @@ export class BoxResizingInstance extends Component<{
|
||||
}
|
||||
};
|
||||
|
||||
const resizeStart = (e: MouseEvent, direction: string, node: any) => {
|
||||
const resizeStart = (e: MouseEvent, direction: string, node: INode) => {
|
||||
const { advanced } = node.componentMeta;
|
||||
if (
|
||||
advanced.callbacks &&
|
||||
@ -161,7 +161,7 @@ export class BoxResizingInstance extends Component<{
|
||||
}
|
||||
};
|
||||
|
||||
const resizeEnd = (e: MouseEvent, direction: string, node: any) => {
|
||||
const resizeEnd = (e: MouseEvent, direction: string, node: INode) => {
|
||||
const { advanced } = node.componentMeta;
|
||||
if (
|
||||
advanced.callbacks &&
|
||||
@ -172,8 +172,7 @@ export class BoxResizingInstance extends Component<{
|
||||
advanced.callbacks.onResizeEnd(e, cbNode);
|
||||
}
|
||||
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = node.document?.designer.editor;
|
||||
const npm = node?.componentMeta?.npm;
|
||||
const selected =
|
||||
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
|
||||
|
||||
@ -9,7 +9,7 @@ import {
|
||||
ComponentType,
|
||||
} from 'react';
|
||||
import classNames from 'classnames';
|
||||
import { observer, computed, Tip, globalContext } from '@alilc/lowcode-editor-core';
|
||||
import { observer, computed, Tip } from '@alilc/lowcode-editor-core';
|
||||
import { createIcon, isReactComponent, isActionContentObject } from '@alilc/lowcode-utils';
|
||||
import { IPublicTypeActionContentObject } from '@alilc/lowcode-types';
|
||||
import { BuiltinSimulatorHost } from '../host';
|
||||
@ -131,8 +131,7 @@ function createAction(content: ReactNode | ComponentType<any> | IPublicTypeActio
|
||||
className="lc-borders-action"
|
||||
onClick={() => {
|
||||
action && action(node.internalToShellNode()!);
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = node.document?.designer.editor;
|
||||
const npm = node?.componentMeta?.npm;
|
||||
const selected =
|
||||
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { obx, globalContext } from '@alilc/lowcode-editor-core';
|
||||
import { obx } from '@alilc/lowcode-editor-core';
|
||||
import { IPublicTypePluginConfig, IPublicTypeLiveTextEditingConfig } from '@alilc/lowcode-types';
|
||||
import { Node, Prop } from '../../document';
|
||||
import { INode, Prop } from '../../document';
|
||||
|
||||
const EDITOR_KEY = 'data-setter-prop';
|
||||
|
||||
@ -17,7 +17,7 @@ function defaultSaveContent(content: string, prop: Prop) {
|
||||
}
|
||||
|
||||
export interface EditingTarget {
|
||||
node: Node;
|
||||
node: INode;
|
||||
rootElement: HTMLElement;
|
||||
event: MouseEvent;
|
||||
}
|
||||
@ -47,13 +47,16 @@ export class LiveEditing {
|
||||
|
||||
@obx.ref private _editing: Prop | null = null;
|
||||
|
||||
private _dispose?: () => void;
|
||||
|
||||
private _save?: () => void;
|
||||
|
||||
apply(target: EditingTarget) {
|
||||
const { node, event, rootElement } = target;
|
||||
const targetElement = event.target as HTMLElement;
|
||||
const { liveTextEditing } = node.componentMeta;
|
||||
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = node.document?.designer.editor;
|
||||
const npm = node?.componentMeta?.npm;
|
||||
const selected =
|
||||
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || '';
|
||||
@ -166,10 +169,6 @@ export class LiveEditing {
|
||||
return this._editing;
|
||||
}
|
||||
|
||||
private _dispose?: () => void;
|
||||
|
||||
private _save?: () => void;
|
||||
|
||||
saveAndDispose() {
|
||||
if (this._save) {
|
||||
this._save();
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Overlay } from '@alifd/next';
|
||||
import React, { MouseEvent } from 'react';
|
||||
import { Title, globalContext } from '@alilc/lowcode-editor-core';
|
||||
import { Title } from '@alilc/lowcode-editor-core';
|
||||
import { canClickNode } from '@alilc/lowcode-utils';
|
||||
import './index.less';
|
||||
|
||||
@ -66,8 +66,7 @@ export default class InstanceNodeSelector extends React.Component<IProps, IState
|
||||
|
||||
if (canClick && typeof node.select === 'function') {
|
||||
node.select();
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = node.document?.designer.editor;
|
||||
const npm = node?.componentMeta?.npm;
|
||||
const selected =
|
||||
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
|
||||
|
||||
@ -60,6 +60,8 @@ export function buildFilter(rule?: string | string[] | RegExp | IPublicTypeNesti
|
||||
export interface IComponentMeta extends IPublicModelComponentMeta<INode> {
|
||||
prototype?: any;
|
||||
|
||||
liveTextEditing?: IPublicTypeLiveTextEditingConfig[];
|
||||
|
||||
get rootSelector(): string | undefined;
|
||||
|
||||
setMetadata(metadata: IPublicTypeComponentMetadata): void;
|
||||
|
||||
@ -148,6 +148,10 @@ export interface IDocumentModel extends Omit<IPublicModelDocumentModel<
|
||||
suspense(): void;
|
||||
|
||||
close(): void;
|
||||
|
||||
unlinkNode(node: INode): void;
|
||||
|
||||
destroyNode(node: INode): void;
|
||||
}
|
||||
|
||||
export class DocumentModel implements IDocumentModel {
|
||||
@ -333,6 +337,7 @@ export class DocumentModel implements IDocumentModel {
|
||||
this.import(schema as IPublicTypeRootSchema, true);
|
||||
this.simulator?.rerender();
|
||||
},
|
||||
this,
|
||||
);
|
||||
|
||||
this.setupListenActiveNodes();
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { reaction, untracked, globalContext, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
|
||||
import { reaction, untracked, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
|
||||
import { IPublicTypeNodeSchema, IPublicModelHistory, IPublicTypeDisposable } from '@alilc/lowcode-types';
|
||||
import { Logger } from '@alilc/lowcode-utils';
|
||||
import { IDocumentModel } from '../designer';
|
||||
|
||||
const logger = new Logger({ level: 'warn', bizName: 'history' });
|
||||
|
||||
@ -37,10 +38,12 @@ export class History<T = IPublicTypeNodeSchema> implements IHistory {
|
||||
return this.session.data;
|
||||
}
|
||||
|
||||
private timeGap: number = 1000;
|
||||
|
||||
constructor(
|
||||
dataFn: () => T | null,
|
||||
private redoer: (data: T) => void,
|
||||
private timeGap: number = 1000,
|
||||
private document?: IDocumentModel,
|
||||
) {
|
||||
this.session = new Session(0, null, this.timeGap);
|
||||
this.records = [this.session];
|
||||
@ -130,8 +133,7 @@ export class History<T = IPublicTypeNodeSchema> implements IHistory {
|
||||
}
|
||||
const cursor = this.session.cursor - 1;
|
||||
this.go(cursor);
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = this.document?.designer.editor;
|
||||
if (!editor) {
|
||||
return;
|
||||
}
|
||||
@ -144,8 +146,7 @@ export class History<T = IPublicTypeNodeSchema> implements IHistory {
|
||||
}
|
||||
const cursor = this.session.cursor + 1;
|
||||
this.go(cursor);
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = this.document?.designer.editor;
|
||||
if (!editor) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { obx, computed, globalContext, makeObservable, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
|
||||
import { obx, computed, makeObservable, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
|
||||
import { Node, INode } from './node';
|
||||
import { IPublicTypeNodeData, IPublicModelNodeChildren, IPublicEnumTransformStage, IPublicTypeDisposable } from '@alilc/lowcode-types';
|
||||
import { shallowEqual, compatStage, isNodeSchema } from '@alilc/lowcode-utils';
|
||||
@ -16,12 +16,12 @@ export interface INodeChildren extends Omit<IPublicModelNodeChildren<INode>,
|
||||
'isEmpty' |
|
||||
'notEmpty'
|
||||
> {
|
||||
children: INode[];
|
||||
|
||||
get owner(): INode;
|
||||
|
||||
get length(): number;
|
||||
|
||||
children: INode[];
|
||||
|
||||
unlinkChild(node: INode): void;
|
||||
|
||||
/**
|
||||
@ -239,11 +239,8 @@ export class NodeChildren implements INodeChildren {
|
||||
}
|
||||
const { document } = node;
|
||||
/* istanbul ignore next */
|
||||
if (globalContext.has('editor')) {
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
editor.eventBus.emit('node.remove', { node, index: i });
|
||||
}
|
||||
const editor = node.document?.designer.editor;
|
||||
editor?.eventBus.emit('node.remove', { node, index: i });
|
||||
document?.unlinkNode(node);
|
||||
document?.selection.remove(node.id);
|
||||
document?.destroyNode(node);
|
||||
@ -281,14 +278,11 @@ export class NodeChildren implements INodeChildren {
|
||||
const i = children.map(d => d.id).indexOf(node.id);
|
||||
|
||||
if (node.parent) {
|
||||
if (globalContext.has('editor')) {
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
editor.eventBus.emit('node.remove.topLevel', {
|
||||
node,
|
||||
index: node.index,
|
||||
});
|
||||
}
|
||||
const editor = node.document?.designer.editor;
|
||||
editor?.eventBus.emit('node.remove.topLevel', {
|
||||
node,
|
||||
index: node.index,
|
||||
});
|
||||
}
|
||||
|
||||
if (i < 0) {
|
||||
@ -317,11 +311,8 @@ export class NodeChildren implements INodeChildren {
|
||||
});
|
||||
this.emitter.emit('insert', node);
|
||||
/* istanbul ignore next */
|
||||
if (globalContext.has('editor')) {
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
editor.eventBus.emit('node.add', { node });
|
||||
}
|
||||
const editor = node.document?.designer.editor;
|
||||
editor?.eventBus.emit('node.add', { node });
|
||||
if (useMutator) {
|
||||
this.reportModified(node, this.owner, { type: 'insert' });
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-editor-core",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Core Api for Ali lowCode engine",
|
||||
"license": "MIT",
|
||||
"main": "lib/index.js",
|
||||
@ -14,8 +14,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.19.16",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"debug": "^4.1.1",
|
||||
"intl-messageformat": "^9.3.1",
|
||||
@ -47,5 +47,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/editor-core"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-editor-skeleton",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "alibaba lowcode editor skeleton",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -19,10 +19,10 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.20.12",
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"react": "^16.8.1",
|
||||
"react-dom": "^16.8.1"
|
||||
@ -42,5 +42,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/editor-skeleton"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -4,6 +4,22 @@ import { uniqueId } from '@alilc/lowcode-utils';
|
||||
import { IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
|
||||
import './style.less';
|
||||
|
||||
export interface PopupExtProps {
|
||||
width?: number;
|
||||
hasMask?: boolean;
|
||||
trigger?: ReactNode;
|
||||
canCloseByOutSideClick?: boolean
|
||||
className?: string;
|
||||
safeNode?: string[];
|
||||
}
|
||||
|
||||
interface PopupProps extends PopupExtProps{
|
||||
content?: ReactNode,
|
||||
title?: ReactNode,
|
||||
actionKey?: string
|
||||
}
|
||||
|
||||
|
||||
export const PopupContext = createContext<PopupPipe>({} as any);
|
||||
|
||||
export class PopupPipe {
|
||||
@ -11,7 +27,7 @@ export class PopupPipe {
|
||||
|
||||
private currentId?: string;
|
||||
|
||||
create(props?: object): {
|
||||
create(props?: PopupExtProps): {
|
||||
send: (content: ReactNode, title: ReactNode) => void;
|
||||
show: (target: Element) => void;
|
||||
} {
|
||||
@ -45,13 +61,13 @@ export class PopupPipe {
|
||||
};
|
||||
}
|
||||
|
||||
private popup(props: object, target?: Element) {
|
||||
private popup(props: PopupProps, target?: Element) {
|
||||
Promise.resolve().then(() => {
|
||||
this.emitter.emit('popupchange', props, target);
|
||||
});
|
||||
}
|
||||
|
||||
onPopupChange(fn: (props: object, target?: Element) => void): () => void {
|
||||
onPopupChange(fn: (props: PopupProps, target?: Element) => void): () => void {
|
||||
this.emitter.on('popupchange', fn);
|
||||
return () => {
|
||||
this.emitter.removeListener('popupchange', fn);
|
||||
@ -86,18 +102,23 @@ export default class PopupService extends Component<{
|
||||
}
|
||||
}
|
||||
|
||||
interface StateType extends PopupProps {
|
||||
visible?: boolean,
|
||||
offsetX?: number,
|
||||
pos?: {top: number, height: number}
|
||||
}
|
||||
export class PopupContent extends PureComponent<{ safeId?: string; popupContainer?: string }> {
|
||||
static contextType = PopupContext;
|
||||
|
||||
popupContainerId = uniqueId('popupContainer');
|
||||
|
||||
state: any = {
|
||||
state: StateType = {
|
||||
visible: false,
|
||||
offsetX: -300,
|
||||
};
|
||||
|
||||
private dispose = (this.context as PopupPipe).onPopupChange((props, target) => {
|
||||
const state: any = {
|
||||
const state: StateType = {
|
||||
...props,
|
||||
visible: true,
|
||||
};
|
||||
@ -132,7 +153,7 @@ export class PopupContent extends PureComponent<{ safeId?: string; popupContaine
|
||||
};
|
||||
|
||||
render() {
|
||||
const { content, visible, title, actionKey, pos, offsetX } = this.state;
|
||||
const { content, visible, title, actionKey, pos, offsetX, width = 360, hasMask = false, canCloseByOutSideClick = true, safeNode = [] } = this.state;
|
||||
if (!visible) {
|
||||
return null;
|
||||
}
|
||||
@ -146,10 +167,10 @@ export class PopupContent extends PureComponent<{ safeId?: string; popupContaine
|
||||
|
||||
return (
|
||||
<Drawer
|
||||
width={360}
|
||||
width={width}
|
||||
visible={visible}
|
||||
offset={[offsetX, 0]}
|
||||
hasMask={false}
|
||||
hasMask={hasMask}
|
||||
onVisibleChange={(_visible, type) => {
|
||||
if (avoidLaterHidden) {
|
||||
return;
|
||||
@ -160,11 +181,11 @@ export class PopupContent extends PureComponent<{ safeId?: string; popupContaine
|
||||
}}
|
||||
trigger={<div className="lc-popup-placeholder" style={pos} />}
|
||||
triggerType="click"
|
||||
canCloseByOutSideClick
|
||||
canCloseByOutSideClick={canCloseByOutSideClick}
|
||||
animation={false}
|
||||
onClose={this.onClose}
|
||||
id={this.props.safeId}
|
||||
safeNode={id}
|
||||
safeNode={[id, ...safeNode]}
|
||||
closeable
|
||||
container={this.props.popupContainer}
|
||||
>
|
||||
|
||||
@ -53,8 +53,7 @@ export class SettingsPrimaryPane extends Component<ISettingsPrimaryPaneProps, {
|
||||
}
|
||||
|
||||
renderBreadcrumb() {
|
||||
const { settings } = this.main;
|
||||
const { config } = this.props;
|
||||
const { settings, editor } = this.main;
|
||||
// const shouldIgnoreRoot = config.props?.ignoreRoot;
|
||||
const { shouldIgnoreRoot } = this.state;
|
||||
if (!settings) {
|
||||
@ -73,8 +72,6 @@ export class SettingsPrimaryPane extends Component<ISettingsPrimaryPaneProps, {
|
||||
);
|
||||
}
|
||||
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = this.props.engineEditor;
|
||||
const designer = editor.get('designer');
|
||||
const current = designer?.currentSelection?.getNodes()?.[0];
|
||||
let node: INode | null = settings.first;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { Component, ReactElement } from 'react';
|
||||
import { Icon } from '@alifd/next';
|
||||
import classNames from 'classnames';
|
||||
import { Title, observer, Tip, globalContext } from '@alilc/lowcode-editor-core';
|
||||
import { Title, observer, Tip } from '@alilc/lowcode-editor-core';
|
||||
import { DockProps } from '../../types';
|
||||
import { PanelDock } from '../../widget/panel-dock';
|
||||
import { composeTitle } from '../../widget/utils';
|
||||
@ -116,14 +116,12 @@ export class DraggableLineView extends Component<{ panel: Panel }> {
|
||||
}
|
||||
|
||||
// 抛出事件,对于有些需要 panel 插件随着 度变化进行再次渲染的,由panel插件内部监听事件实现
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = this.props.panel.skeleton.editor;
|
||||
editor?.eventBus.emit('dockpane.drag', width);
|
||||
}
|
||||
|
||||
onDragChange(type: 'start' | 'end') {
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = this.props.panel.skeleton.editor;
|
||||
editor?.eventBus.emit('dockpane.dragchange', type);
|
||||
// builtinSimulator 屏蔽掉 鼠标事件
|
||||
editor?.eventBus.emit('designer.builtinSimulator.disabledEvents', type === 'start');
|
||||
@ -187,8 +185,7 @@ export class TitledPanelView extends Component<{ panel: Panel; area?: string }>
|
||||
if (!panel.inited) {
|
||||
return null;
|
||||
}
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = panel.skeleton.editor;
|
||||
const panelName = area ? `${area}-${panel.name}` : panel.name;
|
||||
editor?.eventBus.emit('skeleton.panel.toggle', {
|
||||
name: panelName || '',
|
||||
@ -250,8 +247,7 @@ export class PanelView extends Component<{
|
||||
if (!panel.inited) {
|
||||
return null;
|
||||
}
|
||||
const workspace = globalContext.get('workspace');
|
||||
const editor = workspace.isActive ? workspace.window.editor : globalContext.get('editor');
|
||||
const editor = panel.skeleton.editor;
|
||||
const panelName = area ? `${area}-${panel.name}` : panel.name;
|
||||
editor?.eventBus.emit('skeleton.panel.toggle', {
|
||||
name: panelName || '',
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-engine",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "An enterprise-class low-code technology stack with scale-out design / 一套面向扩展设计的企业级低代码技术体系",
|
||||
"main": "lib/engine-core.js",
|
||||
"module": "es/engine-core.js",
|
||||
@ -19,15 +19,15 @@
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.19.12",
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-engine-ext": "^1.0.0",
|
||||
"@alilc/lowcode-plugin-designer": "1.1.6",
|
||||
"@alilc/lowcode-plugin-outline-pane": "1.1.6",
|
||||
"@alilc/lowcode-shell": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-workspace": "1.1.6",
|
||||
"@alilc/lowcode-plugin-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-plugin-outline-pane": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-shell": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-workspace": "1.1.7-beta.13",
|
||||
"react": "^16.8.1",
|
||||
"react-dom": "^16.8.1"
|
||||
},
|
||||
@ -53,5 +53,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/engine"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-ignitor",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "点火器,bootstrap lce project",
|
||||
"main": "lib/index.js",
|
||||
"private": true,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-plugin-designer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "alibaba lowcode editor designer plugin",
|
||||
"files": [
|
||||
"es",
|
||||
@ -18,9 +18,9 @@
|
||||
],
|
||||
"author": "xiayang.xy",
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"react": "^16.8.1",
|
||||
"react-dom": "^16.8.1"
|
||||
},
|
||||
@ -37,5 +37,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/plugin-designer"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-plugin-outline-pane",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Outline pane for Ali lowCode engine",
|
||||
"files": [
|
||||
"es",
|
||||
@ -13,8 +13,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.19.16",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"react": "^16",
|
||||
"react-dom": "^16.7.0",
|
||||
@ -38,5 +38,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/plugin-outline-pane"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-rax-renderer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Rax renderer for Ali lowCode engine",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -30,8 +30,8 @@
|
||||
"build": "build-scripts build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-renderer-core": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-renderer-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"rax-find-dom-node": "^1.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
@ -49,5 +49,5 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"homepage": "https://unpkg.alibaba-inc.com/@alilc/lowcode-rax-renderer@0.1.2/build/index.html",
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-rax-simulator-renderer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "rax simulator renderer for alibaba lowcode designer",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -13,10 +13,10 @@
|
||||
"build:umd": "build-scripts build --config build.umd.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-rax-renderer": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-rax-renderer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"driver-universal": "^3.1.3",
|
||||
"history": "^5.0.0",
|
||||
@ -50,5 +50,5 @@
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/rax-simulator-renderer"
|
||||
},
|
||||
"homepage": "https://unpkg.alibaba-inc.com/@alilc/lowcode-rax-simulator-renderer@1.0.73/build/index.html",
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-react-renderer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "react renderer for ali lowcode engine",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -22,7 +22,7 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.21.16",
|
||||
"@alilc/lowcode-renderer-core": "1.1.6"
|
||||
"@alilc/lowcode-renderer-core": "1.1.7-beta.13"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@alib/build-scripts": "^0.1.18",
|
||||
@ -42,5 +42,5 @@
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/react-renderer"
|
||||
},
|
||||
"homepage": "https://unpkg.alibaba-inc.com/@alilc/lowcode-react-renderer@1.0.21/build/index.html",
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-react-simulator-renderer",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "react simulator renderer for alibaba lowcode designer",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -17,10 +17,10 @@
|
||||
"test:cov": "build-scripts test --config build.test.json --jest-coverage"
|
||||
},
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-react-renderer": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-react-renderer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"mobx": "^6.3.0",
|
||||
"mobx-react": "^7.2.0",
|
||||
@ -43,5 +43,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/react-simulator-renderer"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-renderer-core",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "renderer core",
|
||||
"license": "MIT",
|
||||
"main": "lib/index.js",
|
||||
@ -16,8 +16,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-datasource-engine": "^1.0.0",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"debug": "^4.1.1",
|
||||
"fetch-jsonp": "^1.1.3",
|
||||
@ -32,7 +32,7 @@
|
||||
"devDependencies": {
|
||||
"@alib/build-scripts": "^0.1.18",
|
||||
"@alifd/next": "^1.26.0",
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@babel/plugin-transform-typescript": "^7.16.8",
|
||||
"@testing-library/react": "^11.2.2",
|
||||
"@types/classnames": "^2.2.11",
|
||||
@ -55,5 +55,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/renderer-core"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-shell",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Shell Layer for AliLowCodeEngine",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -15,12 +15,12 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-workspace": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-workspace": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"enzyme": "^3.11.0",
|
||||
"enzyme-adapter-react-16": "^1.15.5",
|
||||
@ -50,5 +50,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/shell"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-types",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Types for Ali lowCode engine",
|
||||
"files": [
|
||||
"es",
|
||||
@ -29,5 +29,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/types"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-utils",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Utils for Ali lowCode engine",
|
||||
"files": [
|
||||
"lib",
|
||||
@ -14,7 +14,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@alifd/next": "^1.19.16",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"lodash": "^4.17.21",
|
||||
"mobx": "^6.3.0",
|
||||
"react": "^16"
|
||||
@ -32,5 +32,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/utils"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@alilc/lowcode-workspace",
|
||||
"version": "1.1.6",
|
||||
"version": "1.1.7-beta.13",
|
||||
"description": "Shell Layer for AliLowCodeEngine",
|
||||
"main": "lib/index.js",
|
||||
"module": "es/index.js",
|
||||
@ -15,11 +15,11 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@alilc/lowcode-designer": "1.1.6",
|
||||
"@alilc/lowcode-editor-core": "1.1.6",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.6",
|
||||
"@alilc/lowcode-types": "1.1.6",
|
||||
"@alilc/lowcode-utils": "1.1.6",
|
||||
"@alilc/lowcode-designer": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-core": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-editor-skeleton": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-types": "1.1.7-beta.13",
|
||||
"@alilc/lowcode-utils": "1.1.7-beta.13",
|
||||
"classnames": "^2.2.6",
|
||||
"enzyme": "^3.11.0",
|
||||
"enzyme-adapter-react-16": "^1.15.5",
|
||||
@ -49,5 +49,5 @@
|
||||
"type": "http",
|
||||
"url": "https://github.com/alibaba/lowcode-engine/tree/main/packages/shell"
|
||||
},
|
||||
"gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6"
|
||||
"gitHead": "fdb74f0aeb15a30f85387979f620e27dd1673b92"
|
||||
}
|
||||
|
||||
@ -185,4 +185,4 @@ export class BasicContext implements IBasicContext {
|
||||
await innerWorkspace?.registryInnerPlugin(designer, editor, plugins);
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -183,6 +183,9 @@ export class Workspace implements IWorkspace {
|
||||
}
|
||||
|
||||
private remove(index: number) {
|
||||
if (index < 0) {
|
||||
return;
|
||||
}
|
||||
const window = this.windows[index];
|
||||
this.windows.splice(index, 1);
|
||||
if (this.window === window) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user