@zhongguo168a/yxeditor-common 0.0.86 → 0.0.87

package/dist/index.d.ts

@@ -778,10 +778,10 @@ declare class Dictionary<K = string, V = any> {
     groupByKey(keyCreator: (key: K, val: V) => string, ITEM_CLASS?: any): {
         [key: string]: any;
     };
-    countByKeyList(keyCreator: (key: any, val: any) => string[]): {
+    countByKeyList(keyCreator: (key: K, val: V) => string[]): {
         [key: string]: number;
     };
-    countByKey(keyCreator: (key: any, val: any) => string): {
+    countByKey(keyCreator: (key: K, val: V) => string): {
         [key: string]: number;
     };
     protected size: number;
@@ -1283,14 +1283,94 @@ declare class ViewHistory extends RouteList {
 }
 declare const viewhistorys: ViewHistory;
 
+declare class ViewModel extends EventDispatcher {
+    /**
+     * 视图模型的名称
+     * @param name
+     */
+    constructor(name: string);
+    /**
+     * 视图模型的编号
+     * 默认为视图模型的类型，表示该模型在应用中唯一
+     * 如果应用中，存在多个
+     * @returns
+     */
+    getIdent(): string;
+    /**
+ *
+ * @param asset 通过此方法创建的节点，自动添加 RouteComponent 到节点上
+ */
+    createNode(asset: Prefab): void;
+    /**
+     * 使用route的视图模型，可以实现通过路由，操作视图
+     * @param route
+     * @param controller
+     */
+    useRoute(route: Route, controller: RouteController): void;
+    open(): void;
+    close(): void;
+    refresh(): void;
+    stop(reason?: LinkError): void;
+    /**
+     * 等待发送的结果
+     * 如果返回 null，表示主动取消 [cancel]
+     */
+    wait(): Promise<this>;
+    toString(): string;
+    /**
+         * 等待打开完成指令
+         */
+    waitOpenComplete(): void;
+    openComplete(): void;
+    waitCloseComplete(): void;
+    closeComplete(): void;
+    protected _waitOpenComplete: boolean;
+    protected _waitCloseComplete: boolean;
+    get reason(): LinkError;
+    node: Node;
+    datas: MapObject;
+    tags: MapObject;
+    enableHistory: boolean;
+    layer: string;
+    state: ViewState;
+    protected _controller: RouteController;
+    protected _route: Route;
+    protected _reason: LinkError;
+    protected onOpen(): void;
+    protected onOpened(): void;
+    protected onClose(): void;
+    protected onClosed(): void;
+    protected onRefresh(): void;
+    /**
+     *  默认执行 close();
+     */
+    protected onStop(): void;
+}
+
 declare class ViewList extends List<RouteView> {
 }
 /**
  * 路由唯一编号->视图
  */
-declare class ViewDict extends Dictionary<string, RouteView> {
+declare class ViewDict extends Dictionary<string, any> {
+    /**
+  * 关闭相斥的视图对象
+  * 1. 关闭同一层的所有视图对象
+  * 2. 关闭符合相斥规则的视图对象
+  * @param view
+  * @param validFunc 符合条件的视图对象会被关闭
+  * @returns 被关闭的视图
+  */
+    closeExclusion(validFunc?: (existed: RouteView) => boolean): ViewList;
+    listByRoutePath(path: string): ViewList;
+    listByTags(tags: string[]): ViewList;
+    /**
+     *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
+     * @param node
+     */
+    tailNode(node: Node): ViewModel;
 }
-declare class ViewRepo extends ViewDict {
+declare class RouteViewDict extends ViewDict {
     constructor();
     openByString(route: string): RouteView;
     /**
@@ -1301,32 +1381,14 @@ declare class ViewRepo extends ViewDict {
     open(route: Route): RouteView;
     close(route: Route): void;
     /**
-  * 关闭相斥的视图对象
-  * 1. 关闭同一层的所有视图对象
-  * 2. 关闭符合相斥规则的视图对象
-  * @param view
-  * @param validFunc 符合条件的视图对象会被关闭
-  * @returns 被关闭的视图
-  */
-    closeExclusion(validFunc?: (existed: RouteView) => boolean): ViewList;
-    /**
      * 如果页面存在，则刷新
      * @param route
      */
     refresh(route: Route): void;
     getByRoute(route: Route): RouteView;
-    listByRoutePath(path: string): ViewList;
-    listByTags(tags: string[]): ViewList;
-    /**
-     *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
-     * @param node
-     */
-    tailNode(node: Node): RouteView;
     protected getController(name: string): RouteController;
-    protected _indexLayer: {};
-    protected _indexRoute: {};
 }
-declare const viewrepo: ViewRepo;
+declare const routeviews: RouteViewDict;
 
 /**
  * 事件字符串分隔符
@@ -2118,5 +2180,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, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, 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, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, 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, 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

@@ -3823,153 +3823,6 @@ 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 {
-}
-/**
- * 路由唯一编号->视图
- */
-class ViewDict extends Dictionary {
-}
-class ViewRepo extends ViewDict {
-    constructor() {
-        super();
-        this._indexLayer = {};
-        this._indexRoute = {};
-    }
-    openByString(route) {
-        return this.open(new Route(route));
-    }
-    /**
-     * 打开页面
-     * 一个路由代表一个页面
-     * @param route
-     */
-    open(route) {
-        let controller = this.getController(route.path);
-        if (!controller) {
-            throw new Error("view controller no register: " + route.path);
-        }
-        return controller.openByRoute(route);
-    }
-    close(route) {
-        let controller = this.getController(route.path);
-        if (!controller) {
-            throw new Error("view controller no register: " + route.path);
-        }
-        controller.closeByRoute(route);
-    }
-    /**
-  * 关闭相斥的视图对象
-  * 1. 关闭同一层的所有视图对象
-  * 2. 关闭符合相斥规则的视图对象
-  * @param view
-  * @param validFunc 符合条件的视图对象会被关闭
-  * @returns 被关闭的视图
-  */
-    closeExclusion(validFunc = undefined) {
-        if (!validFunc) {
-            return;
-        }
-        let closedList = new ViewList();
-        this.forEach((key, item, iterator) => {
-            if (validFunc(item)) {
-                closedList.push(item);
-            }
-        });
-        closedList.forEach((index, item) => {
-            item.controller;
-            item.close();
-        });
-        return closedList;
-    }
-    /**
-     * 如果页面存在，则刷新
-     * @param route
-     */
-    refresh(route) {
-        let view = this.getByRoute(route);
-        if (view) {
-            view.controller.refresh();
-        }
-    }
-    getByRoute(route) {
-        return this.get(route.key);
-    }
-    listByRoutePath(path) {
-        let list = new ViewList();
-        this.forEach((index, item) => {
-            if (item.controller.route.path == path) {
-                list.push(item);
-            }
-        });
-        return list;
-    }
-    listByTags(tags) {
-        let list = new ViewList();
-        this.forEach((index, item) => {
-            if (item.controller.hasTags(tags)) {
-                list.push(item);
-            }
-        });
-        return list;
-    }
-    /**
-     *  往上追踪，返回第一个包含 RouteComponent 的节点, 返回节点中的 RouteView
-     * @param node
-     */
-    tailNode(node) {
-        let current = node;
-        while (current != null) {
-            let com = current.getComponent(RouteComponent);
-            if (com) {
-                return com.routeView;
-            }
-            current = current.parent;
-        }
-        return null;
-    }
-    getController(name) {
-        return ctrlrepo.get(name);
-    }
-}
-const viewrepo = new ViewRepo();
-
 var ViewState;
 (function (ViewState) {
     /**
@@ -4021,11 +3874,7 @@ class RouteView extends EventDispatcher {
         if (this.state != ViewState.Closed) {
             return;
         }
-        let route = this.route;
-        if (viewrepo.get(route.key)) {
-            throw `视图已存在: route=${route.key}`;
-        }
-        viewrepo.set(route.key, this);
+        this.route;
         this.state = ViewState.Opening;
         this.dispatch(ViewEvent.Opening);
         //
@@ -4161,7 +4010,6 @@ class RouteView extends EventDispatcher {
         if (this.state == ViewState.Closed) {
             return;
         }
-        viewrepo.delete(this.route.key);
         this._waitCloseComplete = false;
         this.state = ViewState.Closed;
         this.dispatch(ViewEvent.Closed);
@@ -4176,8 +4024,8 @@ class RouteView extends EventDispatcher {
     createNode(asset) {
         let node = instantiate(asset);
         this.node = node;
-        let com = node.addComponent(RouteComponent);
-        com.routeView = this;
+        // let com = node.addComponent(RouteComponent);
+        // com.viewModel = this;
     }
     get controller() {
         return this._controller;
@@ -4219,16 +4067,161 @@ 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 {
+}
+/**
+ * 路由唯一编号->视图
+ */
+class ViewDict extends Dictionary {
+    /**
+  * 关闭相斥的视图对象
+  * 1. 关闭同一层的所有视图对象
+  * 2. 关闭符合相斥规则的视图对象
+  * @param view
+  * @param validFunc 符合条件的视图对象会被关闭
+  * @returns 被关闭的视图
+  */
+    closeExclusion(validFunc = undefined) {
+        if (!validFunc) {
+            return;
+        }
+        let closedList = new ViewList();
+        this.forEach((key, item, iterator) => {
+            if (validFunc(item)) {
+                closedList.push(item);
+            }
+        });
+        closedList.forEach((index, item) => {
+            item.controller;
+            item.close();
+        });
+        return closedList;
+    }
+    listByRoutePath(path) {
+        let list = new ViewList();
+        this.forEach((index, item) => {
+            if (item.controller.route.path == path) {
+                list.push(item);
+            }
+        });
+        return list;
+    }
+    listByTags(tags) {
+        let list = new ViewList();
+        this.forEach((index, item) => {
+            if (item.controller.hasTags(tags)) {
+                list.push(item);
+            }
+        });
+        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() {
+        super();
+    }
+    openByString(route) {
+        return this.open(new Route(route));
+    }
+    /**
+     * 打开页面
+     * 一个路由代表一个页面
+     * @param route
+     */
+    open(route) {
+        let controller = this.getController(route.path);
+        if (!controller) {
+            throw new Error("view controller no register: " + route.path);
+        }
+        return controller.openByRoute(route);
+    }
+    close(route) {
+        let controller = this.getController(route.path);
+        if (!controller) {
+            throw new Error("view controller no register: " + route.path);
+        }
+        controller.closeByRoute(route);
+    }
+    /**
+     * 如果页面存在，则刷新
+     * @param route
+     */
+    refresh(route) {
+        let view = this.getByRoute(route);
+        if (view) {
+            view.controller.refresh();
+        }
+    }
+    getByRoute(route) {
+        return this.get(route.key);
+    }
+    getController(name) {
+        return ctrlrepo.get(name);
+    }
+}
+const routeviews = new RouteViewDict();
+
 class ViewHistory extends RouteList {
     back() {
         if (viewhistorys.length == 0) {
             return;
         }
-        viewrepo.close(viewhistorys.shift());
+        routeviews.close(viewhistorys.shift());
         if (viewhistorys.length == 0) {
             return;
         }
-        viewrepo.open(viewhistorys.last());
+        routeviews.open(viewhistorys.last());
     }
 }
 const viewhistorys = new ViewHistory();
@@ -6645,5 +6638,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, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, 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, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, 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, 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