@zhongguo168a/yxeditor-common 0.0.18 → 0.0.20

package/dist/index.d.ts

@@ -893,28 +893,19 @@ declare class List<T = any> {
     private _onDeleteCaller;
 }
 
-interface IModule {
-    get controllers(): ControllerDict;
-}
-
 interface IController {
     get name(): string;
-    get module(): IModule;
-    init(core: IModule, ...args: any): any;
     enable(): any;
     disable(): any;
     dispose(): any;
 }
 declare class Controller {
     constructor(name: string);
-    init(module: IModule, ...args: any[]): void;
     enable(): void;
     disable(): void;
     dispose(): void;
     get name(): string;
-    get module(): IModule;
     get isEnable(): boolean;
-    protected _module: IModule;
     protected _name: string;
     protected _enabled: boolean;
 }
@@ -926,11 +917,13 @@ declare class ControllerDict extends Dictionary<string, IController> {
     disableAll(): void;
 }
 declare class ControllerRepo extends ControllerDict {
-    constructor(mod: IModule);
+    constructor();
     add(controller: IController): void;
     remove(name: string): void;
     dispose(): void;
-    protected _mod: IModule;
+}
+
+interface IModule {
 }
 
 interface IModel {
@@ -1026,68 +1019,12 @@ declare class UIObjectDict extends Dictionary<string, any | List> {
 }
 declare var uidict: UIObjectDict;
 
-/**
- * 视图管理器
- * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
- */
-declare class PageLayer {
-    name: string;
-    constructor(name: string);
-    close(): void;
-    /**
-     * 当前的页面
-     */
-    currentPage: Page;
-}
-
-declare class PageList extends List<Page> {
-}
-declare class PageRepo extends PageList {
-    constructor(module: IModule);
-    openByString(route: string): Page;
-    /**
-     * 打开页面
-     * 一个路由代表一个页面
-     * @param route
-     */
-    open(route: Route): Page;
-    close(route: Route): void;
-    /**
-     * 如果页面存在，则刷新
-     * @param route
-     */
-    refresh(route: Route): void;
-    /**
-     * 历史记录
-     */
-    getHistory(): Route[];
-    back(): void;
-    getByRoute(route: Route): Page;
-    listByTags(tags: string[]): PageList;
-    getLayerMain(): PageLayer;
-    /**
-     * @param name
-     */
-    getLayer(name: string): PageLayer;
-    protected getOrNewLayer(name: string): PageLayer;
-    getController(route: Route): PageController;
-    registerController(ctrl: PageController): void;
-    get objectDict(): UIObjectDict;
-    protected _objectDict: UIObjectDict;
-    protected _indexLayer: {};
-    protected _indexRoute: {};
-    protected _history: Route[];
-    protected _ctrlDict: ControllerDict;
-    protected _module: IModule;
-}
-
 declare class PageController extends Controller {
     constructor(routeName: string, config?: {
         layer?: string;
         tags?: string[];
         enableHistory?: boolean;
     });
-    init(module: IModule, pageRepo: PageRepo): void;
     open(...args: any[]): void;
     close(): void;
     protected onOpening(page: Page): void;
@@ -1114,7 +1051,6 @@ declare class PageController extends Controller {
     protected _lastPage: Page;
     protected _tags: {};
     protected _layer: string;
-    protected _pagerepo: PageRepo;
 }
 
 declare enum PageState {
@@ -1164,7 +1100,7 @@ declare class Page extends EventManager {
     protected _waitCloseComplete: boolean;
     get controller(): PageController;
     get route(): Route;
-    cache: {};
+    datas: {};
     tags: {};
     layer: string;
     state: PageState;
@@ -1172,6 +1108,61 @@ declare class Page extends EventManager {
     protected _route: Route;
 }
 
+/**
+ * 视图管理器
+ * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
+ */
+declare class PageLayer {
+    name: string;
+    constructor(name: string);
+    close(): void;
+    /**
+     * 当前的页面
+     */
+    currentPage: Page;
+}
+
+declare class PageList extends List<Page> {
+}
+declare class PageRepo extends PageList {
+    constructor();
+    openByString(route: string): Page;
+    /**
+     * 打开页面
+     * 一个路由代表一个页面
+     * @param route
+     */
+    open(route: Route): Page;
+    close(route: Route): void;
+    /**
+     * 如果页面存在，则刷新
+     * @param route
+     */
+    refresh(route: Route): void;
+    /**
+     * 历史记录
+     */
+    getHistory(): Route[];
+    back(): void;
+    getByRoute(route: Route): Page;
+    listByTags(tags: string[]): PageList;
+    getLayerMain(): PageLayer;
+    /**
+     * @param name
+     */
+    getLayer(name: string): PageLayer;
+    protected getOrNewLayer(name: string): PageLayer;
+    getController(name: string): PageController;
+    registerController(ctrl: PageController): void;
+    get objectDict(): UIObjectDict;
+    protected _objectDict: UIObjectDict;
+    protected _indexLayer: {};
+    protected _indexRoute: {};
+    protected _history: Route[];
+    protected _ctrlDict: ControllerDict;
+}
+declare const pagerepo: PageRepo;
+
 /**
  * 事件字符串分隔符
  */
@@ -2022,5 +2013,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, EventItem, EventManager, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, Page, PageController, PageEvent, PageLayer, PageList, PageRepo, PageState, PathUtil, Pool, RandUtil, Route, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, 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, 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, Page, PageController, PageEvent, PageLayer, PageList, PageRepo, PageState, PathUtil, Pool, RandUtil, Route, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, pagerepo, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uidict, uimgr, uiutil, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventManager, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -3348,9 +3348,6 @@ class Controller {
         this._enabled = false;
         this._name = name;
     }
-    init(module, ...args) {
-        this._module = module;
-    }
     enable() {
         if (this._enabled) {
             return;
@@ -3364,16 +3361,12 @@ class Controller {
         this._enabled = false;
     }
     dispose() {
-        this._module = null;
         this._enabled = false;
         this._name = "";
     }
     get name() {
         return this._name;
     }
-    get module() {
-        return this._module;
-    }
     get isEnable() {
         return this._enabled;
     }
@@ -3406,15 +3399,13 @@ class ControllerDict extends Dictionary {
     }
 }
 class ControllerRepo extends ControllerDict {
-    constructor(mod) {
+    constructor() {
         super();
-        this._mod = mod;
     }
     add(controller) {
         if (this.get(controller.name)) {
             throw new Error("重复创建控制器: " + name);
         }
-        controller.init(this._mod);
         this.set(controller.name, controller);
     }
     remove(name) {
@@ -3569,7 +3560,7 @@ class Page extends EventManager {
         super();
         this._waitOpenComplete = false;
         this._waitCloseComplete = false;
-        this.cache = {};
+        this.datas = {};
         this.tags = {};
         this.state = 0;
         this._controller = controller;
@@ -3775,6 +3766,124 @@ class Route {
 // 打开界面缓存的route对象
 Route.data = {};
 
+/**
+ * 视图管理器
+ * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
+ */
+class PageLayer {
+    constructor(name) {
+        this.name = name;
+    }
+    close() {
+        if (this.currentPage) {
+            this.currentPage.controller.closeByRoute();
+        }
+    }
+}
+
+class PageList extends List {
+}
+class PageRepo extends PageList {
+    constructor() {
+        super();
+        this._indexLayer = {};
+        this._indexRoute = {};
+        this._history = [];
+        this._ctrlDict = new ControllerDict();
+        this.onSet(this, (item) => {
+            this._indexRoute[item.route.path] = item;
+        });
+        this.onDelete(this, (item) => {
+            delete this._indexRoute[item.route.path];
+        });
+    }
+    openByString(route) {
+        return this.open(new Route(route));
+    }
+    /**
+     * 打开页面
+     * 一个路由代表一个页面
+     * @param route
+     */
+    open(route) {
+        let controller = this.getController(route.path);
+        if (!controller) {
+            throw new Error("page controller no register: " + route.path);
+        }
+        return controller.openByRoute(route);
+    }
+    close(route) {
+        let controller = this.getController(route.path);
+        if (!controller) {
+            throw new Error("page controller no register: " + route.path);
+        }
+        controller.closeByRoute(route);
+    }
+    /**
+     * 如果页面存在，则刷新
+     * @param route
+     */
+    refresh(route) {
+        let page = this.getByRoute(route);
+        if (page) {
+            page.controller.refresh();
+        }
+    }
+    /**
+     * 历史记录
+     */
+    getHistory() {
+        return this._history;
+    }
+    back() {
+        this.open(this._history.pop());
+    }
+    getByRoute(route) {
+        return this._indexRoute[route.path];
+    }
+    listByTags(tags) {
+        let list = new PageList();
+        this.forEach((index, item) => {
+            if (item.controller.hasTags(tags)) {
+                list.push(item);
+            }
+        });
+        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 PageLayer(name);
+            this._indexLayer[name] = layer;
+        }
+        return layer;
+    }
+    getController(name) {
+        return this._ctrlDict.get(name);
+    }
+    registerController(ctrl) {
+        this._ctrlDict.set(ctrl.name, ctrl);
+    }
+    get objectDict() {
+        let dict = this._objectDict;
+        if (!dict) {
+            dict = new UIObjectDict();
+            this._objectDict = dict;
+        }
+        return dict;
+    }
+}
+const pagerepo = new PageRepo();
+
 class PageController extends Controller {
     constructor(routeName, config) {
         super(routeName);
@@ -3793,10 +3902,6 @@ class PageController extends Controller {
             }
         }
     }
-    init(module, pageRepo) {
-        this._module = module;
-        this._pagerepo = pageRepo;
-    }
     open(...args) {
     }
     close() {
@@ -3815,7 +3920,6 @@ class PageController extends Controller {
         let newpage;
         let oldpage;
         if (this._layer) {
-            let pagerepo = this._pagerepo;
             let layer = pagerepo.getLayer(this._layer);
             oldpage = layer.currentPage;
             if (oldpage) {
@@ -3853,7 +3957,6 @@ class PageController extends Controller {
         page.dispatch(PageEvent.Opening);
         //
         try {
-            let pagerepo = this._pagerepo;
             pagerepo.push(page);
             this.onOpening(page);
             // @ts-ignore
@@ -3882,7 +3985,6 @@ class PageController extends Controller {
         page.dispatch(PageEvent.Opened);
     }
     closeByRoute(route) {
-        let pagerepo = this._pagerepo;
         let lastpage;
         if (this._layer) {
             let layer = pagerepo.getLayer(this._layer);
@@ -3929,7 +4031,6 @@ class PageController extends Controller {
         if (!page) {
             return;
         }
-        let pagerepo = this._pagerepo;
         pagerepo.remove(page);
         this._lastPage = page;
         // @ts-ignore
@@ -3978,124 +4079,6 @@ class PageController extends Controller {
     }
 }
 
-/**
- * 视图管理器
- * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
- */
-class PageLayer {
-    constructor(name) {
-        this.name = name;
-    }
-    close() {
-        if (this.currentPage) {
-            this.currentPage.controller.closeByRoute();
-        }
-    }
-}
-
-class PageList extends List {
-}
-class PageRepo extends PageList {
-    constructor(module) {
-        super();
-        this._indexLayer = {};
-        this._indexRoute = {};
-        this._history = [];
-        this._ctrlDict = new ControllerDict();
-        this.onSet(this, (item) => {
-            this._indexRoute[item.route.path] = item;
-        });
-        this.onDelete(this, (item) => {
-            delete this._indexRoute[item.route.path];
-        });
-    }
-    openByString(route) {
-        return this.open(new Route(route));
-    }
-    /**
-     * 打开页面
-     * 一个路由代表一个页面
-     * @param route
-     */
-    open(route) {
-        let controller = this.getController(route);
-        if (!controller) {
-            throw new Error("page controller no register: " + route.path);
-        }
-        return controller.openByRoute(route);
-    }
-    close(route) {
-        let controller = this.getController(route);
-        if (!controller) {
-            throw new Error("page controller no register: " + route.path);
-        }
-        controller.closeByRoute(route);
-    }
-    /**
-     * 如果页面存在，则刷新
-     * @param route
-     */
-    refresh(route) {
-        let page = this.getByRoute(route);
-        if (page) {
-            page.controller.refresh();
-        }
-    }
-    /**
-     * 历史记录
-     */
-    getHistory() {
-        return this._history;
-    }
-    back() {
-        this.open(this._history.pop());
-    }
-    getByRoute(route) {
-        return this._indexRoute[route.path];
-    }
-    listByTags(tags) {
-        let list = new PageList();
-        this.forEach((index, item) => {
-            if (item.controller.hasTags(tags)) {
-                list.push(item);
-            }
-        });
-        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 PageLayer(name);
-            this._indexLayer[name] = layer;
-        }
-        return layer;
-    }
-    getController(route) {
-        return this._ctrlDict.get(route.path);
-    }
-    registerController(ctrl) {
-        ctrl.init(this._module, this);
-        this._ctrlDict.set(ctrl.name, ctrl);
-    }
-    get objectDict() {
-        let dict = this._objectDict;
-        if (!dict) {
-            dict = new UIObjectDict();
-            this._objectDict = dict;
-        }
-        return dict;
-    }
-}
-
 class Listener {
     static create(ident) {
         return new Listener(ident);
@@ -6338,5 +6321,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, Page, PageController, PageEvent, PageLayer, PageList, PageRepo, PageState, PathUtil, Pool, RandUtil, Route, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, 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, 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, Page, PageController, PageEvent, PageLayer, PageList, PageRepo, PageState, PathUtil, Pool, RandUtil, Route, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectDict, UIPoolConfig, UISingleConfig, UIUtil, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, pagerepo, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uidict, uimgr, uiutil, widgetutil };
 //# sourceMappingURL=index.esm.js.map