@zhongguo168a/yxeditor-common 0.0.41 → 0.0.44

package/dist/index.esm.js

@@ -3475,95 +3475,6 @@ class Factory {
     }
 }
 
-var ViewState;
-(function (ViewState) {
-    /**
-     * 关闭
-     */
-    ViewState[ViewState["Closed"] = 0] = "Closed";
-    /**
-     * 正在打开
-     */
-    ViewState[ViewState["Opening"] = 1] = "Opening";
-    /**
-     * 已打开
-     */
-    ViewState[ViewState["Opened"] = 2] = "Opened";
-    /**
-     * 正在关闭
-     */
-    ViewState[ViewState["Closeing"] = 3] = "Closeing";
-})(ViewState || (ViewState = {}));
-var ViewEvent;
-(function (ViewEvent) {
-    // 正在打开
-    ViewEvent["Opening"] = "opening";
-    // 已打开
-    ViewEvent["Opened"] = "opened";
-    // 正在打开
-    ViewEvent["Closeing"] = "closeing";
-    // 已关闭
-    ViewEvent["Closed"] = "closed";
-    // 停止
-    ViewEvent["Stop"] = "stop";
-})(ViewEvent || (ViewEvent = {}));
-class View extends EventDispatcher {
-    constructor(controller, route) {
-        super();
-        this._waitOpenComplete = false;
-        this._waitCloseComplete = false;
-        this.datas = {};
-        this.tags = {};
-        this.state = 0;
-        this._controller = controller;
-        this._route = route;
-    }
-    /**
-     * 等待发送的结果
-     * 如果返回 null，表示主动取消 [cancel]
-     */
-    wait() {
-        switch (this.state) {
-            case ViewState.Opening:
-                return new Promise((resolve, reject) => {
-                    let opened = () => {
-                        this.off("opened", this, opened);
-                        this.off("canceled", this, opened);
-                        resolve(this);
-                    };
-                    let canceled = () => {
-                        this.off("opened", this, opened);
-                        this.off("canceled", this, opened);
-                        resolve(this);
-                    };
-                    this.on("opened", this, opened);
-                    this.on("canceled", this, canceled);
-                });
-            case ViewState.Closeing:
-                return new Promise((resolve, reject) => {
-                    let opened = () => {
-                        this.off("closed", this, opened);
-                        resolve(this);
-                    };
-                    this.on("closed", this, opened);
-                });
-            default:
-                return new Promise((resolve, reject) => {
-                    resolve(this);
-                });
-        }
-    }
-    toString() {
-        return `View[${this.route.toString()}, ${this.id}]`;
-    }
-    get controller() {
-        return this._controller;
-    }
-    get route() {
-        return this._route;
-    }
-}
-
 /**
  * 视图的路由值, 保存视图的信息
  * 规则: path/search
@@ -3693,6 +3604,119 @@ Route.data = {};
 class RouteList extends List {
 }
 
+class RouteController extends Controller {
+    constructor(routePath) {
+        super(routePath);
+        this._tags = {};
+        this._route = new Route(routePath);
+    }
+    open(...args) {
+        this.openByRoute();
+    }
+    /**
+      * 当视图需要通过路由打开时，需要实现此方法
+      * @param route
+      */
+    openByRoute(route) {
+        throw "未实现 openByRoute";
+    }
+    refreshView(view) {
+    }
+    close(...args) {
+        this.closeByRoute();
+    }
+    /**
+     * 当视图需要通过路由关闭时，需要实现此方法
+     * @param route
+     * @returns
+     */
+    closeByRoute(route) {
+        throw "未实现 closeByRoute";
+    }
+    refresh() {
+        this.refreshView(this._lastView);
+    }
+    hasTags(tags) {
+        for (let i = 0; i < tags.length; i++) {
+            let tag = tags[i];
+            for (const key in this._tags) {
+                let thistag = this._tags[key];
+                if (thistag == tag) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    setTags(tags) {
+        this._tags = tags;
+        return this;
+    }
+    get lastView() {
+        return this._lastView;
+    }
+    get route() {
+        return this._route;
+    }
+}
+
+class UIObjectRepo extends Dictionary {
+    /**
+     * 获取唯一的
+     * @param prefab
+     */
+    uniqueObject(prefab) {
+        if (!prefab) {
+            console.warn("未设置prefab");
+            return;
+        }
+        let key = prefab.data.uuid;
+        let object = this.get(key);
+        if (!object) {
+            object = instantiate(prefab);
+            this.set(key, object);
+        }
+        return object;
+    }
+    removeObject(prefab) {
+        if (!prefab) {
+            console.warn("未设置prefab");
+            return;
+        }
+        this.delete(prefab.data.uuid);
+    }
+    popObject(prefab) {
+        let object;
+        let key = prefab.data.uuid;
+        let list = this.getList(key);
+        if (list.length == 0) {
+            object = instantiate(prefab);
+        }
+        else {
+            object = list.pop();
+        }
+        return object;
+    }
+    backObject(object) {
+        // @ts-ignore
+        let key = object.prefab.asset.uuid;
+        let list = this.getList(key);
+        list.push(object);
+    }
+    getList(key) {
+        let list = this.get(key);
+        if (!list) {
+            list = new List();
+            this.set(key, list);
+        }
+        return list;
+    }
+}
+/**
+ * 全局的UI对象库，用于管理一些常用的ui对象，例如主界面，背包
+ */
+var uirepo = new UIObjectRepo();
+
 class ViewList extends List {
 }
 /**
@@ -3719,14 +3743,38 @@ class ViewRepo extends ViewDict {
         if (!controller) {
             throw new Error("view controller no register: " + route.path);
         }
-        return controller.open(route);
+        return controller.openByRoute(route);
     }
     close(route) {
         let controller = this.getController(route.path);
         if (!controller) {
             throw new Error("view controller no register: " + route.path);
         }
-        controller.close(route);
+        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;
     }
     /**
      * 如果页面存在，则刷新
@@ -3765,275 +3813,199 @@ class ViewRepo extends ViewDict {
 }
 const viewrepo = new ViewRepo();
 
-class ViewController extends Controller {
-    constructor(routeName) {
-        super(routeName);
-        this._enableHistory = false;
-        this._tags = {};
-        this._route = new Route(routeName);
-    }
+var ViewState;
+(function (ViewState) {
     /**
-      * 当视图需要通过路由打开时，需要实现此方法
-      * @param route
-      */
-    open(route) {
-        if (!route) {
-            route = this.route;
-        }
-        let oldView = viewrepo.getByRoute(route);
-        if (oldView) {
-            this.closeView(oldView);
-        }
-        let view = new View(this, route);
-        this.openView(view);
-        return view;
-    }
-    onOpening(view) {
-    }
-    onOpened(view) {
-    }
-    onClosing(view) {
-    }
-    onClosed(view) {
-    }
-    refreshView(view) {
+     * 关闭
+     */
+    ViewState[ViewState["Closed"] = 0] = "Closed";
+    /**
+     * 正在打开
+     */
+    ViewState[ViewState["Opening"] = 1] = "Opening";
+    /**
+     * 已打开
+     */
+    ViewState[ViewState["Opened"] = 2] = "Opened";
+    /**
+     * 正在关闭
+     */
+    ViewState[ViewState["Closeing"] = 3] = "Closeing";
+})(ViewState || (ViewState = {}));
+var ViewEvent;
+(function (ViewEvent) {
+    // 正在打开
+    ViewEvent["Opening"] = "opening";
+    // 已打开
+    ViewEvent["Opened"] = "opened";
+    // 正在打开
+    ViewEvent["Closeing"] = "closeing";
+    // 已关闭
+    ViewEvent["Closed"] = "closed";
+    // 停止
+    ViewEvent["Stop"] = "stop";
+})(ViewEvent || (ViewEvent = {}));
+class RouteView extends EventDispatcher {
+    constructor(controller, route) {
+        super();
+        this._waitOpenComplete = false;
+        this._waitCloseComplete = false;
+        this.datas = {};
+        this.tags = {};
+        this.enableHistory = false;
+        this.state = 0;
+        this._controller = controller;
+        this._route = route;
     }
-    openView(view) {
-        if (!view) {
-            return;
-        }
-        if (view.state != ViewState.Closed) {
+    open() {
+        if (this.state != ViewState.Closed) {
             return;
         }
-        let route = view.route;
+        let route = this.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);
+        viewrepo.set(route.key, this);
+        this.state = ViewState.Opening;
+        this.dispatch(ViewEvent.Opening);
         //
         try {
             //
-            this.onOpening(view);
+            if (this.onOpen) {
+                this.onOpen.call(this);
+            }
             // @ts-ignore
-            if (!view._waitOpenComplete) {
+            if (!this._waitOpenComplete) {
                 // 没有被打断，打开完成
-                this.openComplete(view);
+                this.openComplete();
             }
             else {
                 // 被打断了，等待完成1
             }
         }
         catch (e) {
-            console.error(`open view ${view.route.key}`);
+            console.error(`open view ${this.route.key}`);
             console.error(e.stack);
             //
-            this.closeView(view);
+            this.close();
         }
     }
-    /**
-         * 等待打开完成指令
-         */
-    waitOpenComplete(view) {
-        // @ts-ignore
-        view._waitOpenComplete = true;
-    }
-    openComplete(view) {
-        if (!view) {
+    close() {
+        if (this.state == ViewState.Closed) {
             return;
         }
-        this._lastView = view;
-        view.state = ViewState.Opened;
-        // @ts-ignore
-        view._waitOpenComplete = false;
-        this.onOpened(view);
-        view.dispatch(ViewEvent.Opened);
-    }
-    /**
-     * 当视图需要通过路由关闭时，需要实现此方法
-     * @param route
-     * @returns
-     */
-    close(route) {
-        if (!route) {
-            route = this.route;
-        }
-        let view = viewrepo.getByRoute(route);
-        if (view) {
-            this.closeView(view);
-        }
-        return view;
-    }
-    /**
-     * 关闭相斥的视图对象
-     * 1. 关闭同一层的所有视图对象
-     * 2. 关闭符合相斥规则的视图对象
-     * @param view
-     * @param validFunc 符合条件的视图对象会被关闭
-     * @returns 被关闭的视图
-     */
-    closeExclusion(validFunc = undefined) {
-        if (!validFunc) {
-            return;
-        }
-        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) {
-            return;
-        }
-        if (view.state == ViewState.Closed) {
-            return;
-        }
-        this._lastView = view;
-        view.state = ViewState.Closeing;
-        view.dispatch(ViewEvent.Closeing);
+        this.state = ViewState.Closeing;
+        this.dispatch(ViewEvent.Closeing);
         try {
-            this.onClosing(view);
+            if (this.onClose) {
+                this.onClose.call(this);
+            }
             // @ts-ignore
-            if (!view._waitCloseComplete) {
+            if (!this._waitCloseComplete) {
                 // 没有被打断，关闭完成
-                this.closeComplete(view);
+                this.closeComplete();
             }
             else {
                 // 被打断了，等待完成1
             }
         }
         catch (e) {
-            console.error(`close view ${view.route.key}`);
+            console.error(`close view ${this.route.key}`);
             console.error(e.stack);
         }
     }
-    waitCloseComplete(view) {
-        // @ts-ignore
-        view._waitCloseComplete = true;
-    }
-    closeComplete(view) {
-        if (!view) {
-            return;
-        }
-        viewrepo.delete(view.route.key);
-        this._lastView = view;
-        // @ts-ignore
-        view._waitCloseComplete = false;
-        // @ts-ignore
-        let objectDict = view._objectDict;
-        if (objectDict) {
-            objectDict.clear();
-        }
-        view.state = ViewState.Closed;
-        view.dispatch(ViewEvent.Closed);
-        this.onClosed(view);
-    }
     refresh() {
-        this.refreshView(this._lastView);
-    }
-    get layer() {
-        return this._layer;
-    }
-    hasTags(tags) {
-        for (let i = 0; i < tags.length; i++) {
-            let tag = tags[i];
-            for (const key in this._tags) {
-                let thistag = this._tags[key];
-                if (thistag == tag) {
-                    return true;
-                }
+        try {
+            if (this.onRefresh) {
+                this.onClose.call(this);
+            }
+            // @ts-ignore
+            if (!this._waitCloseComplete) {
+                // 没有被打断，关闭完成
+                this.closeComplete();
+            }
+            else {
+                // 被打断了，等待完成1
             }
         }
-        return false;
-    }
-    setLayer(name) {
-        this._layer = name;
-        return this;
-    }
-    setTags(tags) {
-        this._tags = tags;
-        return this;
-    }
-    useHistory() {
-        this._enableHistory = true;
-        return this;
-    }
-    get lastView() {
-        return this._lastView;
-    }
-    get route() {
-        return this._route;
-    }
-    get enableHistory() {
-        return this._enableHistory;
+        catch (e) {
+            console.error(`refresh view ${this.route.key}`);
+            console.error(e.stack);
+        }
     }
-}
-
-class UIObjectRepo extends Dictionary {
     /**
-     * 获取唯一的
-     * @param prefab
+     * 等待发送的结果
+     * 如果返回 null，表示主动取消 [cancel]
      */
-    uniqueObject(prefab) {
-        if (!prefab) {
-            console.warn("未设置prefab");
-            return;
-        }
-        let key = prefab.data.uuid;
-        let object = this.get(key);
-        if (!object) {
-            object = instantiate(prefab);
-            this.set(key, object);
+    wait() {
+        switch (this.state) {
+            case ViewState.Opening:
+                return new Promise((resolve, reject) => {
+                    let opened = () => {
+                        this.off("opened", this, opened);
+                        this.off("canceled", this, opened);
+                        resolve(this);
+                    };
+                    let canceled = () => {
+                        this.off("opened", this, opened);
+                        this.off("canceled", this, opened);
+                        resolve(this);
+                    };
+                    this.on("opened", this, opened);
+                    this.on("canceled", this, canceled);
+                });
+            case ViewState.Closeing:
+                return new Promise((resolve, reject) => {
+                    let opened = () => {
+                        this.off("closed", this, opened);
+                        resolve(this);
+                    };
+                    this.on("closed", this, opened);
+                });
+            default:
+                return new Promise((resolve, reject) => {
+                    resolve(this);
+                });
         }
-        return object;
     }
-    removeObject(prefab) {
-        if (!prefab) {
-            console.warn("未设置prefab");
-            return;
-        }
-        this.delete(prefab.data.uuid);
+    toString() {
+        return `View[${this.route.toString()}, ${this.id}]`;
     }
-    popObject(prefab) {
-        let object;
-        let key = prefab.data.uuid;
-        let list = this.getList(key);
-        if (list.length == 0) {
-            object = instantiate(prefab);
-        }
-        else {
-            object = list.pop();
+    /**
+         * 等待打开完成指令
+         */
+    waitOpenComplete() {
+        this._waitOpenComplete = true;
+    }
+    openComplete() {
+        this.state = ViewState.Opened;
+        // @ts-ignore
+        this._waitOpenComplete = false;
+        if (this.onOpened) {
+            this.onOpened.call(this);
         }
-        return object;
+        this.dispatch(ViewEvent.Opened);
     }
-    backObject(object) {
+    waitCloseComplete(view) {
         // @ts-ignore
-        let key = object.prefab.asset.uuid;
-        let list = this.getList(key);
-        list.push(object);
+        view._waitCloseComplete = true;
     }
-    getList(key) {
-        let list = this.get(key);
-        if (!list) {
-            list = new List();
-            this.set(key, list);
+    closeComplete() {
+        viewrepo.delete(this.route.key);
+        this._waitCloseComplete = false;
+        this.state = ViewState.Closed;
+        this.dispatch(ViewEvent.Closed);
+        if (this.onClosed) {
+            this.onClosed.call(this);
         }
-        return list;
+    }
+    get controller() {
+        return this._controller;
+    }
+    get route() {
+        return this._route;
     }
 }
-/**
- * 全局的UI对象库，用于管理一些常用的ui对象，例如主界面，背包
- */
-var uirepo = new UIObjectRepo();
 
 class ViewHistory extends RouteList {
     back() {
@@ -4049,63 +4021,6 @@ class ViewHistory extends RouteList {
 }
 const viewhistorys = new ViewHistory();
 
-class PageController extends ViewController {
-    constructor(routeName) {
-        super(routeName);
-        this._enableHistory = false;
-        this._layer = "";
-    }
-    /**
-     * 打开视图，如果视图已经存在则刷新视图
-     * @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);
@@ -6379,5 +6294,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, PageController, PathUtil, Pool, RandUtil, Route, RouteList, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, 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, 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