@zhongguo168a/yxeditor-common 0.0.20 → 0.0.22

package/dist/index.d.ts

@@ -474,6 +474,7 @@ declare class TreeNode<T = any> {
     walkPrev(f: (node: TreeNode) => boolean, inChild?: (node: TreeNode) => boolean): any;
     private _walkPrev;
     dump(): void;
+    first(): TreeNode;
     /**
      * 遍历节点，查找指定编号的节点
      */
@@ -1006,19 +1007,6 @@ declare class Route {
     protected _route: string;
 }
 
-declare class UIObjectDict extends Dictionary<string, any | List> {
-    /**
-     * 获取唯一的
-     * @param prefab
-     */
-    uniqueObject(prefab: Prefab): Node;
-    removeObject(prefab: Prefab): void;
-    popObject(prefab: Prefab): any;
-    backObject(object: Node): void;
-    protected getList(key: any): List;
-}
-declare var uidict: UIObjectDict;
-
 declare class PageController extends Controller {
     constructor(routeName: string, config?: {
         layer?: string;
@@ -1094,8 +1082,6 @@ declare class Page extends EventManager {
      */
     wait(): Promise<this>;
     toString(): string;
-    get objectDict(): UIObjectDict;
-    protected _objectDict: UIObjectDict;
     protected _waitOpenComplete: boolean;
     protected _waitCloseComplete: boolean;
     get controller(): PageController;
@@ -1122,6 +1108,19 @@ declare class PageLayer {
     currentPage: Page;
 }
 
+declare class UIObjectDict extends Dictionary<string, any | List> {
+    /**
+     * 获取唯一的
+     * @param prefab
+     */
+    uniqueObject(prefab: Prefab): Node;
+    removeObject(prefab: Prefab): void;
+    popObject(prefab: Prefab): any;
+    backObject(object: Node): void;
+    protected getList(key: any): List;
+}
+declare var uidict: UIObjectDict;
+
 declare class PageList extends List<Page> {
 }
 declare class PageRepo extends PageList {
@@ -1880,7 +1879,9 @@ declare class StringUtil {
      * @param source
      */
     evalFormat(format: string, source: any): string;
-    splitLast(val: string, separator: string): string;
+    splitIndex(val: string, separator: string, index: number, dflt?: string): string;
+    splitFirst(val: string, separator: string, dflt?: string): string;
+    splitLast(val: string, separator: string, dflt?: string): string;
     /**
      * 从最后一个分隔符截断字符串，返回截断的左右字符串
      * @param val

package/dist/index.esm.js

@@ -2136,6 +2136,12 @@ class TreeNode {
             return true;
         });
     }
+    first() {
+        if (this.children.length > 0) {
+            return this.children[0];
+        }
+        return null;
+    }
     /**
      * 遍历节点，查找指定编号的节点
      */
@@ -3469,60 +3475,6 @@ class Factory {
     }
 }
 
-class UIObjectDict extends Dictionary {
-    /**
-     * 获取唯一的
-     * @param prefab
-     */
-    uniqueObject(prefab) {
-        if (!prefab) {
-            console.warn("未设置prefab");
-            return;
-        }
-        let key = prefab.data.uuid;
-        let object = this.get(key);
-        if (!object) {
-            object = instantiate(prefab);
-            this.set(key, object);
-        }
-        return object;
-    }
-    removeObject(prefab) {
-        if (!prefab) {
-            console.warn("未设置prefab");
-            return;
-        }
-        this.delete(prefab.data.uuid);
-    }
-    popObject(prefab) {
-        let object;
-        let key = prefab.data.uuid;
-        let list = this.getList(key);
-        if (list.length == 0) {
-            object = instantiate(prefab);
-        }
-        else {
-            object = list.pop();
-        }
-        return object;
-    }
-    backObject(object) {
-        // @ts-ignore
-        let key = object.prefab.asset.uuid;
-        let list = this.getList(key);
-        list.push(object);
-    }
-    getList(key) {
-        let list = this.get(key);
-        if (!list) {
-            list = new List();
-            this.set(key, list);
-        }
-        return list;
-    }
-}
-var uidict = new UIObjectDict();
-
 var PageState;
 (function (PageState) {
     /**
@@ -3623,14 +3575,6 @@ class Page extends EventManager {
     toString() {
         return `Page[${this.route.toString()}, ${this.id}]`;
     }
-    get objectDict() {
-        let dict = this._objectDict;
-        if (!dict) {
-            dict = new UIObjectDict();
-            this._objectDict = dict;
-        }
-        return dict;
-    }
     get controller() {
         return this._controller;
     }
@@ -3781,6 +3725,60 @@ class PageLayer {
     }
 }
 
+class UIObjectDict extends Dictionary {
+    /**
+     * 获取唯一的
+     * @param prefab
+     */
+    uniqueObject(prefab) {
+        if (!prefab) {
+            console.warn("未设置prefab");
+            return;
+        }
+        let key = prefab.data.uuid;
+        let object = this.get(key);
+        if (!object) {
+            object = instantiate(prefab);
+            this.set(key, object);
+        }
+        return object;
+    }
+    removeObject(prefab) {
+        if (!prefab) {
+            console.warn("未设置prefab");
+            return;
+        }
+        this.delete(prefab.data.uuid);
+    }
+    popObject(prefab) {
+        let object;
+        let key = prefab.data.uuid;
+        let list = this.getList(key);
+        if (list.length == 0) {
+            object = instantiate(prefab);
+        }
+        else {
+            object = list.pop();
+        }
+        return object;
+    }
+    backObject(object) {
+        // @ts-ignore
+        let key = object.prefab.asset.uuid;
+        let list = this.getList(key);
+        list.push(object);
+    }
+    getList(key) {
+        let list = this.get(key);
+        if (!list) {
+            list = new List();
+            this.set(key, list);
+        }
+        return list;
+    }
+}
+var uidict = new UIObjectDict();
+
 class PageList extends List {
 }
 class PageRepo extends PageList {
@@ -5929,12 +5927,26 @@ class StringUtil {
         }
         return result;
     }
-    splitLast(val, separator) {
+    splitIndex(val, separator, index, dflt = "") {
+        let arr = val.split(separator);
+        if (arr.length > index) {
+            return arr[index];
+        }
+        return dflt;
+    }
+    splitFirst(val, separator, dflt = "") {
+        let arr = val.split(separator);
+        if (arr.length > 0) {
+            return arr[0];
+        }
+        return dflt;
+    }
+    splitLast(val, separator, dflt = "") {
         let arr = val.split(separator);
         if (arr.length > 0) {
             return arr[arr.length - 1];
         }
-        return val;
+        return dflt;
     }
     /**
      * 从最后一个分隔符截断字符串，返回截断的左右字符串