refactor: reorganize package structure and decouple framework packages (#338)
* refactor: reorganize package structure and decouple framework packages ## Package Structure Reorganization - Reorganized 55 packages into categorized subdirectories: - packages/framework/ - Generic framework (Laya/Cocos compatible) - packages/engine/ - ESEngine core modules - packages/rendering/ - Rendering modules (WASM dependent) - packages/physics/ - Physics modules - packages/streaming/ - World streaming - packages/network-ext/ - Network extensions - packages/editor/ - Editor framework and plugins - packages/rust/ - Rust WASM engine - packages/tools/ - Build tools and SDK ## Framework Package Decoupling - Decoupled behavior-tree and blueprint packages from ESEngine dependencies - Created abstracted interfaces (IBTAssetManager, IBehaviorTreeAssetContent) - ESEngine-specific code moved to esengine/ subpath exports - Framework packages now usable with Cocos/Laya without ESEngine ## CI Configuration - Updated CI to only type-check and lint framework packages - Added type-check:framework and lint:framework scripts ## Breaking Changes - Package import paths changed due to directory reorganization - ESEngine integrations now use subpath imports (e.g., '@esengine/behavior-tree/esengine') * fix: update es-engine file path after directory reorganization * docs: update README to focus on framework over engine * ci: only build framework packages, remove Rust/WASM dependencies * fix: remove esengine subpath from behavior-tree and blueprint builds ESEngine integration code will only be available in full engine builds. Framework packages are now purely engine-agnostic. * fix: move network-protocols to framework, build both in CI * fix: update workflow paths from packages/core to packages/framework/core * fix: exclude esengine folder from type-check in behavior-tree and blueprint * fix: update network tsconfig references to new paths * fix: add test:ci:framework to only test framework packages in CI * fix: only build core and math npm packages in CI * fix: exclude test files from CodeQL and fix string escaping security issue
This commit is contained in:
YHH
GitHub
148
packages/editor/editor-app/src/shared/layout/LayoutMerger.ts
Normal file
148
packages/editor/editor-app/src/shared/layout/LayoutMerger.ts
Normal file
@@ -0,0 +1,148 @@
|
||||
import type { IJsonModel, IJsonTabNode } from 'flexlayout-react';
|
||||
import type { FlexDockPanel } from './types';
|
||||
import type { IJsonLayoutNode, IJsonBorderNode, IJsonTabsetNode } from './FlexLayoutTypes';
|
||||
import { hasChildren, isTabNode, isTabsetNode } from './FlexLayoutTypes';
|
||||
|
||||
export class LayoutMerger {
|
||||
static merge(savedLayout: IJsonModel, defaultLayout: IJsonModel, currentPanels: FlexDockPanel[]): IJsonModel {
|
||||
const currentPanelIds = new Set(currentPanels.map((p) => p.id));
|
||||
const savedPanelIds = this.collectPanelIds(savedLayout);
|
||||
const newPanelIds = Array.from(currentPanelIds).filter((id) => !savedPanelIds.has(id));
|
||||
const removedPanelIds = Array.from(savedPanelIds).filter((id) => !currentPanelIds.has(id));
|
||||
|
||||
const mergedLayout = JSON.parse(JSON.stringify(savedLayout));
|
||||
|
||||
this.clearBorders(mergedLayout);
|
||||
|
||||
if (removedPanelIds.length > 0) {
|
||||
this.removePanels(mergedLayout.layout, removedPanelIds);
|
||||
}
|
||||
|
||||
if (newPanelIds.length === 0) {
|
||||
return mergedLayout;
|
||||
}
|
||||
|
||||
const newPanelTabs = this.findNewPanels(defaultLayout.layout, newPanelIds);
|
||||
|
||||
// 构建面板位置映射 | Build panel position map
|
||||
const panelPositionMap = new Map(currentPanels.map((p) => [p.id, p.layout?.position || 'center']));
|
||||
|
||||
if (!this.addNewPanelsToCenter(mergedLayout.layout, newPanelTabs, panelPositionMap)) {
|
||||
return defaultLayout;
|
||||
}
|
||||
|
||||
return mergedLayout;
|
||||
}
|
||||
|
||||
private static collectPanelIds(layout: IJsonModel): Set<string> {
|
||||
const panelIds = new Set<string>();
|
||||
const collect = (node: IJsonLayoutNode) => {
|
||||
if (isTabNode(node) && node.id) {
|
||||
panelIds.add(node.id);
|
||||
}
|
||||
if (hasChildren(node)) {
|
||||
node.children.forEach((child) => collect(child as IJsonLayoutNode));
|
||||
}
|
||||
};
|
||||
|
||||
if (layout.layout) {
|
||||
collect(layout.layout as IJsonLayoutNode);
|
||||
}
|
||||
|
||||
if (layout.borders) {
|
||||
layout.borders.forEach((border: IJsonBorderNode) => {
|
||||
if (border.children) {
|
||||
border.children.forEach((child) => collect(child as IJsonLayoutNode));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return panelIds;
|
||||
}
|
||||
|
||||
private static clearBorders(layout: IJsonModel): void {
|
||||
if (layout.borders) {
|
||||
layout.borders = layout.borders.map((border: IJsonBorderNode) => ({
|
||||
...border,
|
||||
children: []
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
private static removePanels(node: IJsonLayoutNode, removedPanelIds: string[]): boolean {
|
||||
if (!hasChildren(node)) return false;
|
||||
|
||||
const originalLength = node.children.length;
|
||||
node.children = node.children.filter((child) => {
|
||||
if (isTabNode(child)) {
|
||||
return !removedPanelIds.includes(child.id || '');
|
||||
}
|
||||
return true;
|
||||
}) as any;
|
||||
|
||||
if (isTabsetNode(node) && node.children.length < originalLength) {
|
||||
if (node.selected !== undefined && node.selected >= node.children.length) {
|
||||
node.selected = Math.max(0, node.children.length - 1);
|
||||
}
|
||||
}
|
||||
|
||||
node.children.forEach((child) => this.removePanels(child as IJsonLayoutNode, removedPanelIds));
|
||||
|
||||
return node.children.length < originalLength;
|
||||
}
|
||||
|
||||
private static findNewPanels(node: IJsonLayoutNode, newPanelIds: string[]): IJsonTabNode[] {
|
||||
const newPanelTabs: IJsonTabNode[] = [];
|
||||
const find = (n: IJsonLayoutNode) => {
|
||||
if (isTabNode(n) && n.id && newPanelIds.includes(n.id)) {
|
||||
newPanelTabs.push(n);
|
||||
}
|
||||
if (hasChildren(n)) {
|
||||
n.children.forEach((child) => find(child as IJsonLayoutNode));
|
||||
}
|
||||
};
|
||||
find(node);
|
||||
return newPanelTabs;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将新面板添加到中心区域
|
||||
* Add new panels to center area
|
||||
*
|
||||
* @param node - 布局节点 | Layout node
|
||||
* @param newPanelTabs - 新面板 tab 数据 | New panel tab data
|
||||
* @param panelPositionMap - 面板位置映射 | Panel position map
|
||||
* @returns 是否成功添加 | Whether successfully added
|
||||
*/
|
||||
private static addNewPanelsToCenter(
|
||||
node: IJsonLayoutNode,
|
||||
newPanelTabs: IJsonTabNode[],
|
||||
panelPositionMap: Map<string, string>
|
||||
): boolean {
|
||||
if (isTabsetNode(node)) {
|
||||
// 检查是否是中心 tabset（包含 center 位置的面板）
|
||||
// Check if this is center tabset (contains center position panels)
|
||||
const hasCenterPanel = node.children?.some((child) => {
|
||||
const id = child.id || '';
|
||||
const position = panelPositionMap.get(id);
|
||||
return position === 'center' || position === undefined;
|
||||
});
|
||||
|
||||
if (hasCenterPanel && node.children) {
|
||||
node.children.push(...newPanelTabs);
|
||||
node.selected = node.children.length - 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasChildren(node)) {
|
||||
for (const child of node.children) {
|
||||
if (this.addNewPanelsToCenter(child as IJsonLayoutNode, newPanelTabs, panelPositionMap)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user