@zhongguo168a/yxeditor-common 0.0.30 → 0.0.32

package/README.md

@@ -27,3 +27,17 @@ A TypeScript project template with Rollup and Vitest.
 - `npm run test:ui` - Run tests with UI
 - `npm run test:run` - Run tests once
 - `npm run coverage` - Run tests with coverage report
+
+
+```shell
+npm version patch && npm publish --access public
+``` 
+
+
+```shell
+npm version patch && npm publish --access public
+``` 
+
+```shell
+npm version patch && npm publish --access public
+``` 

package/dist/index.d.ts

@@ -298,7 +298,7 @@ interface IEventManager {
 /**
  * 事件派发器
  */
-declare class EventManager implements IEventManager {
+declare class EventDispatcher implements IEventManager {
     constructor();
     dispose(): void;
     /**
@@ -347,7 +347,7 @@ declare class EventManager implements IEventManager {
 /**
  * 全局的事件派发器
  */
-declare const eventmgr: EventManager;
+declare const eventmgr: EventDispatcher;
 
 declare class TreeIterator {
     break(): void;
@@ -507,7 +507,7 @@ declare class TreeNode<T = any> {
     fixDepthAndRoot(depth: number, root: TreeRoot): void;
     toString(): string;
 }
-declare class TreeRoot<NODE = any> extends EventManager {
+declare class TreeRoot<NODE = any> extends EventDispatcher {
     /**
      * 添加数据节点
      * dispatchParams = {node:TreeNode, parent:TreeNode|TreeRoot}
@@ -622,7 +622,7 @@ declare class ListNode {
     getTag(name: string): any;
     setTag(name: string, value: any): void;
 }
-declare class ListSource extends EventManager {
+declare class ListSource extends EventDispatcher {
     /**
      * 通过数组创建 ListSource。ListSource的id自动生成。如果需要指定编号，可设置 idCreator
      * @param arr
@@ -807,8 +807,8 @@ declare class DictSource extends Dictionary<string, DictNode> {
     static EVENT_TAGS_SET: string;
     setNodeTags(node: DictNode, tag: string, value: any): void;
     refreshNode(node: DictNode): void;
-    get dispatcher(): EventManager;
-    protected _dispatcher: EventManager;
+    get dispatcher(): EventDispatcher;
+    protected _dispatcher: EventDispatcher;
 }
 
 declare class ListIterator {
@@ -919,10 +919,11 @@ declare class ControllerDict extends Dictionary<string, IController> {
 }
 declare class ControllerRepo extends ControllerDict {
     constructor();
-    add(controller: IController): void;
+    register(controller: IController): void;
     remove(name: string): void;
     dispose(): void;
 }
+declare const ctrlrepo: ControllerRepo;
 
 interface IModule {
 }
@@ -935,7 +936,7 @@ declare class SimpleModel {
     get core(): IModule;
     protected _mod: any;
 }
-declare class Model extends EventManager {
+declare class Model extends EventDispatcher {
     constructor(core?: IModule);
     get module(): IModule;
     protected _module: any;
@@ -1006,44 +1007,7 @@ declare class Route {
     private _params;
     protected _route: string;
 }
-
-declare class ViewController extends Controller {
-    constructor(routeName: string, config?: {
-        layer?: string;
-        tags?: string[];
-        enableHistory?: boolean;
-    });
-    open(...args: any[]): void;
-    close(...args: any[]): 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;
-    /**
-     * viewrepo中存在页面才会关闭
-     * @param route
-     * @returns
-     */
-    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 lastView(): View;
-    get route(): Route;
-    get enableHistory(): boolean;
-    protected _enableHistory: boolean;
-    protected _route: Route;
-    protected _lastView: View;
-    protected _tags: {};
-    protected _layer: string;
+declare class RouteList extends List<Route> {
 }
 
 declare enum ViewState {
@@ -1071,16 +1035,8 @@ declare enum ViewEvent {
     Closed = "closed",
     Stop = "stop"
 }
-declare class View extends EventManager {
+declare class View extends EventDispatcher {
     constructor(controller: ViewController, route: Route);
-    /**
-     * 等待打开完成指令
-     */
-    waitOpenComplete(): void;
-    waitCloseComplete(): void;
-    openComplete(): void;
-    closeComplete(): void;
-    stop(reason: LinkError): void;
     /**
      * 等待发送的结果
      * 如果返回 null，表示主动取消 [cancel]
@@ -1099,26 +1055,6 @@ declare class View extends EventManager {
     protected _route: Route;
 }
 
-/**
- * 视图管理器
- * 打开一个视图的时候，可能会听过加载资源，读取数据，调整布局，切换特效等处理，所以使用视图模式封装视图打开关闭的逻辑
- */
-declare class ViewLayer {
-    name: string;
-    constructor(name: string);
-    close(): void;
-    /**
-     * 历史记录
-     */
-    getHistory(): Route[];
-    back(): void;
-    /**
-     * 当前的页面
-     */
-    currentView: View;
-    protected _history: Route[];
-}
-
 declare class UIObjectDict extends Dictionary<string, any | List> {
     /**
      * 获取唯一的
@@ -1134,7 +1070,12 @@ declare var uidict: UIObjectDict;
 
 declare class ViewList extends List<View> {
 }
-declare class ViewRepo extends ViewList {
+/**
+ * 路由唯一编号->视图
+ */
+declare class ViewDict extends Dictionary<string, View> {
+}
+declare class ViewRepo extends ViewDict {
     constructor();
     openByString(route: string): View;
     /**
@@ -1152,22 +1093,90 @@ declare class ViewRepo extends ViewList {
     getByRoute(route: Route): View;
     listByRoutePath(path: string): ViewList;
     listByTags(tags: string[]): ViewList;
-    getLayerMain(): ViewLayer;
-    /**
-     * @param name
-     */
-    getLayer(name: string): ViewLayer;
-    protected getOrNewLayer(name: string): ViewLayer;
-    getController(name: string): ViewController;
-    registerController(ctrl: ViewController): void;
+    protected getController(name: string): ViewController;
     get objectDict(): UIObjectDict;
     protected _objectDict: UIObjectDict;
     protected _indexLayer: {};
     protected _indexRoute: {};
-    protected _ctrlDict: ControllerDict;
 }
 declare const viewrepo: ViewRepo;
 
+declare class ViewController extends Controller {
+    constructor(routeName: string);
+    /**
+      * 当视图需要通过路由打开时，需要实现此方法
+      * @param route
+      */
+    open(route: Route): View;
+    protected onOpening(view: View): void;
+    protected onOpened(view: View): void;
+    protected onClosing(view: View): void;
+    protected onClosed(view: View): void;
+    protected refreshView(view: View): void;
+    protected openView(view: View): void;
+    /**
+         * 等待打开完成指令
+         */
+    protected waitOpenComplete(view: View): void;
+    protected openComplete(view: View): void;
+    /**
+     * 当视图需要通过路由关闭时，需要实现此方法
+     * @param route
+     * @returns
+     */
+    close(route?: Route): View;
+    /**
+     * 关闭相斥的视图对象
+     * 1. 关闭同一层的所有视图对象
+     * 2. 关闭符合相斥规则的视图对象
+     * @param view
+     * @param validFunc 符合条件的视图对象会被关闭
+     * @returns 被关闭的视图
+     */
+    closeExclusion(validFunc?: (existed: View) => boolean): ViewList;
+    protected closeView(view: View): void;
+    protected waitCloseComplete(view: View): void;
+    protected closeComplete(view: View): void;
+    refresh(): void;
+    get layer(): string;
+    hasTags(tags: string[]): boolean;
+    setLayer(name: string): this;
+    setTags(tags: string[]): this;
+    useHistory(): this;
+    get lastView(): View;
+    get route(): Route;
+    get enableHistory(): boolean;
+    protected _enableHistory: boolean;
+    protected _route: Route;
+    protected _lastView: View;
+    protected _tags: {};
+    protected _layer: string;
+}
+
+declare class ViewHistory extends RouteList {
+    back(): void;
+}
+declare const viewhistorys: RouteList;
+
+declare class PageController extends ViewController {
+    constructor(routeName: string);
+    /**
+     * 打开视图，如果视图已经存在则刷新视图
+     * @param route
+     */
+    open(route: Route): View;
+    /**
+     * @param route
+     * @returns
+     */
+    close(route?: Route): View;
+    useHistory(): this;
+    get route(): Route;
+    get enableHistory(): boolean;
+    protected _enableHistory: boolean;
+    protected _layer: string;
+}
+
 /**
  * 事件字符串分隔符
  */
@@ -2030,5 +2039,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, 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 { 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, UIObjectDict, 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, uidict, uimgr, uiutil, viewhistorys, viewrepo, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventManager, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };