@zhongguo168a/yxeditor-common 0.0.30 → 0.0.32

package/dist/index.esm.js

@@ -772,7 +772,7 @@ const log = logmgr.getEventLogger();
 /**
  * 事件派发器
  */
-class EventManager {
+class EventDispatcher {
     constructor() {
         this._isPause = false;
         this._onEventItems = {};
@@ -1005,7 +1005,7 @@ class EventManager {
 /**
  * 全局的事件派发器
  */
-const eventmgr = new EventManager();
+const eventmgr = new EventDispatcher();
 let eventPool = new Pool({
     creatorFunction: function () {
         return new XEvent();
@@ -2282,7 +2282,7 @@ class TreeNode {
         return `TreeNode[${this.id}]`;
     }
 }
-class TreeRoot extends EventManager {
+class TreeRoot extends EventDispatcher {
     static create() {
         return new TreeRoot();
     }
@@ -2550,7 +2550,7 @@ class ListNode {
         this.getTags()[name] = value;
     }
 }
-class ListSource extends EventManager {
+class ListSource extends EventDispatcher {
     constructor() {
         super(...arguments);
         this._data = [];
@@ -3060,7 +3060,7 @@ class DictNode {
 class DictSource extends Dictionary {
     constructor() {
         super(...arguments);
-        this._dispatcher = new EventManager();
+        this._dispatcher = new EventDispatcher();
     }
     setNodeTags(node, tag, value) {
         let tags = node.getTags();
@@ -3407,7 +3407,7 @@ class ControllerRepo extends ControllerDict {
     constructor() {
         super();
     }
-    add(controller) {
+    register(controller) {
         if (this.get(controller.name)) {
             throw new Error("重复创建控制器: " + name);
         }
@@ -3426,6 +3426,7 @@ class ControllerRepo extends ControllerDict {
         });
     }
 }
+const ctrlrepo = new ControllerRepo();
 
 // 用于描述数据及之间的关系
 // 也可提供对控制器的封装
@@ -3437,7 +3438,7 @@ class SimpleModel {
         return this._mod;
     }
 }
-class Model extends EventManager {
+class Model extends EventDispatcher {
     constructor(core) {
         super();
         this._module = core;
@@ -3506,7 +3507,7 @@ var ViewEvent;
     // 停止
     ViewEvent["Stop"] = "stop";
 })(ViewEvent || (ViewEvent = {}));
-class View extends EventManager {
+class View extends EventDispatcher {
     constructor(controller, route) {
         super();
         this._waitOpenComplete = false;
@@ -3517,25 +3518,6 @@ class View extends EventManager {
         this._controller = controller;
         this._route = route;
     }
-    /**
-     * 等待打开完成指令
-     */
-    waitOpenComplete() {
-        this._waitOpenComplete = true;
-    }
-    waitCloseComplete() {
-        this._waitCloseComplete = true;
-    }
-    openComplete() {
-        this._waitOpenComplete = false;
-        this._controller.openComplete(this);
-    }
-    closeComplete() {
-        this._waitOpenComplete = false;
-        this._controller.closeComplete(this);
-    }
-    stop(reason) {
-    }
     /**
      * 等待发送的结果
      * 如果返回 null，表示主动取消 [cancel]
@@ -3708,6 +3690,8 @@ class Route {
 }
 // 打开界面缓存的route对象
 Route.data = {};
+class RouteList extends List {
+}
 
 class UIObjectDict extends Dictionary {
     /**
@@ -3763,45 +3747,18 @@ class UIObjectDict extends Dictionary {
 }
 var uidict = new UIObjectDict();
 
+class ViewList extends List {
+}
 /**
- * 视图管理器
- * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
+ * 路由唯一编号->视图
  */
-class ViewLayer {
-    constructor(name) {
-        this.name = name;
-        this._history = [];
-    }
-    close() {
-        if (this.currentView) {
-            this.currentView.controller.closeByRoute();
-        }
-    }
-    /**
-     * 历史记录
-     */
-    getHistory() {
-        return this._history;
-    }
-    back() {
-        viewrepo.open(this._history.pop());
-    }
-}
-
-class ViewList extends List {
+class ViewDict extends Dictionary {
 }
-class ViewRepo extends ViewList {
+class ViewRepo extends ViewDict {
     constructor() {
         super();
         this._indexLayer = {};
         this._indexRoute = {};
-        this._ctrlDict = new ControllerDict();
-        this.onSet(this, (item) => {
-            this._indexRoute[item.route.key] = item;
-        });
-        this.onDelete(this, (item) => {
-            delete this._indexRoute[item.route.key];
-        });
     }
     openByString(route) {
         return this.open(new Route(route));
@@ -3816,14 +3773,14 @@ class ViewRepo extends ViewList {
         if (!controller) {
             throw new Error("view controller no register: " + route.path);
         }
-        return controller.openByRoute(route);
+        return controller.open(route);
     }
     close(route) {
         let controller = this.getController(route.path);
         if (!controller) {
             throw new Error("view controller no register: " + route.path);
         }
-        controller.closeByRoute(route);
+        controller.close(route);
     }
     /**
      * 如果页面存在，则刷新
@@ -3836,7 +3793,7 @@ class ViewRepo extends ViewList {
         }
     }
     getByRoute(route) {
-        return this._indexRoute[route.key];
+        return this.get(route.key);
     }
     listByRoutePath(path) {
         let list = new ViewList();
@@ -3856,28 +3813,8 @@ class ViewRepo extends ViewList {
         });
         return list;
     }
-    getLayerMain() {
-        return this._indexLayer["main"];
-    }
-    /**
-     * @param name
-     */
-    getLayer(name) {
-        return this.getOrNewLayer(name);
-    }
-    getOrNewLayer(name) {
-        let layer = this._indexLayer[name];
-        if (!layer) {
-            layer = new ViewLayer(name);
-            this._indexLayer[name] = layer;
-        }
-        return layer;
-    }
     getController(name) {
-        return this._ctrlDict.get(name);
-    }
-    registerController(ctrl) {
-        this._ctrlDict.set(ctrl.name, ctrl);
+        return ctrlrepo.get(name);
     }
     get objectDict() {
         let dict = this._objectDict;
@@ -3891,26 +3828,24 @@ class ViewRepo extends ViewList {
 const viewrepo = new ViewRepo();
 
 class ViewController extends Controller {
-    constructor(routeName, config) {
+    constructor(routeName) {
         super(routeName);
         this._enableHistory = false;
         this._tags = {};
         this._route = new Route(routeName);
-        if (config) {
-            if (config.layer) {
-                this._layer = config.layer;
-            }
-            if (config.tags) {
-                this._tags = config.tags;
-            }
-            if (config.enableHistory) {
-                this._enableHistory = config.enableHistory;
-            }
-        }
     }
-    open(...args) {
-    }
-    close(...args) {
+    /**
+      * 当视图需要通过路由打开时，需要实现此方法
+      * @param route
+      */
+    open(route) {
+        let oldView = viewrepo.getByRoute(route);
+        if (oldView) {
+            this.closeView(oldView);
+        }
+        let view = new View(this, route);
+        this.openView(view);
+        return view;
     }
     onOpening(view) {
     }
@@ -3920,36 +3855,7 @@ class ViewController extends Controller {
     }
     onClosed(view) {
     }
-    onRefresh(view) {
-    }
-    openByRoute(route) {
-        let newview;
-        let oldview;
-        if (this._layer) {
-            let layer = viewrepo.getLayer(this._layer);
-            oldview = layer.currentView;
-            if (oldview) {
-                let currentRoute = oldview.route;
-                if (currentRoute.key == route.key) {
-                    return oldview;
-                }
-                // 关闭
-                let currentCtrl = oldview.controller;
-                currentCtrl.closeView(oldview);
-                if (currentCtrl._enableHistory) {
-                    layer.getHistory().push(oldview.route);
-                }
-            }
-            newview = new View(this, route);
-            layer.currentView = newview;
-        }
-        else {
-            newview = new View(this, route);
-        }
-        //
-        this.openView(newview);
-        //
-        return newview;
+    refreshView(view) {
     }
     openView(view) {
         if (!view) {
@@ -3958,12 +3864,17 @@ class ViewController extends Controller {
         if (view.state != ViewState.Closed) {
             return;
         }
+        let route = view.route;
+        if (viewrepo.get(route.key)) {
+            throw `视图已存在: route=${route.key}`;
+        }
+        viewrepo.set(route.key, view);
         this._lastView = view;
         view.state = ViewState.Opening;
         view.dispatch(ViewEvent.Opening);
         //
         try {
-            viewrepo.push(view);
+            //
             this.onOpening(view);
             // @ts-ignore
             if (!view._waitOpenComplete) {
@@ -3981,36 +3892,59 @@ class ViewController extends Controller {
             this.closeView(view);
         }
     }
+    /**
+         * 等待打开完成指令
+         */
+    waitOpenComplete(view) {
+        // @ts-ignore
+        view._waitOpenComplete = true;
+    }
     openComplete(view) {
         if (!view) {
             return;
         }
         this._lastView = view;
         view.state = ViewState.Opened;
+        // @ts-ignore
+        view._waitOpenComplete = false;
         this.onOpened(view);
         view.dispatch(ViewEvent.Opened);
     }
     /**
-     * viewrepo中存在页面才会关闭
+     * 当视图需要通过路由关闭时，需要实现此方法
      * @param route
      * @returns
      */
-    closeByRoute(route) {
-        let lastview;
-        if (this._layer) {
-            let layer = viewrepo.getLayer(this._layer);
-            lastview = layer.currentView;
-            layer.currentView = null;
-            if (this._enableHistory) {
-                // 清空历史记录
-                layer.getHistory().length = 0;
-            }
+    close(route) {
+        let view = viewrepo.getByRoute(route);
+        if (view) {
+            this.closeView(view);
         }
-        else {
-            lastview = viewrepo.getByRoute(route);
+        return view;
+    }
+    /**
+     * 关闭相斥的视图对象
+     * 1. 关闭同一层的所有视图对象
+     * 2. 关闭符合相斥规则的视图对象
+     * @param view
+     * @param validFunc 符合条件的视图对象会被关闭
+     * @returns 被关闭的视图
+     */
+    closeExclusion(validFunc = undefined) {
+        if (!validFunc) {
+            return;
         }
-        this.closeView(lastview);
-        return lastview;
+        let closedList = new ViewList();
+        viewrepo.forEach((key, item, iterator) => {
+            if (validFunc(item)) {
+                closedList.push(item);
+            }
+        });
+        closedList.forEach((index, item) => {
+            let currentCtrl = item.controller;
+            currentCtrl.closeView(item);
+        });
+        return closedList;
     }
     closeView(view) {
         if (!view) {
@@ -4038,13 +3972,19 @@ class ViewController extends Controller {
             console.error(e.stack);
         }
     }
+    waitCloseComplete(view) {
+        // @ts-ignore
+        view._waitCloseComplete = true;
+    }
     closeComplete(view) {
         if (!view) {
             return;
         }
-        viewrepo.remove(view);
+        viewrepo.delete(view.route.key);
         this._lastView = view;
         // @ts-ignore
+        view._waitCloseComplete = false;
+        // @ts-ignore
         let objectDict = view._objectDict;
         if (objectDict) {
             objectDict.clear();
@@ -4054,7 +3994,7 @@ class ViewController extends Controller {
         this.onClosed(view);
     }
     refresh() {
-        this.onRefresh(this._lastView);
+        this.refreshView(this._lastView);
     }
     get layer() {
         return this._layer;
@@ -4079,6 +4019,10 @@ class ViewController extends Controller {
         this._tags = tags;
         return this;
     }
+    useHistory() {
+        this._enableHistory = true;
+        return this;
+    }
     get lastView() {
         return this._lastView;
     }
@@ -4090,6 +4034,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);
@@ -6363,5 +6379,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, EventItem, EventManager, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, View, ViewController, ViewEvent, ViewLayer, ViewList, ViewRepo, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, 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, 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, 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