@opensumi/ide-main-layout 3.8.3-next-1742981362.0 → 3.8.3-next-1743422663.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/browser/layout.service.d.ts +1 -32
  2. package/lib/browser/layout.service.d.ts.map +1 -1
  3. package/lib/browser/layout.service.js +66 -110
  4. package/lib/browser/layout.service.js.map +1 -1
  5. package/package.json +8 -8
  6. package/src/browser/layout.service.ts +53 -110
package/lib/browser/layout.service.d.ts CHANGED
@@ -33,38 +33,7 @@ export declare class LayoutService extends WithEventBus implements IMainLayoutSe
33
33
  didMount(): void;
34
34
  storeState(service: TabbarService, currentId?: string): void;
35
35
  onThemeChange(e: ThemeChangedEvent): void;
36
- private initializeLayout;
37
- private determineDefaultContainer;
38
- private getRestorePanelContainer;
39
- /**
40
- * 是否是有效的模块
41
- * @param panel
42
- * @param location
43
- * @returns
44
- */
45
- private isValidModule;
46
- /**
47
- * ContainerId 存在三种值类型，对应的处理模式如下：
48
- * 1. undefined: 采用首个注册的容器作为当前 containerId
49
- * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
50
- * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
51
- */
52
- private updateContainerId;
53
- /**
54
- * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
55
- * @param service
56
- * @param defaultContainer
57
- */
58
- private handleUndefinedContainer;
59
- /**
60
- * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
61
- * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
62
- * @param service
63
- * @param currentId
64
- * @param defaultContainer
65
- * @returns
66
- */
67
- private handleExistingContainer;
36
+ restoreTabbarService: (service: TabbarService) => Promise<void>;
68
37
  findTabbarServiceByContainerId(containerId: string): TabbarService | undefined;
69
38
  moveContainerTo(containerId: string, to: string): void;
70
39
  showDropAreaForContainer(containerId: string): void;
