light-h5-core-lib 2.10.8 → 2.10.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-h5-core-lib",
-  "version": "2.10.8",
+  "version": "2.10.9",
   "description": "light core lib",
   "main": "./LightCore.js",
   "types": "./type/index.d.ts",

package/pool/PoolObj.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolObj = void 0;
 /**
- * 对象池（泛型）
+ * 对象池（泛型）</br>
+ * 可以防止引用类型二次放入
  * @author Aonaufly
  */
 class PoolObj {
@@ -13,11 +14,12 @@ class PoolObj {
      * @param clearCallback Item清理函数
      * @param destroyCallback Item销毁函数
      */
-    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null) {
+    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null, isForceRefTypeChecking = true) {
         this._cap = cap == null ? 5 : cap;
         this._createCallback = createCallback;
         this._clearCallback = clearCallback;
         this._destroyCallback = destroyCallback;
+        this._isForceRefTypeChecking = isForceRefTypeChecking;
         this._pool = [];
         this.initCreate(initCreateNum == null ? 0 : initCreateNum);
     }
@@ -34,6 +36,14 @@ class PoolObj {
             this._pool.push(this._createCallback());
         }
     }
+    isObject(obj) {
+        const str = typeof obj;
+        if (str == "object")
+            return true;
+        if (str == "function")
+            return true;
+        return false;
+    }
     /**
      * 放入到对象池
      * @return 放入到对象池是否成功
@@ -45,6 +55,16 @@ class PoolObj {
             this._destroyCallback && this._destroyCallback(obj);
             return false;
         }
+        if (this._isForceRefTypeChecking &&
+            this._pool.length > 0 &&
+            this.isObject(obj)) {
+            for (let i = 0; i < this._pool.length; i++) {
+                if (this._pool[i] === obj) {
+                    //已经放入，无法二次放入
+                    return false;
+                }
+            }
+        }
         this._clearCallback && this._clearCallback(obj);
         this._pool.push(obj);
         return true;

package/type/index.d.ts

@@ -7,7 +7,8 @@ export interface IClear extends IDestroy {
 	clear(): void;
 }
 /**
- * 对象池（泛型）
+ * 对象池（泛型）</br>
+ * 可以防止引用类型二次放入
  * @author Aonaufly
  */
 export declare class PoolObj<T> implements IClear {
@@ -16,6 +17,7 @@ export declare class PoolObj<T> implements IClear {
 	private _createCallback;
 	private _clearCallback;
 	private _destroyCallback;
+	private _isForceRefTypeChecking;
 	/**
 	 * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b>
 	 * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b>
@@ -23,11 +25,12 @@ export declare class PoolObj<T> implements IClear {
 	 * @param clearCallback Item清理函数
 	 * @param destroyCallback Item销毁函数
 	 */
-	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void);
+	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void, isForceRefTypeChecking?: boolean);
 	/**
 	 * 初始化一些数量的item
 	 */
 	private initCreate;
+	private isObject;
 	/**
 	 * 放入到对象池
 	 * @return 放入到对象池是否成功