@ives_xxz/framework 1.2.5 → 1.2.6
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 +14 -19
- package/package.json +1 -1
|
@@ -123,22 +123,18 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
|
|
|
123
123
|
|
|
124
124
|
let ctr = new data.type();
|
|
125
125
|
|
|
126
|
-
if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
|
|
127
|
-
this.layerQueue.add(ctr.layerData);
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
126
|
/** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
|
|
132
|
-
if (
|
|
133
|
-
this.layerRegistry.has(data.type) &&
|
|
134
|
-
!ctr.isRepeatOpen &&
|
|
135
|
-
ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
|
|
136
|
-
) {
|
|
127
|
+
if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
|
|
137
128
|
return;
|
|
138
129
|
}
|
|
139
130
|
|
|
140
131
|
this.layerRegistry.add(data.type);
|
|
141
132
|
|
|
133
|
+
if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
|
|
134
|
+
this.layerQueue.add(ctr.layerData);
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
|
|
142
138
|
ctr.initialize();
|
|
143
139
|
|
|
144
140
|
const layerData = this.createLayerData(ctr);
|
|
@@ -200,17 +196,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
|
|
|
200
196
|
}
|
|
201
197
|
let ctr = new data.type();
|
|
202
198
|
|
|
203
|
-
|
|
204
|
-
|
|
199
|
+
/** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
|
|
200
|
+
if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
|
|
205
201
|
return;
|
|
206
202
|
}
|
|
207
203
|
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
|
|
213
|
-
) {
|
|
204
|
+
this.layerRegistry.add(data.type);
|
|
205
|
+
|
|
206
|
+
if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
|
|
207
|
+
this.layerQueue.add(ctr.layerData);
|
|
214
208
|
return;
|
|
215
209
|
}
|
|
216
210
|
|
|
@@ -251,7 +245,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
|
|
|
251
245
|
if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
|
|
252
246
|
this.layerStack.push(layerData);
|
|
253
247
|
}
|
|
254
|
-
|
|
248
|
+
|
|
249
|
+
this.layerRegistry.delete(data.type);
|
|
255
250
|
|
|
256
251
|
const proxy = new Proxy(ctr, {
|
|
257
252
|
get: (target, prop) => {
|