@zhongguo168a/yxeditor-common 0.0.89 → 0.0.91

package/dist/index.d.ts

@@ -1326,6 +1326,8 @@ declare class ViewModel extends EventDispatcher {
     closeComplete(): void;
     protected _waitOpenComplete: boolean;
     protected _waitCloseComplete: boolean;
+    get controller(): RouteController;
+    get route(): Route;
     get reason(): LinkError;
     node: Node;
     datas: MapObject;
@@ -1352,7 +1354,7 @@ declare class ViewList extends List<ViewModel> {
 /**
  * 路由唯一编号->视图
  */
-declare class ViewDict extends Dictionary<string, any> {
+declare class ViewDict extends Dictionary<string, ViewModel> {
     /**
   * 关闭相斥的视图对象
   * 1. 关闭同一层的所有视图对象
@@ -1364,11 +1366,6 @@ declare class ViewDict extends Dictionary<string, any> {
     closeExclusion(validFunc?: (existed: ViewModel) => boolean): ViewList;
     listByRoutePath(path: string): ViewList;
     listByTags(tags: string[]): ViewList;
-    /**
-     *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
-     * @param node
-     */
-    tailNode(node: Node): ViewModel;
 }
 declare class RouteViewDict extends ViewDict {
     constructor();
@@ -1385,10 +1382,10 @@ declare class RouteViewDict extends ViewDict {
      * @param route
      */
     refresh(route: Route): void;
-    getByRoute(route: Route): RouteView;
+    getByRoute(route: Route): ViewModel;
     protected getController(name: string): RouteController;
 }
-declare const routeviews: RouteViewDict;
+declare const routeViews: RouteViewDict;
 
 /**
  * 事件字符串分隔符
@@ -2180,5 +2177,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: WidgetUtil;
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -4067,42 +4067,6 @@ class RouteView extends EventDispatcher {
     }
 }
 
-/******************************************************************************
-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 ViewModelComponent = class ViewModelComponent extends Component {
-};
-ViewModelComponent = __decorate([
-    ccclass('ViewModelComponent')
-], ViewModelComponent);
-
 class ViewList extends List {
 }
 /**
@@ -4150,21 +4114,6 @@ class ViewDict extends Dictionary {
         });
         return list;
     }
-    /**
-     *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
-     * @param node
-     */
-    tailNode(node) {
-        let current = node;
-        while (current != null) {
-            let com = current.getComponent(ViewModelComponent);
-            if (com) {
-                return com.viewModel;
-            }
-            current = current.parent;
-        }
-        return null;
-    }
 }
 class RouteViewDict extends ViewDict {
     constructor() {
@@ -4209,22 +4158,74 @@ class RouteViewDict extends ViewDict {
         return ctrlrepo.get(name);
     }
 }
-const routeviews = new RouteViewDict();
+const routeViews = new RouteViewDict();
 
 class ViewHistory extends RouteList {
     back() {
         if (viewhistorys.length == 0) {
             return;
         }
-        routeviews.close(viewhistorys.shift());
+        routeViews.close(viewhistorys.shift());
         if (viewhistorys.length == 0) {
             return;
         }
-        routeviews.open(viewhistorys.last());
+        routeViews.open(viewhistorys.last());
     }
 }
 const viewhistorys = new ViewHistory();
 
+/******************************************************************************
+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;
+};
+
+var ViewModelComponent_1;
+const { ccclass, property, menu } = _decorator;
+let ViewModelComponent = ViewModelComponent_1 = class ViewModelComponent extends Component {
+    /**
+      *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
+      * @param node
+      */
+    static tailNode(node) {
+        let current = node;
+        while (current != null) {
+            let com = current.getComponent(ViewModelComponent_1);
+            if (com) {
+                return com.viewModel;
+            }
+            current = current.parent;
+        }
+        return null;
+    }
+};
+ViewModelComponent = ViewModelComponent_1 = __decorate([
+    ccclass('ViewModelComponent')
+], ViewModelComponent);
+
 class ViewModel extends EventDispatcher {
     /**
      * 视图模型的名称
@@ -4274,10 +4275,10 @@ class ViewModel extends EventDispatcher {
         }
         let route = this._route;
         if (route) {
-            if (routeviews.get(route.key)) {
+            if (routeViews.get(route.key)) {
                 throw `视图已存在: route=${route.key}`;
             }
-            routeviews.set(route.key, this);
+            routeViews.set(route.key, this);
         }
         this.state = ViewState.Opening;
         this.dispatch(ViewEvent.Opening);
@@ -4306,7 +4307,7 @@ class ViewModel extends EventDispatcher {
         }
         let route = this._route;
         if (route) {
-            routeviews.delete(this._route.key);
+            routeViews.delete(this._route.key);
         }
         this.state = ViewState.Closeing;
         this.dispatch(ViewEvent.Closeing);
@@ -4406,12 +4407,18 @@ class ViewModel extends EventDispatcher {
         if (this.state == ViewState.Closed) {
             return;
         }
-        routeviews.delete(this.getIdent());
+        routeViews.delete(this.getIdent());
         this._waitCloseComplete = false;
         this.state = ViewState.Closed;
         this.dispatch(ViewEvent.Closed);
         this.onClosed();
     }
+    get controller() {
+        return this._controller;
+    }
+    get route() {
+        return this._route;
+    }
     get reason() {
         return this._reason;
     }
@@ -6846,5 +6853,5 @@ class WidgetUtil {
 }
 var widgetutil = new WidgetUtil();
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 //# sourceMappingURL=index.esm.js.map