@ives_xxz/framework 1.2.6 → 1.2.7
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.
- package/manager/FWLayerManager.ts +18 -0
- package/package.json +1 -1
|
@@ -132,9 +132,18 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
|
|
|
132
132
|
|
|
133
133
|
if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
|
|
134
134
|
this.layerQueue.add(ctr.layerData);
|
|
135
|
+
this.layerRegistry.delete(data.type);
|
|
135
136
|
return;
|
|
136
137
|
}
|
|
137
138
|
|
|
139
|
+
if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
|
|
140
|
+
for (const [key, value] of this.layerMap) {
|
|
141
|
+
if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
|
|
142
|
+
return this.layerMap.get(value.uuid).controller as Ctr;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
138
147
|
ctr.initialize();
|
|
139
148
|
|
|
140
149
|
const layerData = this.createLayerData(ctr);
|
|
@@ -205,9 +214,18 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
|
|
|
205
214
|
|
|
206
215
|
if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
|
|
207
216
|
this.layerQueue.add(ctr.layerData);
|
|
217
|
+
this.layerRegistry.delete(data.type);
|
|
208
218
|
return;
|
|
209
219
|
}
|
|
210
220
|
|
|
221
|
+
if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
|
|
222
|
+
for (const [key, value] of this.layerMap) {
|
|
223
|
+
if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
|
|
224
|
+
return this.layerMap.get(value.uuid).controller as Ctr;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
211
229
|
ctr.initialize();
|
|
212
230
|
|
|
213
231
|
const layerData = this.createLayerData(ctr);
|