@zhongguo168a/yxeditor-common 0.0.53 → 0.0.55

package/dist/index.d.ts

@@ -1010,6 +1010,136 @@ declare class Route {
 declare class RouteList extends List<Route> {
 }
 
+declare class MapObject extends Dictionary<string, MapValue> {
+    object: {};
+    constructor(object: {});
+    getValue(key: string): MapValue;
+}
+declare class MapValue {
+    obj: {};
+    key: any;
+    constructor(obj: {}, key: any);
+    isUndefined(): boolean;
+    toNumber(): number;
+    toString(): string;
+    toBoolean(): boolean;
+    toAny(): any;
+}
+declare class MapUtil {
+    /**
+     * 获取所欲的值
+     */
+    values<T = any>(m: {
+        [key: string]: T;
+    }): T[];
+    /**
+     * 获取所有的键
+     */
+    keys(m: {
+        [key: string]: any;
+    }): string[];
+    /**
+     * 以字符串数字作为键值的map，转化成数组
+     */
+    toList<T = any>(m: {
+        [key: string]: T;
+    }): T[];
+    /**
+     * 以字符串数字作为键值的map，转化成数组
+     */
+    listToMap(list: any[]): any;
+    /**
+     * 转换成数字, 如果原值无效, 返回0
+     * @constructor
+     */
+    has(m: any, key: string): boolean;
+    /**
+     * 转换成数字, 如果原值无效, 返回0
+     * @constructor
+     */
+    number(m: any, key: string, dflt?: number): number;
+    /**
+     * 转换成字符串, 如果原值无效, 返回""
+     * @constructor
+     */
+    string(m: any, key: string, dflt?: string): string;
+    /**
+     * 转换成布尔值, 如果原值无效, 返回false
+     * @constructor
+     */
+    boolean(m: any, key: string, dflt?: boolean): boolean;
+    /**
+     * 转换成{}, 如果原值无效, 返回{}
+     * @constructor
+     */
+    map(m: any, key: string, dflt?: boolean | Object): any;
+    /**
+     * 转换成[], 如果原值无效, 返回[]
+     * @constructor
+     */
+    array(m: any, key: string, dflt?: boolean | Array<any>): any[];
+    /**
+     * 返回第一个符合条件的key
+     * @param m
+     * @param conf
+     */
+    keyOfConf(m: any, conf: (key: string, item: any) => boolean): string;
+    /**
+     * 比较对象，并返回包含差异的对象
+     * 如果返回 undefined 表示没有差异
+     * @param obj
+     * @param parent
+     * @param removeDefault
+     */
+    diff(obj: any, parent: any, removeDefault?: boolean): any;
+    /**
+     * 克隆对象
+     * @param obj
+     */
+    clone(obj: any): any;
+    /**
+     * 通过path设置属性，创建不存在的路径对象
+     * @param obj
+     * @param path "/key1/key2"
+     * @param data
+     */
+    setByPath(obj: any, path: string, data: any): void;
+    /**
+     * 通过path删除
+     * @param obj
+     * @param path "/key1/key2"
+     */
+    removeByPath(obj: any, path: string): void;
+    /**
+     * 通过path获取属性
+     * @param obj
+     * @param path
+     */
+    getByPath(obj: any, path: string): any;
+    flat(obj: any, split?: string): any;
+    _flat(obj: any, result: any, path: string, split?: string): any;
+    /**
+     * 比较两个对象，包括基础类型
+     * @param a
+     * @param b
+     */
+    compare(a: any, b: any): boolean;
+    /**
+     * 从[from]对象复制到 [to]对象
+     * 如果from字段为object并且等于null,则设置to字段为null
+     * 如果from字段为undefined, 则不覆盖
+     * @param from
+     * @param to
+     * @param tokey 如果[to]存在key才进行拷贝
+     */
+    copy(from: any, to: any, tokey?: boolean): void;
+    /**
+     * 去掉兼职
+     */
+    flatString(target: any): string;
+}
+declare const maputil: MapUtil;
+
 declare enum ViewState {
     /**
      * 关闭
@@ -1071,8 +1201,8 @@ declare class RouteView extends EventDispatcher {
     onStop(value: (ctx: this) => void): this;
     get reason(): LinkError;
     node: Node;
-    datas: {};
-    tags: {};
+    datas: MapObject;
+    tags: MapObject;
     enableHistory: boolean;
     layer: string;
     state: ViewState;
@@ -1358,7 +1488,10 @@ declare class AssetLoader extends Dispatcher {
         onComplete?: (err: any, asset: any) => void;
         preload?: boolean;
     }): this;
-    loadConfig(uri: string): this;
+    loadJson(uri: string, otherConfig?: {
+        onComplete?: (err: any, asset: any) => void;
+        preload?: boolean;
+    }): this;
     loadSpriteFrame(uri: string, otherConfig?: {
         onComplete?: (err: any, asset: any) => void;
         uuid?: string;
@@ -1687,121 +1820,6 @@ declare class IdentUtil {
 }
 declare const identutil: IdentUtil;
 
-declare class MapUtil {
-    /**
-     * 获取所欲的值
-     */
-    values<T = any>(m: {
-        [key: string]: T;
-    }): T[];
-    /**
-     * 获取所有的键
-     */
-    keys(m: {
-        [key: string]: any;
-    }): string[];
-    /**
-     * 以字符串数字作为键值的map，转化成数组
-     */
-    toList<T = any>(m: {
-        [key: string]: T;
-    }): T[];
-    /**
-     * 以字符串数字作为键值的map，转化成数组
-     */
-    listToMap(list: any[]): any;
-    /**
-     * 转换成数字, 如果原值无效, 返回0
-     * @constructor
-     */
-    has(m: any, key: string): boolean;
-    /**
-     * 转换成数字, 如果原值无效, 返回0
-     * @constructor
-     */
-    number(m: any, key: string, dflt?: number): number;
-    /**
-     * 转换成字符串, 如果原值无效, 返回""
-     * @constructor
-     */
-    string(m: any, key: string, dflt?: string): string;
-    /**
-     * 转换成布尔值, 如果原值无效, 返回false
-     * @constructor
-     */
-    boolean(m: any, key: string, dflt?: boolean): boolean;
-    /**
-     * 转换成{}, 如果原值无效, 返回{}
-     * @constructor
-     */
-    map(m: any, key: string, dflt?: boolean | Object): any;
-    /**
-     * 转换成[], 如果原值无效, 返回[]
-     * @constructor
-     */
-    array(m: any, key: string, dflt?: boolean | Array<any>): any[];
-    /**
-     * 返回第一个符合条件的key
-     * @param m
-     * @param conf
-     */
-    keyOfConf(m: any, conf: (key: string, item: any) => boolean): string;
-    /**
-     * 比较对象，并返回包含差异的对象
-     * 如果返回 undefined 表示没有差异
-     * @param obj
-     * @param parent
-     * @param removeDefault
-     */
-    diff(obj: any, parent: any, removeDefault?: boolean): any;
-    /**
-     * 克隆对象
-     * @param obj
-     */
-    clone(obj: any): any;
-    /**
-     * 通过path设置属性，创建不存在的路径对象
-     * @param obj
-     * @param path "/key1/key2"
-     * @param data
-     */
-    setByPath(obj: any, path: string, data: any): void;
-    /**
-     * 通过path删除
-     * @param obj
-     * @param path "/key1/key2"
-     */
-    removeByPath(obj: any, path: string): void;
-    /**
-     * 通过path获取属性
-     * @param obj
-     * @param path
-     */
-    getByPath(obj: any, path: string): any;
-    flat(obj: any, split?: string): any;
-    _flat(obj: any, result: any, path: string, split?: string): any;
-    /**
-     * 比较两个对象，包括基础类型
-     * @param a
-     * @param b
-     */
-    compare(a: any, b: any): boolean;
-    /**
-     * 从[from]对象复制到 [to]对象
-     * 如果from字段为object并且等于null,则设置to字段为null
-     * 如果from字段为undefined, 则不覆盖
-     * @param from
-     * @param to
-     * @param tokey 如果[to]存在key才进行拷贝
-     */
-    copy(from: any, to: any, tokey?: boolean): void;
-    /**
-     * 去掉兼职
-     */
-    flatString(target: any): string;
-}
-declare const maputil: MapUtil;
-
 declare class MathUtil {
     version: number;
     TempVec2: Vec2;
@@ -2044,5 +2062,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, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, 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, uimgr, uirepo, uiutil, viewhistorys, 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, MapObject, MapUtil, MapValue, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, 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, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -1121,6 +1121,41 @@ class ConvertUtil {
 }
 const convertutil = new ConvertUtil();
 
+class MapObject extends Dictionary {
+    constructor(object) {
+        super();
+        this.object = object;
+    }
+    getValue(key) {
+        let value = this.get(key);
+        if (!value) {
+            value = new MapValue(this, key);
+            this.set(key, value);
+        }
+        return value;
+    }
+}
+class MapValue {
+    constructor(obj, key) {
+        this.obj = obj;
+        this.key = key;
+    }
+    isUndefined() {
+        return this.obj[this.key] == undefined;
+    }
+    toNumber() {
+        return maputil.number(this.obj, this.key);
+    }
+    toString() {
+        return maputil.string(this.obj, this.key);
+    }
+    toBoolean() {
+        return maputil.boolean(this.obj, this.key);
+    }
+    toAny() {
+        return this.obj[this.key];
+    }
+}
 class MapUtil {
     /**
      * 获取所欲的值
@@ -3855,8 +3890,8 @@ class RouteView extends EventDispatcher {
         super();
         this._waitOpenComplete = false;
         this._waitCloseComplete = false;
-        this.datas = {};
-        this.tags = {};
+        this.datas = new MapObject({});
+        this.tags = new MapObject({});
         this.enableHistory = false;
         this.state = 0;
         this._onStop = (ctx) => {
@@ -4571,10 +4606,14 @@ class AssetLoader extends Dispatcher {
         this._loaderList.push(item);
         return this;
     }
-    loadConfig(uri) {
+    loadJson(uri, otherConfig) {
         let item = new LoaderItem();
-        item.type = "Config";
+        item.type = "Json";
         item.uri = new AssetURI(uri);
+        if (otherConfig) {
+            item.onComplete = otherConfig.onComplete;
+            item.preload = otherConfig.preload != undefined ? otherConfig.preload : false;
+        }
         this._loaderList.push(item);
         return this;
     }
@@ -4642,7 +4681,7 @@ class AssetLoader extends Dispatcher {
                     });
                     break;
                 }
-                case "Config": {
+                case "Json": {
                     assetManager.loadBundle(item.uri.bundle, (err, bundle) => {
                         if (this._stop) {
                             return;
@@ -6349,5 +6388,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, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, 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, uimgr, uirepo, uiutil, viewhistorys, 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, MapObject, MapUtil, MapValue, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, 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, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
 //# sourceMappingURL=index.esm.js.map