github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2025-12-11 18:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix onChangeNodeVisible & onChangeNodeChildren cannot be triggered successfully in some cases

Browse Source
This commit is contained in:
liujuping 2023-01-03 15:30:58 +08:00 committed by 林熠
parent 8d2fe15a3f
commit 9444752a65
10 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/designer/src/document/document-model.ts
View File

@ -15,6 +15,8 @@ import {
IPublicApiProject,
IPublicModelDropLocation,
IPublicEnumTransformStage,
IPublicOnChangeOptions,
EDITOR_EVENT,
} from '@alilc/lowcode-types';
import { Project } from '../project';
import { ISimulatorHost } from '../simulator';
@ -158,6 +160,22 @@ export class DocumentModel implements IDocumentModel {
this.inited = true;
}
onChangeNodeVisible(fn: (node: IPublicModelNode, visible: boolean) => void): () => void {
this.designer.editor?.eventBus.on(EDITOR_EVENT.NODE_CHILDREN_CHANGE, fn);
return () => {
this.designer.editor?.eventBus.off(EDITOR_EVENT.NODE_CHILDREN_CHANGE, fn);
};
}
onChangeNodeChildren(fn: (info: IPublicOnChangeOptions) => void): () => void {
this.designer.editor?.eventBus.on(EDITOR_EVENT.NODE_VISIBLE_CHANGE, fn);
return () => {
this.designer.editor?.eventBus.off(EDITOR_EVENT.NODE_VISIBLE_CHANGE, fn);
};
}
@obx.shallow private willPurgeSpace: Node[] = [];
get modalNode() {

8
packages/designer/src/document/node/node.ts
View File

@ -16,6 +16,7 @@ import {
IPublicModelNode,
IPublicModelExclusiveGroup,
IPublicEnumTransformStage,
EDITOR_EVENT,
} from '@alilc/lowcode-types';
import { compatStage, isDOMText, isJSExpression } from '@alilc/lowcode-utils';
import { SettingTopEntry } from '@alilc/lowcode-designer';
@ -193,6 +194,13 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
this.isInited = true;
this.emitter = createModuleEventBus('Node');
const editor = this.document.designer.editor;
this.onVisibleChange((visible: boolean) => {
editor?.eventBus.emit(EDITOR_EVENT.NODE_VISIBLE_CHANGE, this, visible);
});
this.onChildrenChange((info?: { type: string; node: Node }) => {
editor?.eventBus.emit(EDITOR_EVENT.NODE_VISIBLE_CHANGE, info);
});
}
_settingEntry: SettingTopEntry;

1
packages/designer/tests/document/node/node.add.test.ts
View File

