@zhongguo168a/yxeditor-common 0.0.166 → 0.0.167

package/dist/index.d.ts

@@ -671,8 +671,8 @@ declare class List<T = any> {
      * @param other
      */
     pushList(other: List<T>): void;
-    getData(): T[];
-    resetData(val: T[]): void;
+    array(): T[];
+    resetArray(val: T[]): void;
     /**
      * 随机获取【count】个项，并返回【target】对象
      * @param count
@@ -689,7 +689,7 @@ declare class List<T = any> {
     randomOne(): T;
     protected callPush(value: any): void;
     protected callRemove(value: any): void;
-    protected _data: any[];
+    protected _array: any[];
     private _onSet;
     private _onDelete;
     private _onSetCaller;
@@ -736,7 +736,7 @@ declare class ListSource extends EventDispatcher {
      * @param idCreator
      */
     static createByArray(arr: any[], target?: ListSource, idCreator?: (item: any) => string): ListSource;
-    static createByListItem(arr: IListItem[], target?: ListSource): any;
+    static createByListItem(arr: IListItem[], target?: ListSource): ListSource;
     /**
      * 设置数据时触发
      * dispatchParams = {node:ListNode}
@@ -799,8 +799,8 @@ declare class ListSource extends EventDispatcher {
     refresh(node: ListNode): void;
     walk(f: (node: ListNode) => boolean): boolean;
     walkPrev(node: ListNode, f: (node: ListNode) => boolean): boolean;
-    get data(): List<ListNode>;
-    private _data;
+    get list(): List<ListNode>;
+    private _list;
 }
 
 declare class DictIterator {

package/dist/index.esm.js

@@ -2603,7 +2603,7 @@ class ListIterator {
 }
 class List {
     constructor() {
-        this._data = [];
+        this._array = [];
         this._onSet = null;
         this._onDelete = null;
     }
@@ -2616,7 +2616,7 @@ class List {
         this._onDeleteCaller = caller;
     }
     firstByCondition(conf) {
-        let data = this._data;
+        let data = this._array;
         for (let i = 0; i < data.length; i++) {
             let item = data[i];
             if (conf(i, item)) {
@@ -2626,7 +2626,7 @@ class List {
         return [-1, null];
     }
     lastByCondition(conf) {
-        let data = this._data;
+        let data = this._array;
         for (let i = data.length - 1; i >= 0; i--) {
             let item = data[i];
             if (conf(i, item)) {
@@ -2637,7 +2637,7 @@ class List {
     }
     forEach(handler) {
         let iterator = new ListIterator();
-        let data = this._data;
+        let data = this._array;
         for (let i = 0; i < data.length; i++) {
             let item = data[i];
             handler(i, item, iterator);
@@ -2654,7 +2654,7 @@ class List {
      */
     removeByCondition(cond, removedList) {
         let iterator = new ListIterator();
-        let data = this._data;
+        let data = this._array;
         for (let i = data.length - 1; i >= 0; i--) {
             let item = data[i];
             if (cond(i, item, iterator)) {
@@ -2679,7 +2679,7 @@ class List {
             throw new Error("需要设置目标对象");
         }
         let iterator = new ListIterator();
-        let data = this._data;
+        let data = this._array;
         for (let i = 0; i < data.length; i++) {
             let item = data[i];
             if (cond(i, item, iterator)) ;
@@ -2690,29 +2690,29 @@ class List {
         return target;
     }
     pop() {
-        let item = this._data.pop();
+        let item = this._array.pop();
         this.callRemove(item);
         return item;
     }
     shift() {
-        let item = this._data.shift();
+        let item = this._array.shift();
         this.callRemove(item);
         return item;
     }
     first() {
-        return this._data[0];
+        return this._array[0];
     }
     last() {
-        return this._data[this._data.length - 1];
+        return this._array[this._array.length - 1];
     }
     removeAt(index) {
         if (index >= 0) {
-            let removed = this._data.splice(index, 1);
+            let removed = this._array.splice(index, 1);
             this.callRemove(removed[0]);
         }
     }
     remove(item) {
-        let data = this._data;
+        let data = this._array;
         let index = data.indexOf(item);
         if (index != -1) {
             data.splice(index, 1);
@@ -2724,22 +2724,22 @@ class List {
      * @param other
      */
     removeList(other) {
-        for (const item of other._data) {
+        for (const item of other._array) {
             this.remove(item);
         }
     }
     sort(compareFn) {
-        this._data.sort(compareFn);
+        this._array.sort(compareFn);
     }
     reverse() {
-        this._data.reverse();
+        this._array.reverse();
     }
     /**
      * useIter默认为true，因为如果是false的话，没有触发onSet，导致数据污染
      * @param useIter 使用遍历的方式可以触发onSet
      */
     clear(useIter = true) {
-        let data = this._data;
+        let data = this._array;
         if (useIter) {
             for (let i = 0; i < data.length; i++) {
                 const item = data[i];
@@ -2747,7 +2747,7 @@ class List {
             }
         }
         else {
-            this._data.length = 0;
+            this._array.length = 0;
         }
     }
     /**
@@ -2756,7 +2756,7 @@ class List {
      * @param useIter 使用遍历的方式可以触发onSet
      */
     clone(target, useIter = true) {
-        let data = this._data;
+        let data = this._array;
         if (useIter) {
             for (let i = 0; i < data.length; i++) {
                 const item = data[i];
@@ -2764,16 +2764,16 @@ class List {
             }
         }
         else {
-            let newdata = target.getData().concat(data);
-            target.resetData(newdata);
+            let newdata = target.array().concat(data);
+            target.resetArray(newdata);
         }
         return target;
     }
     get length() {
-        return this._data.length;
+        return this._array.length;
     }
     insertAt(index, ...item) {
-        this._data.splice(index, 0, ...item);
+        this._array.splice(index, 0, ...item);
         this.callPush(item);
     }
     /**
@@ -2781,7 +2781,7 @@ class List {
      * @param item
      */
     insertBefore(beforeItem, ...item) {
-        let data = this._data;
+        let data = this._array;
         let index = data.indexOf(beforeItem);
         if (index == -1) {
             data.push(item);
@@ -2796,7 +2796,7 @@ class List {
      * @param item
      */
     insertAfter(afterItem, ...item) {
-        let data = this._data;
+        let data = this._array;
         let index = data.indexOf(afterItem);
         if (index == -1) {
             data.push(item);
@@ -2807,33 +2807,33 @@ class List {
         this.callPush(item);
     }
     at(index) {
-        return this._data[index];
+        return this._array[index];
     }
     set(index, item) {
-        let existed = this._data[index];
+        let existed = this._array[index];
         if (existed) {
             if (existed == item) {
                 return;
             }
             this.callRemove(existed);
         }
-        this._data[index] = item;
+        this._array[index] = item;
         this.callPush(item);
     }
     swap(a, b) {
         let aidx = this.indexOf(a);
         let bidx = this.indexOf(b);
-        let d = this._data;
+        let d = this._array;
         [d[aidx], d[bidx]] = [d[bidx], a[aidx]];
     }
     indexOf(item) {
-        return this._data.indexOf(item);
+        return this._array.indexOf(item);
     }
     has(item) {
-        return this._data.indexOf(item) != -1;
+        return this._array.indexOf(item) != -1;
     }
     push(item) {
-        this._data.push(item);
+        this._array.push(item);
         this.callPush(item);
     }
     /**
@@ -2841,15 +2841,15 @@ class List {
      * @param other
      */
     pushList(other) {
-        for (const item of other._data) {
+        for (const item of other._array) {
             this.push(item);
         }
     }
-    getData() {
-        return this._data;
+    array() {
+        return this._array;
     }
-    resetData(val) {
-        this._data = val;
+    resetArray(val) {
+        this._array = val;
     }
     /**
      * 随机获取【count】个项，并返回【target】对象
@@ -2861,11 +2861,11 @@ class List {
         if (!target) {
             target = new List();
         }
-        let data = this._data;
+        let data = this._array;
         if (data.length <= 0) {
             return target;
         }
-        const copyItems = [...this._data]; // 创建副本以避免修改原数组
+        const copyItems = [...this._array]; // 创建副本以避免修改原数组
         for (let i = 0; i < count && copyItems.length > 0; i++) {
             const randomIndex = Math.floor(Math.random() * copyItems.length);
             target.push(copyItems[randomIndex]);
@@ -2882,7 +2882,7 @@ class List {
       * @param target
       */
     randomOne() {
-        let data = this._data;
+        let data = this._array;
         if (data.length <= 0) {
             return null;
         }
@@ -2934,7 +2934,7 @@ class ListNode {
 class ListSource extends EventDispatcher {
     constructor() {
         super(...arguments);
-        this._data = new List();
+        this._list = new List();
     }
     /**
      * 通过数组创建 ListSource。ListSource的id自动生成。如果需要指定编号，可设置 idCreator
@@ -2975,16 +2975,16 @@ class ListSource extends EventDispatcher {
         return target;
     }
     at(index) {
-        return this._data.at(index);
+        return this._list.at(index);
     }
     first() {
-        return this._data.first();
+        return this._list.first();
     }
     last() {
-        return this._data.last();
+        return this._list.last();
     }
     get length() {
-        return this._data.length;
+        return this._list.length;
     }
     /**
      * 添加项，无法添加相同的项
@@ -2995,15 +2995,15 @@ class ListSource extends EventDispatcher {
         if (this.contains(node)) {
             return;
         }
-        this._data.push(node);
+        this._list.push(node);
         node.root = this;
         if (enableDispatch) {
             this.dispatch(ListSource.EVENT_ADD, { node: node });
         }
     }
     getById(id) {
-        for (let i = 0; i < this._data.length; i++) {
-            let node = this._data.at(i);
+        for (let i = 0; i < this._list.length; i++) {
+            let node = this._list.at(i);
             if (node.id == id) {
                 return node;
             }
@@ -3011,20 +3011,20 @@ class ListSource extends EventDispatcher {
         return null;
     }
     remove(node) {
-        let index = this._data.indexOf(node);
+        let index = this._list.indexOf(node);
         if (index == -1) {
             return;
         }
         node.root = null;
-        this._data.removeAt(index);
+        this._list.removeAt(index);
         this.dispatch(ListSource.EVENT_REMOVE, { node: node, index: index });
     }
     removeAll() {
-        this._data.clear();
+        this._list.clear();
         this.dispatch(ListSource.EVENT_REMOVE_ALL);
     }
     swap(a, b) {
-        this._data.swap(a, b);
+        this._list.swap(a, b);
         this.dispatch(ListSource.EVENT_SWAP, { nodes: [a, b] });
     }
     contains(node) {
@@ -3034,8 +3034,8 @@ class ListSource extends EventDispatcher {
         return this.indexOfById(id) != -1;
     }
     indexOf(node) {
-        for (let i = 0; i < this._data.length; i++) {
-            let item = this._data.at(i);
+        for (let i = 0; i < this._list.length; i++) {
+            let item = this._list.at(i);
             if (item.id == node.id) {
                 return i;
             }
@@ -3043,8 +3043,8 @@ class ListSource extends EventDispatcher {
         return -1;
     }
     indexOfById(id) {
-        for (let i = 0; i < this._data.length; i++) {
-            let item = this._data.at(i);
+        for (let i = 0; i < this._list.length; i++) {
+            let item = this._list.at(i);
             if (item.id == id) {
                 return i;
             }
@@ -3075,7 +3075,7 @@ class ListSource extends EventDispatcher {
     }
     walk(f) {
         for (let i = 0; i < this.length; i++) {
-            let item = this._data.at(i);
+            let item = this._list.at(i);
             if (!f(item)) {
                 return false;
             }
@@ -3087,14 +3087,14 @@ class ListSource extends EventDispatcher {
             return;
         }
         for (let i = index; i >= 0; i--) {
-            let item = this._data.at(i);
+            let item = this._list.at(i);
             if (!f(item)) {
                 return false;
             }
         }
     }
-    get data() {
-        return this._data;
+    get list() {
+        return this._list;
     }
 }
 /**
@@ -4735,7 +4735,7 @@ class CallbackList {
         if (this._data.length == 0) {
             return;
         }
-        let data = this._data.getData();
+        let data = this._data.array();
         for (let listener of data) {
             if (listener.isOn()) {
                 listener._dispatch(params, subIdent);