diff --git a/packages/editor-preset-vision/src/panes.ts b/packages/editor-preset-vision/src/panes.ts index 840211188..d33d9a77f 100644 --- a/packages/editor-preset-vision/src/panes.ts +++ b/packages/editor-preset-vision/src/panes.ts @@ -206,9 +206,9 @@ const dockPane = Object.assign(skeleton.leftArea, { const f = (_: any, dock: any) => { fn(dock); }; - editor.on('skeleton.panel-dock.show', f); + editor.on('skeleton.panel-dock.active', f); return () => { - editor.removeListener('skeleton.panel-dock.show', f); + editor.removeListener('skeleton.panel-dock.active', f); }; }, /** @@ -218,9 +218,9 @@ const dockPane = Object.assign(skeleton.leftArea, { const f = (_: any, dock: any) => { fn(dock); }; - editor.on('skeleton.panel-dock.hide', f); + editor.on('skeleton.panel-dock.unactive', f); return () => { - editor.removeListener('skeleton.panel-dock.hide', f); + editor.removeListener('skeleton.panel-dock.unactive', f); }; }, /** diff --git a/packages/editor-skeleton/src/widget/panel.ts b/packages/editor-skeleton/src/widget/panel.ts index 40fbaead4..8ecacc43e 100644 --- a/packages/editor-skeleton/src/widget/panel.ts +++ b/packages/editor-skeleton/src/widget/panel.ts @@ -162,6 +162,11 @@ export default class Panel implements IWidget { if (flag) { this._actived = true; this.parent?.active(this); + if (this.parent.name === 'leftFloatArea') { + this.skeleton.leftFixedArea.container.unactiveAll(); + } else if (this.parent.name === 'leftFixedArea') { + this.skeleton.leftFloatArea.container.unactiveAll(); + } if (!this.inited) { this.inited = true; } diff --git a/packages/editor-skeleton/src/widget/widget-container.ts b/packages/editor-skeleton/src/widget/widget-container.ts index 013268db8..dceeabc5a 100644 --- a/packages/editor-skeleton/src/widget/widget-container.ts +++ b/packages/editor-skeleton/src/widget/widget-container.ts @@ -79,6 +79,10 @@ export default class WidgetContainer this.unactive(name)); + } + add(item: T | G): T { item = this.handle(item); const origin = this.get(item.name);