@zhongguo168a/yxeditor-common 0.0.26 → 0.0.27

package/dist/index.d.ts

@@ -1007,7 +1007,7 @@ declare class Route {
     protected _route: string;
 }
 
-declare class PageController extends Controller {
+declare class ViewController extends Controller {
     constructor(routeName: string, config?: {
         layer?: string;
         tags?: string[];
@@ -1015,33 +1015,33 @@ declare class PageController extends Controller {
     });
     open(...args: any[]): void;
     close(...args: any[]): void;
-    protected onOpening(page: Page): void;
-    protected onOpened(page: Page): void;
-    protected onClosing(page: Page): void;
-    protected onClosed(page: Page): void;
-    protected onRefresh(page: Page): void;
-    openByRoute(route: Route): Page;
-    private openPage;
-    openComplete(page: Page): void;
-    closeByRoute(route?: Route): Page;
-    private closePage;
-    closeComplete(page: Page): void;
+    protected onOpening(view: View): void;
+    protected onOpened(view: View): void;
+    protected onClosing(view: View): void;
+    protected onClosed(view: View): void;
+    protected onRefresh(view: View): void;
+    openByRoute(route: Route): View;
+    private openView;
+    openComplete(view: View): void;
+    closeByRoute(route?: Route): View;
+    private closeView;
+    closeComplete(view: View): void;
     refresh(): void;
     get layer(): string;
     hasTags(tags: string[]): boolean;
     setLayer(name: string): this;
     setTags(tags: string[]): this;
-    get lastPage(): Page;
+    get lastView(): View;
     get route(): Route;
     get enableHistory(): boolean;
     protected _enableHistory: boolean;
     protected _route: Route;
-    protected _lastPage: Page;
+    protected _lastView: View;
     protected _tags: {};
     protected _layer: string;
 }
 
-declare enum PageState {
+declare enum ViewState {
     /**
      * 关闭
      */
@@ -1059,15 +1059,15 @@ declare enum PageState {
      */
     Closeing = 3
 }
-declare enum PageEvent {
+declare enum ViewEvent {
     Opening = "opening",
     Opened = "opened",
     Closeing = "closeing",
     Closed = "closed",
     Stop = "stop"
 }
-declare class Page extends EventManager {
-    constructor(controller: PageController, route: Route);
+declare class View extends EventManager {
+    constructor(controller: ViewController, route: Route);
     /**
      * 等待打开完成指令
      */
@@ -1084,13 +1084,13 @@ declare class Page extends EventManager {
     toString(): string;
     protected _waitOpenComplete: boolean;
     protected _waitCloseComplete: boolean;
-    get controller(): PageController;
+    get controller(): ViewController;
     get route(): Route;
     datas: {};
     tags: {};
     layer: string;
-    state: PageState;
-    protected _controller: PageController;
+    state: ViewState;
+    protected _controller: ViewController;
     protected _route: Route;
 }
 
@@ -1098,14 +1098,20 @@ declare class Page extends EventManager {
  * 视图管理器
  * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
  */
-declare class PageLayer {
+declare class ViewLayer {
     name: string;
     constructor(name: string);
     close(): void;
+    /**
+     * 历史记录
+     */
+    getHistory(): Route[];
+    back(): void;
     /**
      * 当前的页面
      */
-    currentPage: Page;
+    currentView: View;
+    protected _history: Route[];
 }
 
 declare class UIObjectDict extends Dictionary<string, any | List> {
@@ -1121,47 +1127,41 @@ declare class UIObjectDict extends Dictionary<string, any | List> {
 }
 declare var uidict: UIObjectDict;
 
-declare class PageList extends List<Page> {
+declare class ViewList extends List<View> {
 }
-declare class PageRepo extends PageList {
+declare class ViewRepo extends ViewList {
     constructor();
-    openByString(route: string): Page;
+    openByString(route: string): View;
     /**
      * 打开页面
      * 一个路由代表一个页面
      * @param route
      */
-    open(route: Route): Page;
+    open(route: Route): View;
     close(route: Route): void;
     /**
      * 如果页面存在，则刷新
      * @param route
      */
     refresh(route: Route): void;
-    /**
-     * 历史记录
-     */
-    getHistory(): Route[];
-    back(): void;
-    getByRoute(route: Route): Page;
-    listByRoutePath(path: string): PageList;
-    listByTags(tags: string[]): PageList;
-    getLayerMain(): PageLayer;
+    getByRoute(route: Route): View;
+    listByRoutePath(path: string): ViewList;
+    listByTags(tags: string[]): ViewList;
+    getLayerMain(): ViewLayer;
     /**
      * @param name
      */
-    getLayer(name: string): PageLayer;
-    protected getOrNewLayer(name: string): PageLayer;
-    getController(name: string): PageController;
-    registerController(ctrl: PageController): void;
+    getLayer(name: string): ViewLayer;
+    protected getOrNewLayer(name: string): ViewLayer;
+    getController(name: string): ViewController;
+    registerController(ctrl: ViewController): void;
     get objectDict(): UIObjectDict;
     protected _objectDict: UIObjectDict;
     protected _indexLayer: {};
     protected _indexRoute: {};
-    protected _history: Route[];
     protected _ctrlDict: ControllerDict;
 }
-declare const pagerepo: PageRepo;
+declare const viewrepo: ViewRepo;
 
 /**
  * 事件字符串分隔符
@@ -2025,5 +2025,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, pagerepo, 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, 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 type { CreatorFunction, DisposeFunction, IController, IError, IEventManager, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -3475,39 +3475,39 @@ class Factory {
     }
 }
 
-var PageState;
-(function (PageState) {
+var ViewState;
+(function (ViewState) {
     /**
      * 关闭
      */
-    PageState[PageState["Closed"] = 0] = "Closed";
+    ViewState[ViewState["Closed"] = 0] = "Closed";
     /**
      * 正在打开
      */
-    PageState[PageState["Opening"] = 1] = "Opening";
+    ViewState[ViewState["Opening"] = 1] = "Opening";
     /**
      * 已打开
      */
-    PageState[PageState["Opened"] = 2] = "Opened";
+    ViewState[ViewState["Opened"] = 2] = "Opened";
     /**
      * 正在关闭
      */
-    PageState[PageState["Closeing"] = 3] = "Closeing";
-})(PageState || (PageState = {}));
-var PageEvent;
-(function (PageEvent) {
+    ViewState[ViewState["Closeing"] = 3] = "Closeing";
+})(ViewState || (ViewState = {}));
+var ViewEvent;
+(function (ViewEvent) {
     // 正在打开
-    PageEvent["Opening"] = "opening";
+    ViewEvent["Opening"] = "opening";
     // 已打开
-    PageEvent["Opened"] = "opened";
+    ViewEvent["Opened"] = "opened";
     // 正在打开
-    PageEvent["Closeing"] = "closeing";
+    ViewEvent["Closeing"] = "closeing";
     // 已关闭
-    PageEvent["Closed"] = "closed";
+    ViewEvent["Closed"] = "closed";
     // 停止
-    PageEvent["Stop"] = "stop";
-})(PageEvent || (PageEvent = {}));
-class Page extends EventManager {
+    ViewEvent["Stop"] = "stop";
+})(ViewEvent || (ViewEvent = {}));
+class View extends EventManager {
     constructor(controller, route) {
         super();
         this._waitOpenComplete = false;
@@ -3543,7 +3543,7 @@ class Page extends EventManager {
      */
     wait() {
         switch (this.state) {
-            case PageState.Opening:
+            case ViewState.Opening:
                 return new Promise((resolve, reject) => {
                     let opened = () => {
                         this.off("opened", this, opened);
@@ -3558,7 +3558,7 @@ class Page extends EventManager {
                     this.on("opened", this, opened);
                     this.on("canceled", this, canceled);
                 });
-            case PageState.Closeing:
+            case ViewState.Closeing:
                 return new Promise((resolve, reject) => {
                     let opened = () => {
                         this.off("closed", this, opened);
@@ -3573,7 +3573,7 @@ class Page extends EventManager {
         }
     }
     toString() {
-        return `Page[${this.route.toString()}, ${this.id}]`;
+        return `View[${this.route.toString()}, ${this.id}]`;
     }
     get controller() {
         return this._controller;
@@ -3710,21 +3710,6 @@ class Route {
 // 打开界面缓存的route对象
 Route.data = {};
 
-/**
- * 视图管理器
- * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
- */
-class PageLayer {
-    constructor(name) {
-        this.name = name;
-    }
-    close() {
-        if (this.currentPage) {
-            this.currentPage.controller.closeByRoute();
-        }
-    }
-}
-
 class UIObjectDict extends Dictionary {
     /**
      * 获取唯一的
@@ -3779,14 +3764,38 @@ class UIObjectDict extends Dictionary {
 }
 var uidict = new UIObjectDict();
 
-class PageList 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 PageRepo extends PageList {
+class ViewRepo extends ViewList {
     constructor() {
         super();
         this._indexLayer = {};
         this._indexRoute = {};
-        this._history = [];
         this._ctrlDict = new ControllerDict();
         this.onSet(this, (item) => {
             this._indexRoute[item.route.key] = item;
@@ -3806,14 +3815,14 @@ class PageRepo extends PageList {
     open(route) {
         let controller = this.getController(route.path);
         if (!controller) {
-            throw new Error("page controller no register: " + route.path);
+            throw new Error("view 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);
+            throw new Error("view controller no register: " + route.path);
         }
         controller.closeByRoute(route);
     }
@@ -3822,25 +3831,16 @@ class PageRepo extends PageList {
      * @param route
      */
     refresh(route) {
-        let page = this.getByRoute(route);
-        if (page) {
-            page.controller.refresh();
+        let view = this.getByRoute(route);
+        if (view) {
+            view.controller.refresh();
         }
     }
-    /**
-     * 历史记录
-     */
-    getHistory() {
-        return this._history;
-    }
-    back() {
-        this.open(this._history.pop());
-    }
     getByRoute(route) {
         return this._indexRoute[route.key];
     }
     listByRoutePath(path) {
-        let list = new PageList();
+        let list = new ViewList();
         this.forEach((index, item) => {
             if (item.controller.route.path == path) {
                 list.push(item);
@@ -3849,7 +3849,7 @@ class PageRepo extends PageList {
         return list;
     }
     listByTags(tags) {
-        let list = new PageList();
+        let list = new ViewList();
         this.forEach((index, item) => {
             if (item.controller.hasTags(tags)) {
                 list.push(item);
@@ -3869,7 +3869,7 @@ class PageRepo extends PageList {
     getOrNewLayer(name) {
         let layer = this._indexLayer[name];
         if (!layer) {
-            layer = new PageLayer(name);
+            layer = new ViewLayer(name);
             this._indexLayer[name] = layer;
         }
         return layer;
@@ -3889,9 +3889,9 @@ class PageRepo extends PageList {
         return dict;
     }
 }
-const pagerepo = new PageRepo();
+const viewrepo = new ViewRepo();
 
-class PageController extends Controller {
+class ViewController extends Controller {
     constructor(routeName, config) {
         super(routeName);
         this._enableHistory = false;
@@ -3913,144 +3913,144 @@ class PageController extends Controller {
     }
     close(...args) {
     }
-    onOpening(page) {
+    onOpening(view) {
     }
-    onOpened(page) {
+    onOpened(view) {
     }
-    onClosing(page) {
+    onClosing(view) {
     }
-    onClosed(page) {
+    onClosed(view) {
     }
-    onRefresh(page) {
+    onRefresh(view) {
     }
     openByRoute(route) {
-        let newpage;
-        let oldpage;
+        let newview;
+        let oldview;
         if (this._layer) {
-            let layer = pagerepo.getLayer(this._layer);
-            oldpage = layer.currentPage;
-            if (oldpage) {
-                let currentRoute = oldpage.route;
+            let layer = viewrepo.getLayer(this._layer);
+            oldview = layer.currentView;
+            if (oldview) {
+                let currentRoute = oldview.route;
                 if (currentRoute.key == route.key) {
-                    return oldpage;
+                    return oldview;
                 }
                 // 关闭
-                let currentCtrl = oldpage.controller;
-                currentCtrl.closePage(oldpage);
+                let currentCtrl = oldview.controller;
+                currentCtrl.closeView(oldview);
                 if (currentCtrl._enableHistory) {
-                    pagerepo.getHistory().push(oldpage.route);
+                    layer.getHistory().push(oldview.route);
                 }
             }
-            newpage = new Page(this, route);
-            layer.currentPage = newpage;
+            newview = new View(this, route);
+            layer.currentView = newview;
         }
         else {
-            newpage = new Page(this, route);
+            newview = new View(this, route);
         }
         //
-        this.openPage(newpage);
+        this.openView(newview);
         //
-        return newpage;
+        return newview;
     }
-    openPage(page) {
-        if (!page) {
+    openView(view) {
+        if (!view) {
             return;
         }
-        if (page.state != PageState.Closed) {
+        if (view.state != ViewState.Closed) {
             return;
         }
-        this._lastPage = page;
-        page.state = PageState.Opening;
-        page.dispatch(PageEvent.Opening);
+        this._lastView = view;
+        view.state = ViewState.Opening;
+        view.dispatch(ViewEvent.Opening);
         //
         try {
-            pagerepo.push(page);
-            this.onOpening(page);
+            viewrepo.push(view);
+            this.onOpening(view);
             // @ts-ignore
-            if (!page._waitOpenComplete) {
+            if (!view._waitOpenComplete) {
                 // 没有被打断，打开完成
-                this.openComplete(page);
+                this.openComplete(view);
             }
             else {
                 // 被打断了，等待完成1
             }
         }
         catch (e) {
-            console.error(`open page ${page.route.key}`);
+            console.error(`open view ${view.route.key}`);
             console.error(e.stack);
             //
-            this.closePage(page);
+            this.closeView(view);
         }
     }
-    openComplete(page) {
-        if (!page) {
+    openComplete(view) {
+        if (!view) {
             return;
         }
-        this._lastPage = page;
-        page.state = PageState.Opened;
-        this.onOpened(page);
-        page.dispatch(PageEvent.Opened);
+        this._lastView = view;
+        view.state = ViewState.Opened;
+        this.onOpened(view);
+        view.dispatch(ViewEvent.Opened);
     }
     closeByRoute(route) {
-        let lastpage;
+        let lastview;
         if (this._layer) {
-            let layer = pagerepo.getLayer(this._layer);
-            lastpage = layer.currentPage;
-            layer.currentPage = null;
+            let layer = viewrepo.getLayer(this._layer);
+            lastview = layer.currentView;
+            layer.currentView = null;
+            if (this._enableHistory) {
+                // 清空历史记录
+                layer.getHistory().length = 0;
+            }
         }
         else {
-            lastpage = pagerepo.getByRoute(route);
-        }
-        this.closePage(lastpage);
-        if (this._enableHistory) {
-            // 清空历史记录
-            pagerepo.getHistory().length = 0;
+            lastview = viewrepo.getByRoute(route);
         }
-        return lastpage;
+        this.closeView(lastview);
+        return lastview;
     }
-    closePage(page) {
-        if (!page) {
+    closeView(view) {
+        if (!view) {
             return;
         }
-        if (page.state == PageState.Closed) {
+        if (view.state == ViewState.Closed) {
             return;
         }
-        this._lastPage = page;
-        page.state = PageState.Closeing;
-        page.dispatch(PageEvent.Closeing);
+        this._lastView = view;
+        view.state = ViewState.Closeing;
+        view.dispatch(ViewEvent.Closeing);
         try {
-            this.onClosing(page);
+            this.onClosing(view);
             // @ts-ignore
-            if (!page._waitCloseComplete) {
+            if (!view._waitCloseComplete) {
                 // 没有被打断，关闭完成
-                this.closeComplete(page);
+                this.closeComplete(view);
             }
             else {
                 // 被打断了，等待完成1
             }
         }
         catch (e) {
-            console.error(`close page ${page.route.key}`);
+            console.error(`close view ${view.route.key}`);
             console.error(e.stack);
         }
     }
-    closeComplete(page) {
-        if (!page) {
+    closeComplete(view) {
+        if (!view) {
             return;
         }
-        pagerepo.remove(page);
-        this._lastPage = page;
+        viewrepo.remove(view);
+        this._lastView = view;
         // @ts-ignore
-        let objectDict = page._objectDict;
+        let objectDict = view._objectDict;
         if (objectDict) {
             objectDict.clear();
         }
-        page.state = PageState.Closed;
-        page.dispatch(PageEvent.Closed);
-        this.onClosed(page);
+        view.state = ViewState.Closed;
+        view.dispatch(ViewEvent.Closed);
+        this.onClosed(view);
     }
     refresh() {
-        this.onRefresh(this._lastPage);
+        this.onRefresh(this._lastView);
     }
     get layer() {
         return this._layer;
@@ -4075,8 +4075,8 @@ class PageController extends Controller {
         this._tags = tags;
         return this;
     }
-    get lastPage() {
-        return this._lastPage;
+    get lastView() {
+        return this._lastView;
     }
     get route() {
         return this._route;
@@ -6359,5 +6359,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, pagerepo, 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, 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 };
 //# sourceMappingURL=index.esm.js.map