miniprogram/modular/Mask/Mask.ts

@@ -1,35 +1,6 @@
 import { Modular, Manager } from "../../core/Module";
 
-/**
- * 蒙版事件
- */
-type IMaskEvent = {
-
-    /**
-     * 蒙版显示事件
-     */
-    show: void;
-
-    /**
-     * 蒙版隐藏事件
-     */
-    hide: void;
-
-    /**
-     * 蒙版状态改变事件
-     */
-    change: boolean;
-
-    /**
-     * 蒙版点击事件
-     */
-    click: void;
-}
-
-/**
- * 蒙版 Modular
- */
-class Mask<M extends Manager> extends Modular<M, {}, IMaskEvent> {
+class Mask<M extends Manager> extends Modular<M> {
 
     /**
      * 动画运行时间
@@ -54,41 +25,22 @@ class Mask<M extends Manager> extends Modular<M, {}, IMaskEvent> {
 		isShow: false
 	};
 
-    /**
-     * 当点击时是否自动关闭蒙版
-     */
-    public autoCloseOnClick: boolean = true;
-
-    /**
-     * 消失动画计时器
-     */
 	private disappearTimer?: number;
 	
-    public override onLoad() {
-		this.setFunc(this.handleClickMask, "handleClickMask");
-        this.on("show", this.showMask);
-        this.on("hide", this.hideMask);
-    }
-	
 	/**
 	 * 显示蒙版
 	 */
-	private showMask = () => {
-
-        this.disappearTimer && clearTimeout(this.disappearTimer);
-
+	public showMask() {
 		this.setData({ 
             isShow: true,
             isDisplay: true
         });
-
-        this.emit("change", true);
 	}
 
 	/**
 	 * 隐藏蒙版
 	 */
-    private hideMask = () => {
+	public hideMask() {
 		this.setData({ 
             isShow: false 
         });
@@ -98,16 +50,15 @@ class Mask<M extends Manager> extends Modular<M, {}, IMaskEvent> {
                 isDisplay: false
             });
         }, Mask.animateTime);
-
-        this.emit("change", false);
 	}
 	
-    /**
-     * 处理蒙版点击事件
-     */
+	public override onLoad() {
+		this.setFunc(this.handleClickMask, "handleClickMask");
+        // Do something
+    }
+
 	private handleClickMask() {
-		if (this.autoCloseOnClick) this.emit("hide", void 0);
-        this.emit("click", void 0);
+		this.hideMask();
 	}
 }
 

miniprogram/pages/Account/UserCard.ts

@@ -5,15 +5,7 @@ type IUserCardDependent<M extends Manager> = {
     mask: Mask<M>
 }
 
-type IUserCardEvent = {
-
-    /**
-     * 主题更换按钮点击事件
-     */
-    clickChangeTheme: void;
-}
-
-class UserCard<M extends Manager> extends Modular<M, IUserCardDependent<M>, IUserCardEvent> {
+class UserCard<M extends Manager> extends Modular<M, IUserCardDependent<M>> {
 
     public override onLoad() {
         this.setFunc(this.handleChangeTheme, "changeTheme")
@@ -23,8 +15,7 @@ class UserCard<M extends Manager> extends Modular<M, IUserCardDependent<M>, IUse
      * 处理主题更换
      */
     private handleChangeTheme() {
-        this.depends?.mask.emit("show", void 0);
-        this.emit("clickChangeTheme", void 0);
+        this.depends?.mask.showMask();
     }
 }