package/lib/browser/layout.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"layout.service.d.ts","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAYL,IAAI,EACJ,oBAAoB,EACpB,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,YAAY,EACZ,aAAa,EAEd,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,QAAQ,EAA+B,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAGL,kBAAkB,EAGlB,oBAAoB,EACrB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAkBjD,qBACa,aAAc,SAAQ,YAAa,YAAW,kBAAkB;IAE3E,OAAO,CAAC,QAAQ,CAAW;IAG3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+C;IAG7E,KAAK,EAAE,aAAa,CAAC;IAGrB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,WAAW,CAAc;IAGjC,OAAO,CAAC,SAAS,CAAY;IAG7B,OAAO,CAAC,iBAAiB,CAAqB;IAG9C,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO,CAAC,SAAS,CAAyC;IAE1D,OAAO,CAAC,cAAc,CAAyC;IAE/D,OAAO,CAAC,iBAAiB,CAA4C;IAErE,OAAO,CAAC,eAAe,CAAyD;IAEhF,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,KAAK,CAKN;IAEP,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,KAAK,CAAoB;IAGjC,SAAS,CAAC,WAAW,EAAE,mBAAmB,CAAC;IAG3C,SAAS,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IAElD,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAkB;IAElD,QAAQ;IA0BR,UAAU,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM;IASrD,aAAa,CAAC,CAAC,EAAE,iBAAiB;IAclC,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,yBAAyB;IAwBjC,OAAO,CAAC,wBAAwB;IAgBhC;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAKrB;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB;IAUzB;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAQhC;;;;;;;OAOG;IACH,OAAO,CAAC,uBAAuB;IAgB/B,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAY9E,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IA6BtD,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAgBnD,YAAY,IAAI,IAAI;IAWpB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAStC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAqBzF,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,sBAAsB;IAkB9B,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAmCjC,sBAAsB;IAItB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;IAS5D,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAatE,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS;IASpE,eAAe,IAAI,YAAY;IAM/B,YAAY,IAAI,YAAY;IAM5B,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM;IAkBhD,OAAO,CAAC,mBAAmB,CAAqF;IAEhH,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,MAAM;IAoCpG,uBAAuB,CAAC,MAAM,EAAE,MAAM;IAStC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,GAAE,GAAQ,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM;IAoC9G,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,eAAe,CAA0B;IAGjD,OAAO,CAAC,eAAe;IAUvB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG;IAkB5C,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAoBnC,UAAU,CAAC,MAAM,EAAE,MAAM;IAYzB,gBAAgB,CAAC,WAAW,EAAE,MAAM;IAiBpC,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAanC,IAAI,cAAc,IAAI,OAAO,CAI5B;CACF"}
1
+ {"version":3,"file":"layout.service.d.ts","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}
package/lib/browser/layout.service.js CHANGED
@@ -42,6 +42,71 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
42
42
  this.customViews = new Map();
43
43
  this.debug = (0, ide_core_common_1.getDebugLogger)();
44
44
  this.viewReady = new ide_core_common_1.Deferred();
45
+ this.restoreTabbarService = async (service) => {
46
+ var _a;
47
+ this.state = (0, components_1.fixLayout)(this.layoutState.getState(layout_state_1.LAYOUT_STATE.MAIN, defaultLayoutState));
48
+ const { currentId, size } = this.state[service.location] || {};
49
+ service.prevSize = size;
50
+ let defaultContainer = service.visibleContainers[0] && service.visibleContainers[0].options.containerId;
51
+ const defaultPanels = this.appConfig.defaultPanels;
52
+ const restorePanel = defaultPanels && defaultPanels[service.location];
53
+ if (defaultPanels && restorePanel !== undefined) {
54
+ if (restorePanel) {
55
+ if (service.containersMap.has(restorePanel)) {
56
+ defaultContainer = restorePanel;
57
+ }
58
+ else {
59
+ const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
60
+ if (componentInfo &&
61
+ ((_a = this.appConfig.layoutConfig[service.location]) === null || _a === void 0 ? void 0 : _a.modules) &&
62
+ ~this.appConfig.layoutConfig[service.location].modules.indexOf(restorePanel)) {
63
+ defaultContainer = componentInfo.options.containerId;
64
+ }
65
+ else {
66
+ this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
67
+ }
68
+ }
69
+ }
70
+ else {
71
+ defaultContainer = '';
72
+ }
73
+ }
74
+ /**
75
+ * ContainerId 存在三种值类型，对应的处理模式如下：
76
+ * 1. undefined: 采用首个注册的容器作为当前 containerId
77
+ * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
78
+ * 3. '': 直接清空当前 containerId，不展开相应的 viewContainer
79
+ */
80
+ if ((0, ide_core_common_1.isUndefined)(currentId)) {
81
+ if ((0, ide_core_common_1.isUndefined)(defaultContainer)) {
82
+ // 默认采用首个注册的容器作为当前 containerId
83
+ service.updateNextContainerId();
84
+ }
85
+ else {
86
+ service.updateCurrentContainerId(defaultContainer);
87
+ }
88
+ }
89
+ else if (currentId && !this.isDropContainer(currentId)) {
90
+ if (service.containersMap.has(currentId)) {
91
+ service.updateCurrentContainerId(currentId);
92
+ }
93
+ else {
94
+ // 如果在别的 tabbar 中存在该 containerId，则将其移动到当前 tabbar
95
+ if (this.findTabbarServiceByContainerId(currentId)) {
96
+ this.moveContainerTo(currentId, service.location);
97
+ service.updateCurrentContainerId(currentId);
98
+ }
99
+ else {
100
+ service.updateCurrentContainerId(defaultContainer);
101
+ // 等待后续新容器注册时，更新当前的 containerId
102
+ service.updateNextContainerId(currentId);
103
+ }
104
+ }
105
+ }
106
+ else if (currentId === '' || this.isDropContainer(currentId)) {
107
+ service.updateCurrentContainerId('');
108
+ }
109
+ };
45
110
  this.holdTabbarComponent = new Map();
46
111
  // 时序保证用，view先注册，container后注册同样需要触发更新
47
112
  this.tabbarUpdateSet = new Set();
@@ -89,115 +154,6 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
89
154
  statusBarBackground: (_e = theme.getColor('statusBar.background')) === null || _e === void 0 ? void 0 : _e.toString(),
90
155
  }));
91
156
  }