@ -6,7 +6,6 @@ import { Node } from '../../../src/document/node/node';
import { Designer } from '../../../src/designer/designer';
import formSchema from '../../fixtures/schema/form';
import { getIdsFromSchema, getNodeFromSchemaById } from '../../utils';
import { EBADF } from 'constants';
const mockCreateSettingEntry = jest.fn();
jest.mock('../../../src/designer/designer', () => {

3
packages/designer/tests/document/node/node.dragdrop.test.ts
View File

@ -1,8 +1,5 @@
import set from 'lodash/set';
import cloneDeep from 'lodash/cloneDeep';
import '../../fixtures/window';
import { Project } from '../../../src/project/project';
import { Node } from '../../../src/document/node/node';
import { Designer } from '../../../src/designer/designer';
import formSchema from '../../fixtures/schema/form';
import { getIdsFromSchema, getNodeFromSchemaById } from '../../utils';

3
packages/designer/tests/document/node/node.modify.test.ts
View File

@ -1,8 +1,5 @@
import set from 'lodash/set';
import cloneDeep from 'lodash/cloneDeep';
import '../../fixtures/window';
import { Project } from '../../../src/project/project';
import { Node } from '../../../src/document/node/node';
import { Designer } from '../../../src/designer/designer';
import formSchema from '../../fixtures/schema/form';
import { getIdsFromSchema, getNodeFromSchemaById } from '../../utils';

3
packages/designer/tests/document/node/node.remove.test.ts
View File

@ -2,10 +2,9 @@ import set from 'lodash/set';
import cloneDeep from 'lodash/cloneDeep';
import '../../fixtures/window';
import { Project } from '../../../src/project/project';
import { Node } from '../../../src/document/node/node';
import { Designer } from '../../../src/designer/designer';
import formSchema from '../../fixtures/schema/form';
import { getIdsFromSchema, getNodeFromSchemaById } from '../../utils';
import { getIdsFromSchema } from '../../utils';
const mockCreateSettingEntry = jest.fn();
jest.mock('../../../src/designer/designer', () => {

1
packages/shell/src/api/project.ts
View File

@ -139,7 +139,6 @@ export class Project implements IPublicApiProject {
*/
importSchema(schema?: IPublicTypeProjectSchema): void {
this[projectSymbol].load(schema, true);
// this[editorSymbol].emit(Events.IMPORT_SCHEMA, schema);
}
/**

25
packages/shell/src/model/document-model.ts
View File

@ -288,11 +288,8 @@ export class DocumentModel implements IPublicModelDocumentModel {
* @param fn
*/
onChangeNodeVisible(fn: (node: IPublicModelNode, visible: boolean) => void): void {
// TODO: history 变化时需要重新绑定
this[documentSymbol].nodesMap?.forEach((node) => {
node.onVisibleChange((flag: boolean) => {
fn(Node.create(node)!, flag);
});
this[documentSymbol].onChangeNodeVisible((node: IPublicModelNode, visible: boolean) => {
fn(Node.create(node)!, visible);
});
}
@ -300,16 +297,14 @@ export class DocumentModel implements IPublicModelDocumentModel {
* 当前 document 的节点 children 变更事件
* @param fn
*/
onChangeNodeChildren(fn: (info?: IPublicOnChangeOptions) => void): void {
// TODO: history 变化时需要重新绑定
this[documentSymbol].nodesMap?.forEach((node) => {
node.onChildrenChange((info?: InnerOnChangeOptions) => {
return info
? fn({
type: info.type,
node: Node.create(node)!,
})
: fn();
onChangeNodeChildren(fn: (info: IPublicOnChangeOptions) => void): void {
this[documentSymbol].onChangeNodeChildren((info?: IPublicOnChangeOptions) => {
if (!info) {
return;
}
fn({
type: info.type,
node: Node.create(info.node)!,
});
});
}

6
packages/types/src/editor.ts
View File

@ -173,3 +173,9 @@ export interface PluginStatus {
export interface PluginStatusSet {
[key: string]: PluginStatus;
}
export enum EDITOR_EVENT {
NODE_CHILDREN_CHANGE = 'node.children.change',
NODE_VISIBLE_CHANGE = 'node.visible.change',
}

7
packages/types/src/shell/model/document-model.ts
View File

@ -2,6 +2,7 @@ import { IPublicTypeRootSchema, IPublicTypeDragNodeDataObject, IPublicTypeDragNo
import { IPublicEnumTransformStage } from '../enum';
import { IPublicApiProject } from '../api';
import { IPublicModelDropLocation, IPublicModelDetecting, IPublicModelNode, IPublicModelSelection, IPublicModelHistory, IPublicModelModalNodesManager } from './';
import { IPublicOnChangeOptions } from '@alilc/lowcode-types';
export interface IPublicModelDocumentModel {
@ -168,6 +169,12 @@ export interface IPublicModelDocumentModel {
onChangeNodeVisible(fn: (node: IPublicModelNode, visible: boolean) => void): void;
/**
* 当前 document 的节点 children 变更事件
* @param fn
*/
onChangeNodeChildren(fn: (info: IPublicOnChangeOptions) => void): void;
/**
* 当前 document 节点属性修改事件
* @param fn