@zhongguo168a/yxeditor-common 0.0.44 → 0.0.46

package/dist/index.d.ts

@@ -1057,11 +1057,11 @@ declare class RouteView extends EventDispatcher {
     protected _waitCloseComplete: boolean;
     get controller(): RouteController;
     get route(): Route;
-    onOpen: () => void;
-    onOpened: () => void;
-    onClose: () => void;
-    onClosed: () => void;
-    onRefresh: () => void;
+    onOpen(value: () => void): this;
+    onOpened(value: () => void): this;
+    onClose(value: () => void): this;
+    onClosed(value: () => void): this;
+    onRefresh(value: () => void): this;
     node: Node;
     datas: {};
     tags: {};
@@ -1070,18 +1070,23 @@ declare class RouteView extends EventDispatcher {
     state: ViewState;
     protected _controller: RouteController;
     protected _route: Route;
+    private _onOpen;
+    private _onOpened;
+    private _onClose;
+    private _onClosed;
+    private _onRefresh;
 }
 
 declare class RouteController extends Controller {
     constructor(routePath: string);
-    open(...args: any[]): void;
+    open(...args: any[]): RouteView;
     /**
       * 当视图需要通过路由打开时，需要实现此方法
       * @param route
       */
     openByRoute(route?: Route): RouteView;
     protected refreshView(view: RouteView): void;
-    close(...args: any[]): void;
+    close(...args: any[]): RouteView;
     /**
      * 当视图需要通过路由关闭时，需要实现此方法
      * @param route

package/dist/index.esm.js

@@ -3611,7 +3611,7 @@ class RouteController extends Controller {
         this._route = new Route(routePath);
     }
     open(...args) {
-        this.openByRoute();
+        return this.openByRoute();
     }
     /**
       * 当视图需要通过路由打开时，需要实现此方法
@@ -3623,7 +3623,7 @@ class RouteController extends Controller {
     refreshView(view) {
     }
     close(...args) {
-        this.closeByRoute();
+        return this.closeByRoute();
     }
     /**
      * 当视图需要通过路由关闭时，需要实现此方法
@@ -3871,8 +3871,8 @@ class RouteView extends EventDispatcher {
         //
         try {
             //
-            if (this.onOpen) {
-                this.onOpen.call(this);
+            if (this._onOpen) {
+                this._onOpen.call(this);
             }
             // @ts-ignore
             if (!this._waitOpenComplete) {
@@ -3897,8 +3897,8 @@ class RouteView extends EventDispatcher {
         this.state = ViewState.Closeing;
         this.dispatch(ViewEvent.Closeing);
         try {
-            if (this.onClose) {
-                this.onClose.call(this);
+            if (this._onClose) {
+                this._onClose.call(this);
             }
             // @ts-ignore
             if (!this._waitCloseComplete) {
@@ -3916,16 +3916,8 @@ class RouteView extends EventDispatcher {
     }
     refresh() {
         try {
-            if (this.onRefresh) {
-                this.onClose.call(this);
-            }
-            // @ts-ignore
-            if (!this._waitCloseComplete) {
-                // 没有被打断，关闭完成
-                this.closeComplete();
-            }
-            else {
-                // 被打断了，等待完成1
+            if (this._onRefresh) {
+                this._onRefresh.call(this);
             }
         }
         catch (e) {
@@ -3981,8 +3973,8 @@ class RouteView extends EventDispatcher {
         this.state = ViewState.Opened;
         // @ts-ignore
         this._waitOpenComplete = false;
-        if (this.onOpened) {
-            this.onOpened.call(this);
+        if (this._onOpened) {
+            this._onOpened.call(this);
         }
         this.dispatch(ViewEvent.Opened);
     }
@@ -4005,6 +3997,26 @@ class RouteView extends EventDispatcher {
     get route() {
         return this._route;
     }
+    onOpen(value) {
+        this._onOpen = value;
+        return this;
+    }
+    onOpened(value) {
+        this._onOpened = value;
+        return this;
+    }
+    onClose(value) {
+        this._onClose = value;
+        return this;
+    }
+    onClosed(value) {
+        this._onClosed = value;
+        return this;
+    }
+    onRefresh(value) {
+        this._onRefresh = value;
+        return this;
+    }
 }
 
 class ViewHistory extends RouteList {