92
- initializeLayout(service) {
93
- // 1. 获取初始状态
94
- this.state = (0, components_1.fixLayout)(this.layoutState.getState(layout_state_1.LAYOUT_STATE.MAIN, defaultLayoutState));
95
- const { currentId, size } = this.state[service.location] || {};
96
- service.prevSize = size;
97
- // 2. 确定默认容器
98
- const defaultContainer = this.determineDefaultContainer(service);
99
- // 3. 更新当前容器ID
100
- this.updateContainerId(service, currentId, defaultContainer);
101
- }
102
- determineDefaultContainer(service) {
103
- var _a, _b;
104
- // 获取默认可见容器
105
- const defaultVisibleContainer = ((_b = (_a = service.visibleContainers[0]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.containerId) || '';
106
- // 如果没有配置默认面板，直接返回默认可见容器
107
- const { defaultPanels } = this.appConfig;
108
- if (!defaultPanels) {
109
- return defaultVisibleContainer;
110
- }
111
- const restorePanel = defaultPanels[service.location];
112
- // 如果明确设置为false，返回空字符串
113
- if (!restorePanel) {
114
- return '';
115
- }
116
- // 如果未定义，返回默认可见容器
117
- if (restorePanel === undefined) {
118
- return defaultVisibleContainer;
119
- }
120
- // 处理restorePanel字符串情况
121
- return this.getRestorePanelContainer(service, restorePanel, service.location) || defaultVisibleContainer;
122
- }
123
- getRestorePanelContainer(service, restorePanel, location) {
124
- var _a;
125
- // 直接使用已存在的容器
126
- if (service.containersMap.has(restorePanel)) {
127
- return restorePanel;
128
- }
129
- // 尝试从 componentRegistry 获取容器
130
- const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
131
- if (componentInfo && this.isValidModule(restorePanel, location)) {
132
- return ((_a = componentInfo.options) === null || _a === void 0 ? void 0 : _a.containerId) || '';
133
- }
134
- this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
135
- return '';
136
- }
137
- /**
138
- * 是否是有效的模块
139
- * @param panel
140
- * @param location
141
- * @returns
142
- */
143
- isValidModule(panel, location) {
144
- var _a;
145
- const modules = (_a = this.appConfig.layoutConfig[location]) === null || _a === void 0 ? void 0 : _a.modules;
146
- return modules ? modules.includes(panel) : false;
147
- }
148
- /**
149
- * ContainerId 存在三种值类型，对应的处理模式如下：
150
- * 1. undefined: 采用首个注册的容器作为当前 containerId
151
- * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
152
- * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
153
- */
154
- updateContainerId(service, currentId, defaultContainer) {
155
- if ((0, ide_core_common_1.isUndefined)(currentId)) {
156
- this.handleUndefinedContainer(service, defaultContainer);
157
- }
158
- else if (currentId && !this.isDropContainer(currentId)) {
159
- this.handleExistingContainer(service, currentId, defaultContainer);
160
- }
161
- else {
162
- service.updateCurrentContainerId(defaultContainer || '');
163
- }
164
- }
165
- /**
166
- * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
167
- * @param service
168
- * @param defaultContainer
169
- */
170
- handleUndefinedContainer(service, defaultContainer) {
171
- if ((0, ide_core_common_1.isUndefined)(defaultContainer)) {
172
- service.updateNextContainerId();
173
- }
174
- else {
175
- service.updateCurrentContainerId(defaultContainer);
176
- }
177
- }
178
- /**
179
- * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
180
- * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
181
- * @param service
182
- * @param currentId
183
- * @param defaultContainer
184
- * @returns
185
- */
186
- handleExistingContainer(service, currentId, defaultContainer) {
187
- if (service.containersMap.has(currentId)) {
188
- service.updateCurrentContainerId(currentId);
189
- return;
190
- }
191
- const tabbarService = this.findTabbarServiceByContainerId(currentId);
192
- if (tabbarService) {
193
- this.moveContainerTo(currentId, service.location);
194
- service.updateCurrentContainerId(currentId);
195
- }
196
- else {
197
- service.updateCurrentContainerId(defaultContainer);
198
- service.updateNextContainerId(currentId);
199
- }
200
- }
201
157
  findTabbarServiceByContainerId(containerId) {
202
158
  let tabbarService;
203
159
  for (const value of this.tabbarServices.values()) {
@@ -326,7 +282,7 @@ let LayoutService = class LayoutService extends ide_core_browser_1.WithEventBus
326
282
  }));
327
283
  service.viewReady.promise
328
284
  .then(() => service.restoreState())
329
- .then(() => this.initializeLayout(service))
285
+ .then(() => this.restoreTabbarService(service))
330
286
  .catch((err) => {
331
287
  this.logger.error(`[TabbarService:${location}] restore state error`, err);
332
288
  });
package/lib/browser/layout.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"layout.service.js","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AAEvC,qCAA+E;AAC/E,iEAgBoC;AACpC,0EAAsE;AACtE,qFAA+F;AAE/F,mEAMkD;AAClD,+DAAkF;AAClF,mDAAwD;AAExD,sCAOmB;AAEnB,qEAAiE;AACjE,4DAAwD;AACxD,qDAAiD;AAEjD,MAAM,kBAAkB,GAAG;IACzB,CAAC,+BAAY,CAAC,IAAI,CAAC,EAAE;QACnB,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE,SAAS;KAChB;IACD,CAAC,+BAAY,CAAC,KAAK,CAAC,EAAE;QACpB,mEAAmE;QACnE,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,SAAS;KAChB;IACD,CAAC,+BAAY,CAAC,MAAM,CAAC,EAAE;QACrB,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE,SAAS;KAChB;CACF,CAAC;AAGK,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,+BAAY;IAAxC;;QA+BG,cAAS,GAA+B,IAAI,GAAG,EAAE,CAAC;QAElD,mBAAc,GAA+B,IAAI,GAAG,EAAE,CAAC;QAEvD,sBAAiB,GAAkC,IAAI,GAAG,EAAE,CAAC;QAE7D,oBAAe,GAA+C,IAAI,GAAG,EAAE,CAAC;QAExE,uBAAkB,GAAwB,IAAI,GAAG,EAAE,CAAC;QAEpD,kBAAa,GAA6B,IAAI,GAAG,EAAE,CAAC;QAEpD,UAAK,GAKT,EAAE,CAAC;QAEC,gBAAW,GAAG,IAAI,GAAG,EAAgB,CAAC;QAEtC,UAAK,GAAG,IAAA,gCAAc,GAAE,CAAC;QAQ1B,cAAS,GAAmB,IAAI,0BAAQ,EAAE,CAAC;QAyY1C,wBAAmB,GAAG,IAAI,GAAG,EAA0E,CAAC;QAqGhH,qCAAqC;QAC7B,oBAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;IAkGnD,CAAC;IA/kBC,QAAQ;QACN,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;YAClE,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;gBAChC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACjE,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;gBAC7B,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAyB,EAAE,CAAC;QACtC,iEAAiE;QACjE,oBAAoB;QACpB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,IAAI,uCAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBACtF,uCAAuC;gBACvC,+DAA+D;gBAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,OAAsB,EAAE,SAAkB;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;YAC7B,SAAS;YACT,IAAI,EAAE,OAAO,CAAC,QAAQ;SACvB,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,2BAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAGD,aAAa,CAAC,CAAoB;;QAChC,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAC9B,YAAY,CAAC,OAAO,CAClB,OAAO,EACP,IAAI,CAAC,SAAS,CAAC;YACb,iBAAiB,EAAE,MAAA,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC,0CAAE,QAAQ,EAAE;YACtE,iBAAiB,EAAE,MAAA,KAAK,CAAC,QAAQ,CAAC,oBAAoB,CAAC,0CAAE,QAAQ,EAAE;YACnE,gBAAgB,EAAE,MAAA,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,0CAAE,QAAQ,EAAE;YACjE,eAAe,EAAE,MAAA,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,0CAAE,QAAQ,EAAE;YAC/D,mBAAmB,EAAE,MAAA,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,0CAAE,QAAQ,EAAE;SACxE,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,gBAAgB,CAAC,OAAsB;QAC7C,YAAY;QACZ,IAAI,CAAC,KAAK,GAAG,IAAA,sBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,2BAAY,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACzF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/D,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAExB,YAAY;QACZ,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEjE,cAAc;QACd,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAEO,yBAAyB,CAAC,OAAsB;;QACtD,WAAW;QACX,MAAM,uBAAuB,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,0CAAE,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;QAEzF,wBAAwB;QACxB,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QACzC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,uBAAuB,CAAC;QACjC,CAAC;QAED,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrD,sBAAsB;QACtB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,iBAAiB;QACjB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,uBAAuB,CAAC;QACjC,CAAC;QAED,sBAAsB;QACtB,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,uBAAuB,CAAC;IAC3G,CAAC;IAEO,wBAAwB,CAAC,OAAsB,EAAE,YAAoB,EAAE,QAAgB;;QAC7F,aAAa;QACb,IAAI,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5C,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,6BAA6B;QAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QACpF,IAAI,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;YAChE,OAAO,CAAA,MAAA,aAAa,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,YAAY,gBAAgB,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;OAKG;IACK,aAAa,CAAC,KAAa,EAAE,QAAgB;;QACnD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,0CAAE,OAAO,CAAC;QAC/D,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACK,iBAAiB,CAAC,OAAsB,EAAE,SAA6B,EAAE,gBAAwB;QACvG,IAAI,IAAA,6BAAW,EAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC3D,CAAC;aAAM,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,wBAAwB,CAAC,OAAsB,EAAE,gBAAwB;QAC/E,IAAI,IAAA,6BAAW,EAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,uBAAuB,CAAC,OAAsB,EAAE,SAAiB,EAAE,gBAAwB;QACjG,IAAI,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAClD,OAAO,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;YACnD,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,8BAA8B,CAAC,WAAmB;QAChD,IAAI,aAAwC,CAAC;QAC7C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,aAAa,GAAG,KAAK,CAAC;gBACtB,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,EAAU;;QAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAEpE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,SAAS,CAAA,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,WAAW,mBAAmB,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAE3C,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAExC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,MAAM,IAAI,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,WAAW,EAAE,CAAC;YAChG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,8BAAa,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7G,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,UAAW,CAAC,CAAC;IAC/C,CAAC;IAED,wBAAwB,CAAC,WAAmB;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,MAAK,OAAO,EAAE,CAAC;YACxC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,wBAAwB,CAAC,8BAAqB,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,MAAK,QAAQ,EAAE,CAAC;YACzC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,wBAAwB,CAAC,6BAAoB,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,YAAY;QACV,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,kBAAkB,CAAC,GAAG,EAAE,MAAK,8BAAqB,EAAE,CAAC;YACtE,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,kBAAkB,CAAC,GAAG,EAAE,MAAK,6BAAoB,EAAE,CAAC;YACpE,YAAY,CAAC,wBAAwB,CAAC,YAAY,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED,SAAS,CAAC,QAAgB;QACxB,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtD,OAAO,CAAC,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;IAClD,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YACnD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,SAAS,GAAG,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IACnD,CAAC;IAED,UAAU,CAAC,QAAgB,EAAE,IAA0B,EAAE,IAAyB;;QAChF,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,uEAAuE,QAAQ,eAAe,CAAC,CAAC;YACjH,OAAO;QACT,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,oBAAoB;YACpB,aAAa,CAAC,wBAAwB,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;QACrF,CAAC;aAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,aAAa,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,wBAAwB,CACpC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CACzF,CAAC;QACJ,CAAC;QACD,IAAI,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;YACnD,MAAA,aAAa,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,WAAmB;QACzC,OAAO,CAAC,8BAAqB,EAAE,6BAAoB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC7E,CAAC;IAEO,sBAAsB,CAAC,aAA4B;QACzD,MAAM,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAClE,IAAI,kBAAkB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpE,OAAO,kBAAkB,CAAC;QAC5B,CAAC;QACD,IAAI,aAAa,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAClG,OAAO,aAAa,CAAC,mBAAmB,CAAC;QAC3C,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;YACrD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,GAAG,CAAC;YACb,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,8BAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,UAAU,CAChB,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;gBACxC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACpC,2BAA2B;gBAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,yCAAsB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;gBACrF,IAAI,SAAS,IAAI,mCAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAClE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;oBAC7D,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,EAAE,CAAC;oBACpC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,yCAAsB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBACrF,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CACH,CAAC;YACF,OAAO,CAAC,SAAS,CAAC,OAAO;iBACtB,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;iBAClC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;iBAC1C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,uBAAuB,EAAE,GAAG,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;YACL,MAAM,mBAAmB,GAAG,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5G,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC9D,IAAI,QAAQ,KAAK,+BAAY,CAAC,MAAM,EAAE,CAAC;gBACrC,iEAAiE;gBACjE,MAAM,eAAe,GAAG,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;gBACtE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sBAAsB;QACpB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,SAAmB;QAC1D,IAAI,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oCAAgB,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAQ,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,OAAQ,CAAC;IAClB,CAAC;IAED,gBAAgB,CAAC,iBAAyB;QACxC,IAAI,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACnE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,yBAAyB,CAAC,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,WAAmB;QAC9B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACpD,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;YACxC,EAAE,EAAE,aAAM,CAAC,mBAAmB;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;YACxC,EAAE,EAAE,aAAM,CAAC,gBAAgB;SAC5B,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,WAAmB;QAC9C,IAAI,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,IAAI,QAA4B,CAAC;YACjC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnD,IAAI,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;oBACtC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;oBAC5B,MAAM;gBACR,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,EAAE,CAAC;gBACb,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,8BAAa,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACnG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,eAAgB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAID,sBAAsB,CAAC,KAAa,EAAE,OAA6B,EAAE,IAAY,EAAE,EAAQ;QACzF,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,yFAAyF,CAAC,CAAC;QAC7G,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAC/D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5E,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9D,2CAA2C;YAC3C,OAAO,CAAC,UAAU,CAChB,OAAO,CAAC,uBAAuB,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC,CAAC,CACH,CAAC;YACF,OAAO,CAAC,UAAU,CAChB,OAAO,CAAC,uBAAuB,CAAC,GAAG,EAAE;gBACnC,oCAAoC;gBACpC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;oBAC3C,iDAAiD;oBACjD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9E,CAAC;YACH,CAAC,CAAC,CACH,CAAC;YACF,OAAO,OAAO,CAAC,WAAW,CAAC;QAC7B,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAClD,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACzE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,WAAW,CAAC;IAC7B,CAAC;IAED,uBAAuB,CAAC,MAAc;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;IAED,oBAAoB,CAAC,IAAU,EAAE,WAAmB,EAAE,QAAa,EAAE,EAAE,OAA8B;QACnG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAClD,MAAM,gBAAgB,GAAqB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACjF,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAC,CAAC;QAEtD,uCAAuC;QACvC,IAAI,gBAAgB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACtC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,GAAG,CACpB,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,eAAe,CAAC,eAAe,CAClC;gBACE,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,QAAQ;aACvB,EACD;gBACE,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACpC,gDAAgD;oBAChD,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,4BAA4B,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5G,CAAC;aACF,CACF,CACF,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACzD,MAAM,SAAS,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;YAC5E,gBAAgB,CAAC,UAAU,CACzB,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC7C,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;oBAClB,SAAS,CAAC,OAAO,EAAE,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC;QACD,OAAO,SAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IAKD,sCAAsC;IAC9B,eAAe,CAAC,WAAmB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3D,aAAa,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;YACnG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACzC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,IAAU,EAAE,KAAW;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,oCAAoC,IAAI,CAAC,EAAE,yDAAyD,CACrG,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAY,EAAE,KAAK,EAAE;YACnD,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB,CAAC,MAAc;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,oCAAoC,MAAM,yDAAyD,CACpG,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAqB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAEjF,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,oCAAoC,MAAM,yDAAyD,CACpG,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAqB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACjF,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,WAAmB;QAClC,IAAI,QAA4B,CAAC;QACjC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACnD,IAAI,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAC5B,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACtD,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,WAAW,mBAAmB,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,YAAY,CAAC,MAAe;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,+BAAY,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,CAAC;YAC5C,aAAa,CAAC,wBAAwB,CACpC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACpC,aAAa,CAAC,mBAAmB;gBACjC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CACnD,CAAC;QACJ,CAAC;QACD,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,oBAAoB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,cAAc;QAChB,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,+BAAY,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,oBAAoB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QACjF,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;CACF,CAAA;AA7oBY,sCAAa;AAEhB;IADP,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACR,aAAQ;+CAAC;AAGV;IADhB,IAAA,cAAS,EAAC,+BAAsB,CAAC;;oDAC2C;AAG7E;IADC,IAAA,cAAS,EAAC,oBAAa,CAAC;sCAClB,oBAAa;4CAAC;AAGJ;IADhB,IAAA,cAAS,EAAC,kCAAe,CAAC;;sDACuB;AAGjC;IADhB,IAAA,cAAS,EAAC,iCAAc,CAAC;;qDACsB;AAGxC;IADP,IAAA,cAAS,GAAE;sCACS,0BAAW;kDAAC;AAGzB;IADP,IAAA,cAAS,EAAC,4BAAS,CAAC;;gDACQ;AAGrB;IADP,IAAA,cAAS,EAAC,qCAAkB,CAAC;;wDACgB;AAGtC;IADP,IAAA,cAAS,EAAC,oCAAiB,CAAC;;wDACgB;AAGrC;IADP,IAAA,cAAS,EAAC,0BAAO,CAAC;;6CACK;AA0Bd;IADT,IAAA,cAAS,EAAC,0BAAmB,CAAC;sCACR,0BAAmB;kDAAC;AAGjC;IADT,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACR,iCAA0B;yDAAC;AAuCzD;IADC,IAAA,0BAAO,EAAC,6BAAiB,CAAC;;6CACV,6BAAiB;;kDAYjC;wBA7GU,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CA6oBzB"}
1
+ {"version":3,"file":"layout.service.js","sourceRoot":"","sources":["../../src/browser/layout.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-main-layout",
3
- "version": "3.8.3-next-1742981362.0",
3
+ "version": "3.8.3-next-1743422663.0",
4
4
  "description": "@opensumi/ide-main-layout",
5
5
  "files": [
6
6
  "lib",
@@ -18,14 +18,14 @@
18
18
  "url": "git@github.com:opensumi/core.git"
19
19
  },
20
20
  "dependencies": {
21
- "@opensumi/ide-components": "3.8.3-next-1742981362.0",
22
- "@opensumi/ide-core-browser": "3.8.3-next-1742981362.0",
23
- "@opensumi/ide-core-common": "3.8.3-next-1742981362.0",
24
- "@opensumi/ide-theme": "3.8.3-next-1742981362.0"
21
+ "@opensumi/ide-components": "3.8.3-next-1743422663.0",
22
+ "@opensumi/ide-core-browser": "3.8.3-next-1743422663.0",
23
+ "@opensumi/ide-core-common": "3.8.3-next-1743422663.0",
24
+ "@opensumi/ide-theme": "3.8.3-next-1743422663.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@opensumi/ide-dev-tool": "3.8.3-next-1742981362.0",
28
- "@opensumi/ide-monaco": "3.8.3-next-1742981362.0"
27
+ "@opensumi/ide-dev-tool": "3.8.3-next-1743422663.0",
28
+ "@opensumi/ide-monaco": "3.8.3-next-1743422663.0"
29
29
  },
30
- "gitHead": "cd0ab83b96d80b093af5fbd6763decad3cd66448"
30
+ "gitHead": "ed5280be9fdee6af885db78d980e118698281934"
31
31
  }
package/src/browser/layout.service.ts CHANGED
@@ -172,122 +172,65 @@ export class LayoutService extends WithEventBus implements IMainLayoutService {
172
172
  );
173
173
  }
