@zhongguo168a/yxeditor-common 0.0.147 → 0.0.149

package/dist/index.d.ts

@@ -1360,6 +1360,9 @@ declare class ViewModel extends EventDispatcher {
     protected _waitCloseComplete: boolean;
     get controller(): RouteController;
     get route(): Route;
+    /**
+     * 停止的原因
+     */
     get reason(): LinkError;
     node: Node;
     datas: MapObject;
@@ -1370,6 +1373,7 @@ declare class ViewModel extends EventDispatcher {
     protected _controller: RouteController;
     protected _route: Route;
     protected _reason: LinkError;
+    protected _result: boolean;
     protected _viewModelComponent: ViewModelComponent;
     protected onOpen(): void;
     protected onOpened(): void;

package/dist/index.esm.js

@@ -4335,6 +4335,7 @@ class ViewModel extends EventDispatcher {
         this.tags = new MapObject({});
         this.enableHistory = false;
         this.state = 0;
+        this._result = false;
         this.name = name;
     }
     /**
@@ -4436,6 +4437,7 @@ class ViewModel extends EventDispatcher {
     }
     stop(reason) {
         try {
+            this._reason = reason;
             this.onStop();
         }
         catch (e) {
@@ -4449,32 +4451,37 @@ class ViewModel extends EventDispatcher {
      * 如果返回 null，表示主动取消 [cancel]
      */
     wait() {
+        this._result = false;
         switch (this.state) {
             case ViewState.Opening:
                 return new Promise((resolve, reject) => {
                     let opened = () => {
                         this.off("opened", this, opened);
-                        this.off("canceled", this, opened);
+                        this.off("closed", this, opened);
+                        this._result = true;
                         resolve(this);
                     };
                     let canceled = () => {
                         this.off("opened", this, opened);
-                        this.off("canceled", this, opened);
+                        this.off("closed", this, opened);
+                        this._result = false;
                         resolve(this);
                     };
                     this.on("opened", this, opened);
-                    this.on("canceled", this, canceled);
+                    this.on("closed", this, canceled);
                 });
             case ViewState.Closeing:
                 return new Promise((resolve, reject) => {
                     let opened = () => {
                         this.off("closed", this, opened);
+                        this._result = true;
                         resolve(this);
                     };
                     this.on("closed", this, opened);
                 });
             default:
                 return new Promise((resolve, reject) => {
+                    this._result = true;
                     resolve(this);
                 });
         }
@@ -4538,6 +4545,9 @@ class ViewModel extends EventDispatcher {
     get route() {
         return this._route;
     }
+    /**
+     * 停止的原因
+     */
     get reason() {
         return this._reason;
     }