@zhongguo168a/yxeditor-common 0.0.88 → 0.0.90

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;
@@ -1347,12 +1349,12 @@ declare class ViewModel extends EventDispatcher {
     protected onStop(): void;
 }
 
-declare class ViewList extends List<RouteView> {
+declare class ViewList extends List<ViewModel> {
 }
 /**
  * 路由唯一编号->视图
  */
-declare class ViewDict extends Dictionary<string, any> {
+declare class ViewDict extends Dictionary<string, ViewModel> {
     /**
   * 关闭相斥的视图对象
   * 1. 关闭同一层的所有视图对象
@@ -1361,7 +1363,7 @@ declare class ViewDict extends Dictionary<string, any> {
   * @param validFunc 符合条件的视图对象会被关闭
   * @returns 被关闭的视图
   */
-    closeExclusion(validFunc?: (existed: RouteView) => boolean): ViewList;
+    closeExclusion(validFunc?: (existed: ViewModel) => boolean): ViewList;
     listByRoutePath(path: string): ViewList;
     listByTags(tags: string[]): ViewList;
     /**
@@ -1385,10 +1387,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 +2182,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

@@ -4128,7 +4128,6 @@ class ViewDict extends Dictionary {
             }
         });
         closedList.forEach((index, item) => {
-            item.controller;
             item.close();
         });
         return closedList;
@@ -4210,18 +4209,18 @@ 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();
@@ -4275,10 +4274,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);
@@ -4307,7 +4306,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);
@@ -4407,12 +4406,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;
     }
@@ -6847,5 +6852,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