@zhongguo168a/yxeditor-common 0.0.151 → 0.0.153

package/dist/index.esm.js

@@ -4378,6 +4378,7 @@ class ViewModel extends EventDispatcher {
             }
             routeViews.set(route.key, this);
         }
+        this._result = false;
         this.state = ViewState.Opening;
         this.dispatch(ViewEvent.Opening);
         //
@@ -4408,6 +4409,7 @@ class ViewModel extends EventDispatcher {
         if (route) {
             routeViews.delete(this._route.key);
         }
+        this._result = false;
         this.state = ViewState.Closeing;
         this.dispatch(ViewEvent.Closeing);
         try {
@@ -4437,6 +4439,7 @@ class ViewModel extends EventDispatcher {
     }
     stop(reason) {
         try {
+            this._result = false;
             this._reason = reason;
             this.onStop();
         }
@@ -4451,20 +4454,17 @@ 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("closed", this, opened);
-                        this._result = true;
                         resolve(this);
                     };
                     let canceled = () => {
                         this.off("opened", this, opened);
                         this.off("closed", this, opened);
-                        this._result = false;
                         resolve(this);
                     };
                     this.on("opened", this, opened);
@@ -4474,14 +4474,12 @@ class ViewModel extends EventDispatcher {
                 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);
                 });
         }
@@ -4522,6 +4520,7 @@ class ViewModel extends EventDispatcher {
         this.state = ViewState.Opened;
         // @ts-ignore
         this._waitOpenComplete = false;
+        this._result = true;
         this.onOpened();
         this.dispatch(ViewEvent.Opened);
     }
@@ -4535,6 +4534,7 @@ class ViewModel extends EventDispatcher {
         }
         routeViews.delete(this.getIdent());
         this._waitCloseComplete = false;
+        this._result = true;
         this.state = ViewState.Closed;
         this.dispatch(ViewEvent.Closed);
         this.onClosed();