174
174
 
175
- private initializeLayout(service: TabbarService) {
176
- // 1. 获取初始状态
175
+ restoreTabbarService = async (service: TabbarService) => {
177
176
  this.state = fixLayout(this.layoutState.getState(LAYOUT_STATE.MAIN, defaultLayoutState));
177
+
178
178
  const { currentId, size } = this.state[service.location] || {};
179
179
  service.prevSize = size;
180
-
181
- // 2. 确定默认容器
182
- const defaultContainer = this.determineDefaultContainer(service);
183
-
184
- // 3. 更新当前容器ID
185
- this.updateContainerId(service, currentId, defaultContainer);
186
- }
187
-
188
- private determineDefaultContainer(service: TabbarService): string {
189
- // 获取默认可见容器
190
- const defaultVisibleContainer = service.visibleContainers[0]?.options?.containerId || '';
191
-
192
- // 如果没有配置默认面板，直接返回默认可见容器
193
- const { defaultPanels } = this.appConfig;
194
- if (!defaultPanels) {
195
- return defaultVisibleContainer;
196
- }
197
-
198
- const restorePanel = defaultPanels[service.location];
199
- // 如果明确设置为false，返回空字符串
200
- if (!restorePanel) {
201
- return '';
202
- }
203
- // 如果未定义，返回默认可见容器
204
- if (restorePanel === undefined) {
205
- return defaultVisibleContainer;
206
- }
207
-
208
- // 处理restorePanel字符串情况
209
- return this.getRestorePanelContainer(service, restorePanel, service.location) || defaultVisibleContainer;
210
- }
211
-
212
- private getRestorePanelContainer(service: TabbarService, restorePanel: string, location: string): string {
213
- // 直接使用已存在的容器
214
- if (service.containersMap.has(restorePanel)) {
215
- return restorePanel;
216
- }
217
-
218
- // 尝试从 componentRegistry 获取容器
219
- const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
220
- if (componentInfo && this.isValidModule(restorePanel, location)) {
221
- return componentInfo.options?.containerId || '';
180
+ let defaultContainer = service.visibleContainers[0] && service.visibleContainers[0].options!.containerId;
181
+ const defaultPanels = this.appConfig.defaultPanels;
182
+ const restorePanel = defaultPanels && defaultPanels[service.location];
183
+ if (defaultPanels && restorePanel !== undefined) {
184
+ if (restorePanel) {
185
+ if (service.containersMap.has(restorePanel)) {
186
+ defaultContainer = restorePanel;
187
+ } else {
188
+ const componentInfo = this.componentRegistry.getComponentRegistryInfo(restorePanel);
189
+ if (
190
+ componentInfo &&
191
+ this.appConfig.layoutConfig[service.location]?.modules &&
192
+ ~this.appConfig.layoutConfig[service.location].modules.indexOf(restorePanel)
193
+ ) {
194
+ defaultContainer = componentInfo.options!.containerId;
195
+ } else {
196
+ this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
197
+ }
198
+ }
199
+ } else {
200
+ defaultContainer = '';
201
+ }
222
202
  }
223
-
224
- this.logger.warn(`[defaultPanels] No \`${restorePanel}\` view found!`);
225
- return '';
226
- }
227
-
228
- /**
229
- * 是否是有效的模块
230
- * @param panel
231
- * @param location
232
- * @returns
233
- */
234
- private isValidModule(panel: string, location: string): boolean {
235
- const modules = this.appConfig.layoutConfig[location]?.modules;
236
- return modules ? modules.includes(panel) : false;
237
- }
238
-
239
- /**
240
- * ContainerId 存在三种值类型，对应的处理模式如下：
241
- * 1. undefined: 采用首个注册的容器作为当前 containerId
242
- * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
243
- * 3. '': 使用 defaultContainer 作为当前 containerId, 如果 defaultContainer 不存在，则清空
244
- */
245
- private updateContainerId(service: TabbarService, currentId: string | undefined, defaultContainer: string) {
203
+ /**
204
+ * ContainerId 存在三种值类型，对应的处理模式如下：
205
+ * 1. undefined: 采用首个注册的容器作为当前 containerId
206
+ * 2. string: 非 drop container 直接使用该 containerId 作为当前 containerId
207
+ * 3. '': 直接清空当前 containerId，不展开相应的 viewContainer
208
+ */
246
209
  if (isUndefined(currentId)) {
247
- this.handleUndefinedContainer(service, defaultContainer);
210
+ if (isUndefined(defaultContainer)) {
211
+ // 默认采用首个注册的容器作为当前 containerId
212
+ service.updateNextContainerId();
213
+ } else {
214
+ service.updateCurrentContainerId(defaultContainer);
215
+ }
248
216
  } else if (currentId && !this.isDropContainer(currentId)) {
249
- this.handleExistingContainer(service, currentId, defaultContainer);
250
- } else {
251
- service.updateCurrentContainerId(defaultContainer || '');
252
- }
253
- }
254
-
255
- /**
256
- * 如果当前 containerId 未定义，则将相邻的 containerId 作为当前 containerId
257
- * @param service
258
- * @param defaultContainer
259
- */
260
- private handleUndefinedContainer(service: TabbarService, defaultContainer: string) {
261
- if (isUndefined(defaultContainer)) {
262
- service.updateNextContainerId();
263
- } else {
264
- service.updateCurrentContainerId(defaultContainer);
265
- }
266
- }
267
-
268
- /**
269
- * 如果当前 containerId 已存在，则直接使用该 containerId 作为当前 containerId
270
- * 若不存在，则将当前 containerId 移动到相应的 tabbar 中
271
- * @param service
272
- * @param currentId
273
- * @param defaultContainer
274
- * @returns
275
- */
276
- private handleExistingContainer(service: TabbarService, currentId: string, defaultContainer: string) {
277
- if (service.containersMap.has(currentId)) {
278
- service.updateCurrentContainerId(currentId);
279
- return;
280
- }
281
-
282
- const tabbarService = this.findTabbarServiceByContainerId(currentId);
283
- if (tabbarService) {
284
- this.moveContainerTo(currentId, service.location);
285
- service.updateCurrentContainerId(currentId);
286
- } else {
287
- service.updateCurrentContainerId(defaultContainer);
288
- service.updateNextContainerId(currentId);
217
+ if (service.containersMap.has(currentId)) {
218
+ service.updateCurrentContainerId(currentId);
219
+ } else {
220
+ // 如果在别的 tabbar 中存在该 containerId，则将其移动到当前 tabbar
221
+ if (this.findTabbarServiceByContainerId(currentId)) {
222
+ this.moveContainerTo(currentId, service.location);
223
+ service.updateCurrentContainerId(currentId);
224
+ } else {
225
+ service.updateCurrentContainerId(defaultContainer);
226
+ // 等待后续新容器注册时，更新当前的 containerId
227
+ service.updateNextContainerId(currentId);
228
+ }
229
+ }
230
+ } else if (currentId === '' || this.isDropContainer(currentId)) {
231
+ service.updateCurrentContainerId('');
289
232
  }
290
- }
233
+ };
291
234
 
292
235
  findTabbarServiceByContainerId(containerId: string): TabbarService | undefined {
293
236
  let tabbarService: undefined | TabbarService;
@@ -433,7 +376,7 @@ export class LayoutService extends WithEventBus implements IMainLayoutService {
433
376
  );
434
377
  service.viewReady.promise
435
378
  .then(() => service.restoreState())
436
- .then(() => this.initializeLayout(service))
379
+ .then(() => this.restoreTabbarService(service))
437
380
  .catch((err) => {
438
381
  this.logger.error(`[TabbarService:${location}] restore state error`, err);
439
382
  });