Merge commit '3cc8b33db4f30a26ab80bc2dcbe4812d8f4e1b98' into fix/filter-bug

# Conflicts:
#	packages/designer/src/document/node/node-children.ts
#	packages/designer/src/document/node/props/props.ts
This commit is contained in:
mario.gk 2020-07-28 10:16:26 +08:00
commit f5d8c9c002
3 changed files with 32 additions and 9 deletions

View File

@ -49,6 +49,11 @@ export class DocumentModel {
private emitter: EventEmitter;
private rootNodeVisitorMap: { [visitorName: string]: any } = {};
/**
* @deprecated
*/
private _addons: { [key: string]: { exportData: () => any; isProp: boolean;} } = {};
/**
*
*/
@ -512,6 +517,32 @@ export class DocumentModel {
this.emitter.emit('lowcode_engine_renderer_ready', renderer);
}
/**
* @deprecated
*/
getAddonData(name: string) {
const addon = this._addons[name];
return addon?.exportData();
}
/**
* @deprecated
*/
registerAddon(name: string, exportData: any) {
if (['id', 'params', 'layout'].indexOf(name) > -1) {
throw new Error('addon name cannot be id, params, layout');
}
const i = this._addons?.findIndex((item) => item.name === name);
if (i > -1) {
this._addons?.splice(i, 1);
}
this._addons?.push({
exportData,
name,
});
}
acceptRootNodeVisitor(
visitorName: string = 'default',
visitorFn: (node: RootNode) => any ) {

View File

@ -331,14 +331,6 @@ export class NodeChildren {
}
}
// if (callbacks?.onNodeAdd && options?.type === 'insert') {
// try {
// callbacks?.onNodeAdd.call(owner, node, owner);
// } catch (e) {
// console.error('error when excute experimental.callbacks.onNodeAdd', e);
// }
// }
if (owner.parent && !owner.parent.isRoot()) {
this.reportModified(node, owner.parent, options);
}

View File

@ -29,7 +29,7 @@ class ModalTreeNodeView extends Component<{ treeNode: TreeNode }> {
render() {
const { treeNode } = this.props;
const modalNodes = treeNode.children?.filter((item) => {
return item.node.getPrototype().isModal();
return item.node.getPrototype()?.isModal();
});
if (!modalNodes || modalNodes.length === 0) {
return null;