@zhongguo168a/yxeditor-common 0.0.31 → 0.0.34

package/README.md

@@ -27,3 +27,17 @@ A TypeScript project template with Rollup and Vitest.
 - `npm run test:ui` - Run tests with UI
 - `npm run test:run` - Run tests once
 - `npm run coverage` - Run tests with coverage report
+
+
+```shell
+npm version patch && npm publish --access public
+``` 
+
+
+```shell
+npm version patch && npm publish --access public
+``` 
+
+```shell
+npm version patch && npm publish --access public
+``` 

package/dist/index.d.ts

@@ -1028,6 +1028,13 @@ declare enum ViewState {
      */
     Closeing = 3
 }
+declare enum ViewEvent {
+    Opening = "opening",
+    Opened = "opened",
+    Closeing = "closeing",
+    Closed = "closed",
+    Stop = "stop"
+}
 declare class View extends EventDispatcher {
     constructor(controller: ViewController, route: Route);
     /**
@@ -1063,6 +1070,36 @@ declare var uidict: UIObjectDict;
 
 declare class ViewList extends List<View> {
 }
+/**
+ * 路由唯一编号->视图
+ */
+declare class ViewDict extends Dictionary<string, View> {
+}
+declare class ViewRepo extends ViewDict {
+    constructor();
+    openByString(route: string): View;
+    /**
+     * 打开页面
+     * 一个路由代表一个页面
+     * @param route
+     */
+    open(route: Route): View;
+    close(route: Route): void;
+    /**
+     * 如果页面存在，则刷新
+     * @param route
+     */
+    refresh(route: Route): void;
+    getByRoute(route: Route): View;
+    listByRoutePath(path: string): ViewList;
+    listByTags(tags: string[]): ViewList;
+    protected getController(name: string): ViewController;
+    get objectDict(): UIObjectDict;
+    protected _objectDict: UIObjectDict;
+    protected _indexLayer: {};
+    protected _indexRoute: {};
+}
+declare const viewrepo: ViewRepo;
 
 declare class ViewController extends Controller {
     constructor(routeName: string);
@@ -1070,7 +1107,7 @@ declare class ViewController extends Controller {
       * 当视图需要通过路由打开时，需要实现此方法
       * @param route
       */
-    open(route: Route): View;
+    open(route?: Route): View;
     protected onOpening(view: View): void;
     protected onOpened(view: View): void;
     protected onClosing(view: View): void;
@@ -1116,6 +1153,30 @@ declare class ViewController extends Controller {
     protected _layer: string;
 }
 
+declare class ViewHistory extends RouteList {
+    back(): void;
+}
+declare const viewhistorys: RouteList;
+
+declare class PageController extends ViewController {
+    constructor(routeName: string);
+    /**
+     * 打开视图，如果视图已经存在则刷新视图
+     * @param route
+     */
+    open(route: Route): View;
+    /**
+     * @param route
+     * @returns
+     */
+    close(route?: Route): View;
+    useHistory(): this;
+    get route(): Route;
+    get enableHistory(): boolean;
+    protected _enableHistory: boolean;
+    protected _layer: string;
+}
+
 /**
  * 事件字符串分隔符
  */
@@ -1978,5 +2039,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: 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, RouteList, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, ViewController, 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, uidict, uimgr, uiutil, 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, PageController, PathUtil, Pool, RandUtil, Route, RouteList, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, View, ViewController, 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, uidict, uimgr, uiutil, viewhistorys, viewrepo, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventManager, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -3839,6 +3839,9 @@ class ViewController extends Controller {
       * @param route
       */
     open(route) {
+        if (!route) {
+            route = this.route;
+        }
         let oldView = viewrepo.getByRoute(route);
         if (oldView) {
             this.closeView(oldView);
@@ -3916,6 +3919,9 @@ class ViewController extends Controller {
      * @returns
      */
     close(route) {
+        if (!route) {
+            route = this.route;
+        }
         let view = viewrepo.getByRoute(route);
         if (view) {
             this.closeView(view);
@@ -4034,6 +4040,78 @@ class ViewController extends Controller {
     }
 }
 
+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 RouteList();
+
+class PageController extends ViewController {
+    constructor(routeName) {
+        super(routeName);
+        this._enableHistory = false;
+        this._layer = "";
+        this._route = new Route(routeName);
+    }
+    /**
+     * 打开视图，如果视图已经存在则刷新视图
+     * @param route
+     */
+    open(route) {
+        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);
+        }
+        view = new View(this, route);
+        this.openView(view);
+        return view;
+    }
+    /**
+     * @param route
+     * @returns
+     */
+    close(route) {
+        let lastview;
+        if (this._layer) {
+            if (this._enableHistory) {
+                // 清空历史记录
+                viewhistorys.clear();
+            }
+        }
+        else {
+            lastview = viewrepo.getByRoute(route);
+        }
+        this.closeView(lastview);
+        return lastview;
+    }
+    useHistory() {
+        this._enableHistory = true;
+        return this;
+    }
+    get route() {
+        return this._route;
+    }
+    get enableHistory() {
+        return this._enableHistory;
+    }
+}
+
 class Listener {
     static create(ident) {
         return new Listener(ident);
@@ -6307,5 +6385,5 @@ class WidgetUtil {
 }
 var widgetutil = new 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, RouteList, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, ViewController, 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, uidict, uimgr, uiutil, 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, PageController, PathUtil, Pool, RandUtil, Route, RouteList, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, View, ViewController, 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, uidict, uimgr, uiutil, viewhistorys, viewrepo, widgetutil };
 //# sourceMappingURL=index.esm.js.map