@zhongguo168a/yxeditor-common 0.0.43 → 0.0.45

package/dist/index.d.ts

@@ -1072,24 +1072,16 @@ declare class RouteView extends EventDispatcher {
     protected _route: Route;
 }
 
-declare function OpenPageHandler(route: Route): Promise<void>;
-declare function OpenDialogHandler(route?: Route): Promise<void>;
-declare function CloseDialogHandler(route?: Route): RouteView;
-/**
- * @param route
- * @returns
- */
-declare function ClosePageHandler(route?: Route): Promise<RouteView>;
 declare class RouteController extends Controller {
     constructor(routePath: string);
-    open(): void;
+    open(...args: any[]): RouteView;
     /**
       * 当视图需要通过路由打开时，需要实现此方法
       * @param route
       */
     openByRoute(route?: Route): RouteView;
     protected refreshView(view: RouteView): void;
-    close(): void;
+    close(...args: any[]): RouteView;
     /**
      * 当视图需要通过路由关闭时，需要实现此方法
      * @param route
@@ -2029,5 +2021,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: WidgetUtil;
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, CloseDialogHandler, ClosePageHandler, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, OpenDialogHandler, OpenPageHandler, 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, 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, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, 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, 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 type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -3475,38 +3475,6 @@ class Factory {
     }
 }
 
-/******************************************************************************
-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 __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 /**
  * 视图的路由值, 保存视图的信息
  * 规则: path/search
@@ -3636,181 +3604,14 @@ Route.data = {};
 class RouteList extends List {
 }
 
-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;
-    }
-    getController(name) {
-        return ctrlrepo.get(name);
-    }
-}
-const viewrepo = new ViewRepo();
-
-class ViewHistory extends RouteList {
-    back() {
-        if (viewhistorys.length == 0) {
-            return;
-        }
-        viewrepo.close(viewhistorys.shift());
-        if (viewhistorys.length == 0) {
-            return;
-        }
-        viewrepo.open(viewhistorys.last());
-    }
-}
-const viewhistorys = new ViewHistory();
-
-function OpenPageHandler(route) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let view = viewrepo.getByRoute(route);
-        if (view) { // 
-            this.refreshView(view);
-            return;
-        }
-        // 关闭同一层的所有视图
-        this.closeExclusion((existed) => {
-            return existed.layer == this._layer;
-        });
-        if (this.enableHistory) {
-            viewhistorys.push(route);
-        }
-    });
-}
-function OpenDialogHandler(route) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!route) {
-            route = this.route;
-        }
-        let oldView = viewrepo.getByRoute(route);
-        if (oldView) {
-            oldView.close();
-        }
-    });
-}
-function CloseDialogHandler(route) {
-    if (!route) {
-        route = this.route;
-    }
-    let view = viewrepo.getByRoute(route);
-    if (view) {
-        view.close();
-    }
-    return view;
-}
-/**
- * @param route
- * @returns
- */
-function ClosePageHandler(route) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let lastview;
-        if (lastview.layer) {
-            if (lastview.enableHistory) {
-                // 清空历史记录
-                viewhistorys.clear();
-            }
-        }
-        else {
-            lastview = viewrepo.getByRoute(route);
-        }
-        lastview.close();
-        return lastview;
-    });
-}
 class RouteController extends Controller {
     constructor(routePath) {
         super(routePath);
         this._tags = {};
         this._route = new Route(routePath);
     }
-    open() {
-        this.openByRoute();
+    open(...args) {
+        return this.openByRoute();
     }
     /**
       * 当视图需要通过路由打开时，需要实现此方法
@@ -3821,8 +3622,8 @@ class RouteController extends Controller {
     }
     refreshView(view) {
     }
-    close() {
-        this.closeByRoute();
+    close(...args) {
+        return this.closeByRoute();
     }
     /**
      * 当视图需要通过路由关闭时，需要实现此方法
@@ -3916,6 +3717,102 @@ class UIObjectRepo extends Dictionary {
  */
 var uirepo = new UIObjectRepo();
 
+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;
+    }
+    getController(name) {
+        return ctrlrepo.get(name);
+    }
+}
+const viewrepo = new ViewRepo();
+
 var ViewState;
 (function (ViewState) {
     /**
@@ -4110,6 +4007,20 @@ class RouteView extends EventDispatcher {
     }
 }
 
+class ViewHistory extends RouteList {
+    back() {
+        if (viewhistorys.length == 0) {
+            return;
+        }
+        viewrepo.close(viewhistorys.shift());
+        if (viewhistorys.length == 0) {
+            return;
+        }
+        viewrepo.open(viewhistorys.last());
+    }
+}
+const viewhistorys = new ViewHistory();
+
 class Listener {
     static create(ident) {
         return new Listener(ident);
@@ -6383,5 +6294,5 @@ class WidgetUtil {
 }
 var widgetutil = new WidgetUtil();
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, CloseDialogHandler, ClosePageHandler, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, OpenDialogHandler, OpenPageHandler, 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, 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, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, 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, 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 };
 //# sourceMappingURL=index.esm.js.map