lywsvip/oops-plugin-framework
1
0
Fork 0
mirror of https://gitee.com/dgflash/oops-plugin-framework.git synced 2026-05-08 11:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

LayerPopUp.onAdded如果使用Promise，会等Promise中的流程处理完后，显示PopUp层的遮罩

Browse Source
This commit is contained in:
dgflash
2025-09-04 15:35:26 +08:00
parent 765145a357
commit a86573acec
2 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/core/gui/layer/LayerDialog.ts
View File

@@ -65,7 +65,7 @@ export class LayerDialog extends LayerPopUp {
setTimeout(this.next.bind(this), 0);
}
protected setBlackDisable() {
protected closeUI() {
if (this.params.length == 0) {
this.black.enabled = false;
this.closeVacancyRemove();

64
assets/core/gui/layer/LayerPopup.ts
View File

@@ -25,38 +25,36 @@ export class LayerPopUp extends LayerUI {
}
private onChildAdded(child: Node) {
if (this.mask) {
this.mask.setSiblingIndex(this.children.length - 2);
}
if (this.mask) this.mask.setSiblingIndex(this.children.length - 2);
}
private onChildRemoved(child: Node) {
if (this.mask) {
this.mask.setSiblingIndex(this.children.length - 2);
}
if (this.mask) this.mask.setSiblingIndex(this.children.length - 2);
}
protected async showUi(uip: UIParams): Promise<boolean> {
const r = await super.showUi(uip);
if (r) {
// 界面加载完成显示时，启动触摸非窗口区域关闭
this.openVacancyRemove(uip.config);
protected showUi(uip: UIParams): Promise<boolean> {
return new Promise(async (resolve) => {
const r = await super.showUi(uip);
if (r) {
// 界面加载完成显示时，启动触摸非窗口区域关闭
this.openVacancyRemove(uip.config);
// 界面加载完成显示时，层级事件阻挡
this.black.enabled = true;
}
return r;
// 界面加载完成显示时，层级事件阻挡
this.black.enabled = true;
}
resolve(r);
});
}
protected onCloseWindow(uip: UIParams) {
super.onCloseWindow(uip);
// 界面关闭后，关闭触摸事件阻挡、关闭触摸非窗口区域关闭、关闭遮罩
this.setBlackDisable();
this.closeUI();
}
/** 设置触摸事件阻挡 */
protected setBlackDisable() {
protected closeUI() {
// 所有弹窗关闭后，关闭事件阻挡功能
if (this.ui_nodes.size == 0) {
if (this.black) this.black.enabled = false;
@@ -77,9 +75,7 @@ export class LayerPopUp extends LayerUI {
}
}
if (flag) {
this.mask.parent = null;
}
if (flag) this.mask.parent = null;
}
/** 启动触摸非窗口区域关闭 */
@@ -93,19 +89,7 @@ export class LayerPopUp extends LayerUI {
this.black.enabled = false;
}
if (config.mask) {
this.mask.parent = this;
}
}
/** 触摸非窗口区域关闭 */
private onTouchEnd(event: EventTouch) {
if (this.ui_nodes.size > 0) {
let vp = this.ui_nodes.array[this.ui_nodes.size - 1];
if (vp.valid && vp.config.vacancy) {
this.remove(vp.config.prefab, vp.config.destroy);
}
}
if (config.mask) this.mask.parent = this;
}
/** 关闭触摸非窗口区域关闭 */
@@ -123,10 +107,18 @@ export class LayerPopUp extends LayerUI {
}
}
/** 触摸非窗口区域关闭 */
private onTouchEnd(event: EventTouch) {
if (this.ui_nodes.size > 0) {
let vp = this.ui_nodes.array[this.ui_nodes.size - 1];
if (vp.valid && vp.config.vacancy) {
this.remove(vp.config.prefab, vp.config.destroy);
}
}
}
clear(isDestroy: boolean) {
super.clear(isDestroy)
if (this.black) this.black.enabled = false;
this.closeVacancyRemove();
this.closeMask();
this.closeUI();
}
}