@zhongguo168a/yxeditor-common 0.0.62 → 0.0.65

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Node, Prefab, ISchedulable, AssetManager, Asset, SpriteAtlas, Camera, Canvas, Vec2, Vec3, Vec4, Widget, UITransform, math } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, ISchedulable, AssetManager, Asset, SpriteAtlas, Camera, Canvas, Vec2, Vec3, Vec4, Widget, UITransform, math } from 'cc';
 
 interface IError {
     isCancel(): boolean;
@@ -1185,6 +1185,11 @@ declare class RouteView extends EventDispatcher {
     openComplete(): void;
     waitCloseComplete(): void;
     closeComplete(): void;
+    /**
+     *
+     * @param asset 通过此方法创建的节点，自动添加 RouteComponent 到节点上
+     */
+    createNode(asset: Prefab): void;
     protected _waitOpenComplete: boolean;
     protected _waitCloseComplete: boolean;
     get controller(): RouteController;
@@ -1304,6 +1309,11 @@ declare class ViewRepo extends ViewDict {
     getByRoute(route: Route): RouteView;
     listByRoutePath(path: string): ViewList;
     listByTags(tags: string[]): ViewList;
+    /**
+     *
+     * @param target 往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
+     */
+    tailRouteView(node: Node): RouteView;
     protected getController(name: string): RouteController;
     protected _indexLayer: {};
     protected _indexRoute: {};

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, director, macro, Scheduler, math, instantiate, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, ImageAsset, JsonAsset, TextAsset, Asset, Texture2D, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, director, macro, Scheduler, math, instantiate, _decorator, Component, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, ImageAsset, JsonAsset, TextAsset, Asset, Texture2D, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
 
 class NetUtil {
     // 获取URL的参数对象
@@ -3760,6 +3760,42 @@ class UIObjectRepo extends Dictionary {
  */
 var uirepo = new UIObjectRepo();
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+const { ccclass, property, menu } = _decorator;
+let RouteComponent = class RouteComponent extends Component {
+};
+RouteComponent = __decorate([
+    ccclass('RouteComponent')
+], RouteComponent);
+
 class ViewList extends List {
 }
 /**
@@ -3850,6 +3886,21 @@ class ViewRepo extends ViewDict {
         });
         return list;
     }
+    /**
+     *
+     * @param target 往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
+     */
+    tailRouteView(node) {
+        let current = node;
+        while (current != null) {
+            let com = node.getComponent(RouteComponent);
+            if (com) {
+                return com.routeView;
+            }
+            current = node.parent;
+        }
+        return null;
+    }
     getController(name) {
         return ctrlrepo.get(name);
     }
@@ -3920,7 +3971,6 @@ class RouteView extends EventDispatcher {
             if (this._onOpen) {
                 this._onOpen(this);
             }
-            // @ts-ignore
             if (!this._waitOpenComplete) {
                 // 没有被打断，打开完成
                 this.openComplete();
@@ -3946,7 +3996,6 @@ class RouteView extends EventDispatcher {
             if (this._onClose) {
                 this._onClose(this);
             }
-            // @ts-ignore
             if (!this._waitCloseComplete) {
                 // 没有被打断，关闭完成
                 this.closeComplete();
@@ -4030,8 +4079,8 @@ class RouteView extends EventDispatcher {
         this._waitOpenComplete = true;
     }
     openComplete() {
-        if (!this._waitOpenComplete) {
-            throw "未执行 waitCloseComplete";
+        if (this.state == ViewState.Opened) {
+            return;
         }
         this.state = ViewState.Opened;
         // @ts-ignore
@@ -4046,8 +4095,8 @@ class RouteView extends EventDispatcher {
         this._waitCloseComplete = true;
     }
     closeComplete() {
-        if (!this._waitCloseComplete) {
-            throw "未执行 waitCloseComplete";
+        if (this.state == ViewState.Closed) {
+            return;
         }
         viewrepo.delete(this.route.key);
         this._waitCloseComplete = false;
@@ -4057,6 +4106,16 @@ class RouteView extends EventDispatcher {
             this._onClosed(this);
         }
     }
+    /**
+     *
+     * @param asset 通过此方法创建的节点，自动添加 RouteComponent 到节点上
+     */
+    createNode(asset) {
+        let node = instantiate(asset);
+        this.node = node;
+        let com = node.addComponent(RouteComponent);
+        com.routeView = this;
+    }
     get controller() {
         return this._controller;
     }