@zhongguo168a/yxeditor-common 0.0.18 → 0.0.19

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 {
@@ -1043,7 +1036,7 @@ declare class PageLayer {
 declare class PageList extends List<Page> {
 }
 declare class PageRepo extends PageList {
-    constructor(module: IModule);
+    constructor();
     openByString(route: string): Page;
     /**
      * 打开页面
@@ -1070,7 +1063,7 @@ declare class PageRepo extends PageList {
      */
     getLayer(name: string): PageLayer;
     protected getOrNewLayer(name: string): PageLayer;
-    getController(route: Route): PageController;
+    getController(name: string): PageController;
     registerController(ctrl: PageController): void;
     get objectDict(): UIObjectDict;
     protected _objectDict: UIObjectDict;
@@ -1078,8 +1071,8 @@ declare class PageRepo extends PageList {
     protected _indexRoute: {};
     protected _history: Route[];
     protected _ctrlDict: ControllerDict;
-    protected _module: IModule;
 }
+declare const pageRepo: PageRepo;
 
 declare class PageController extends Controller {
     constructor(routeName: string, config?: {
@@ -1087,7 +1080,6 @@ declare class PageController extends Controller {
         tags?: string[];
         enableHistory?: boolean;
     });
-    init(module: IModule, pageRepo: PageRepo): void;
     open(...args: any[]): void;
     close(): void;
     protected onOpening(page: Page): void;
@@ -1164,7 +1156,7 @@ declare class Page extends EventManager {
     protected _waitCloseComplete: boolean;
     get controller(): PageController;
     get route(): Route;
-    cache: {};
+    datas: {};
     tags: {};
     layer: string;
     state: PageState;
@@ -2022,5 +2014,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;
@@ -3793,10 +3784,6 @@ class PageController extends Controller {
             }
         }
     }
-    init(module, pageRepo) {
-        this._module = module;
-        this._pagerepo = pageRepo;
-    }
     open(...args) {
     }
     close() {
@@ -3996,7 +3983,7 @@ class PageLayer {
 class PageList extends List {
 }
 class PageRepo extends PageList {
-    constructor(module) {
+    constructor() {
         super();
         this._indexLayer = {};
         this._indexRoute = {};
@@ -4018,14 +4005,14 @@ class PageRepo extends PageList {
      * @param route
      */
     open(route) {
-        let controller = this.getController(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);
+        let controller = this.getController(route.path);
         if (!controller) {
             throw new Error("page controller no register: " + route.path);
         }
@@ -4079,11 +4066,10 @@ class PageRepo extends PageList {
         }
         return layer;
     }
-    getController(route) {
-        return this._ctrlDict.get(route.path);
+    getController(name) {
+        return this._ctrlDict.get(name);
     }
     registerController(ctrl) {
-        ctrl.init(this._module, this);
         this._ctrlDict.set(ctrl.name, ctrl);
     }
     get objectDict() {
@@ -4095,6 +4081,7 @@ class PageRepo extends PageList {
         return dict;
     }
 }
+const pageRepo = new PageRepo();
 
 class Listener {
     static create(ident) {
@@ -6338,5 +6325,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