@zhongguo168a/yxeditor-common 0.0.87 → 0.0.89

package/dist/index.d.ts

@@ -1347,7 +1347,7 @@ declare class ViewModel extends EventDispatcher {
     protected onStop(): void;
 }
 
-declare class ViewList extends List<RouteView> {
+declare class ViewList extends List<ViewModel> {
 }
 /**
  * 路由唯一编号->视图
@@ -1361,7 +1361,7 @@ declare class ViewDict extends Dictionary<string, any> {
   * @param validFunc 符合条件的视图对象会被关闭
   * @returns 被关闭的视图
   */
-    closeExclusion(validFunc?: (existed: RouteView) => boolean): ViewList;
+    closeExclusion(validFunc?: (existed: ViewModel) => boolean): ViewList;
     listByRoutePath(path: string): ViewList;
     listByTags(tags: string[]): ViewList;
     /**
@@ -2180,5 +2180,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: WidgetUtil;
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -4128,7 +4128,6 @@ class ViewDict extends Dictionary {
             }
         });
         closedList.forEach((index, item) => {
-            item.controller;
             item.close();
         });
         return closedList;
@@ -4226,6 +4225,215 @@ class ViewHistory extends RouteList {
 }
 const viewhistorys = new ViewHistory();
 
+class ViewModel extends EventDispatcher {
+    /**
+     * 视图模型的名称
+     * @param name
+     */
+    constructor(name) {
+        super();
+        this._waitOpenComplete = false;
+        this._waitCloseComplete = false;
+        this.datas = new MapObject({});
+        this.tags = new MapObject({});
+        this.enableHistory = false;
+        this.state = 0;
+        this.name = name;
+    }
+    /**
+     * 视图模型的编号
+     * 默认为视图模型的类型，表示该模型在应用中唯一
+     * 如果应用中，存在多个
+     * @returns
+     */
+    getIdent() {
+        return this.name;
+    }
+    /**
+ *
+ * @param asset 通过此方法创建的节点，自动添加 RouteComponent 到节点上
+ */
+    createNode(asset) {
+        let node = instantiate(asset);
+        this.node = node;
+        let com = node.addComponent(ViewModelComponent);
+        com.viewModel = this;
+    }
+    /**
+     * 使用route的视图模型，可以实现通过路由，操作视图
+     * @param route
+     * @param controller
+     */
+    useRoute(route, controller) {
+        this._route = route;
+        this._controller = controller;
+    }
+    open() {
+        if (this.state != ViewState.Closed) {
+            return;
+        }
+        let route = this._route;
+        if (route) {
+            if (routeviews.get(route.key)) {
+                throw `视图已存在: route=${route.key}`;
+            }
+            routeviews.set(route.key, this);
+        }
+        this.state = ViewState.Opening;
+        this.dispatch(ViewEvent.Opening);
+        //
+        try {
+            //
+            this.onOpen();
+            if (!this._waitOpenComplete) {
+                // 没有被打断，打开完成
+                this.openComplete();
+            }
+            else {
+                // 被打断了，等待完成1
+            }
+        }
+        catch (e) {
+            console.error(`open view ${this.toString()}`);
+            console.error(e.stack);
+            //
+            this.close();
+        }
+    }
+    close() {
+        if (this.state == ViewState.Closed) {
+            return;
+        }
+        let route = this._route;
+        if (route) {
+            routeviews.delete(this._route.key);
+        }
+        this.state = ViewState.Closeing;
+        this.dispatch(ViewEvent.Closeing);
+        try {
+            this.onClose();
+            if (!this._waitCloseComplete) {
+                // 没有被打断，关闭完成
+                this.closeComplete();
+            }
+            else {
+                // 被打断了，等待完成1
+            }
+        }
+        catch (e) {
+            console.error(`close view ${this.toString()}`);
+            console.error(e.stack);
+        }
+    }
+    refresh() {
+        try {
+            this.onRefresh();
+        }
+        catch (e) {
+            console.error(`refresh view ${this.toString()}`);
+            console.error(e.stack);
+        }
+    }
+    stop(reason) {
+        try {
+            this.onStop();
+        }
+        catch (e) {
+            console.error(`stop view ${this.toString()}`);
+            console.error(e.stack);
+        }
+        this.dispatch(ViewEvent.Stop);
+    }
+    /**
+     * 等待发送的结果
+     * 如果返回 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.getIdent}, ${this.id}]`;
+    }
+    /**
+         * 等待打开完成指令
+         */
+    waitOpenComplete() {
+        this._waitOpenComplete = true;
+    }
+    openComplete() {
+        if (this.state == ViewState.Opened) {
+            return;
+        }
+        this.state = ViewState.Opened;
+        // @ts-ignore
+        this._waitOpenComplete = false;
+        this.onOpened();
+        this.dispatch(ViewEvent.Opened);
+    }
+    waitCloseComplete() {
+        // @ts-ignore
+        this._waitCloseComplete = true;
+    }
+    closeComplete() {
+        if (this.state == ViewState.Closed) {
+            return;
+        }
+        routeviews.delete(this.getIdent());
+        this._waitCloseComplete = false;
+        this.state = ViewState.Closed;
+        this.dispatch(ViewEvent.Closed);
+        this.onClosed();
+    }
+    get reason() {
+        return this._reason;
+    }
+    onOpen() {
+    }
+    onOpened() {
+    }
+    onClose() {
+    }
+    onClosed() {
+    }
+    onRefresh() {
+    }
+    /**
+     *  默认执行 close();
+     */
+    onStop() {
+        this.close();
+    }
+    ;
+}
+
 class Listener {
     static create(ident) {
         return new Listener(ident);
@@ -6638,5 +6846,5 @@ class WidgetUtil {
 }
 var widgetutil = new WidgetUtil();
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, routeviews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 //# sourceMappingURL=index.esm.js.map