light-h5-core-lib 2.10.5 → 2.10.6

package/LightCore.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollisionDetectionUtil = exports.SelfDecrypt = exports.NumberUtil = exports.BooleanUtil = exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.SetterGetterBase = exports.ClassNameUtil = exports.PoolObj = void 0;
+exports.CollisionDetectionUtil = exports.SelfDecrypt = exports.GetDecorateUtils = exports.NumberUtil = exports.BooleanUtil = exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.SetterGetterBase = exports.ClassNameUtil = exports.PoolObj = void 0;
 var PoolObj_1 = require("./pool/PoolObj");
 Object.defineProperty(exports, "PoolObj", { enumerable: true, get: function () { return PoolObj_1.PoolObj; } });
 var BaseSingleton_1 = require("./common/base/BaseSingleton");
@@ -24,8 +24,8 @@ var BeizerUtil_1 = require("./common/util/BeizerUtil");
 Object.defineProperty(exports, "BeizerUtil", { enumerable: true, get: function () { return BeizerUtil_1.BeizerUtil; } });
 var MD5_1 = require("./common/md5/MD5");
 Object.defineProperty(exports, "MD5", { enumerable: true, get: function () { return MD5_1.MD5; } });
-var PromiseUtil_1 = __importDefault(require("./common/util/PromiseUtil"));
-exports.PromiseUtil = PromiseUtil_1.default;
+var PromiseUtil_1 = require("./common/util/PromiseUtil");
+Object.defineProperty(exports, "PromiseUtil", { enumerable: true, get: function () { return PromiseUtil_1.PromiseUtil; } });
 var Crc32Util_1 = __importDefault(require("./common/util/Crc32Util"));
 exports.Crc32Util = Crc32Util_1.default;
 var BooleanUtil_1 = require("./common/util/BooleanUtil");
@@ -40,6 +40,8 @@ var ClassNameUtil_1 = require("./common/util/ClassNameUtil");
 Object.defineProperty(exports, "ClassNameUtil", { enumerable: true, get: function () { return ClassNameUtil_1.ClassNameUtil; } });
 var SetterGetterBase_1 = require("./common/base/SetterGetterBase");
 Object.defineProperty(exports, "SetterGetterBase", { enumerable: true, get: function () { return SetterGetterBase_1.SetterGetterBase; } });
+var GetDecorateUtils_1 = require("./common/util/GetDecorateUtils");
+Object.defineProperty(exports, "GetDecorateUtils", { enumerable: true, get: function () { return GetDecorateUtils_1.GetDecorateUtils; } });
 module.exports = {
     PoolObj: PoolObj_1.PoolObj,
     ClassNameUtil: ClassNameUtil_1.ClassNameUtil,
@@ -53,10 +55,11 @@ module.exports = {
     StringUtil: StringUtil_1.StringUtil,
     UniqueIDUtil: UniqueIDUtil_1.UniqueIDUtil,
     BeizerUtil: BeizerUtil_1.BeizerUtil,
-    PromiseUtil: PromiseUtil_1.default,
+    PromiseUtil: PromiseUtil_1.PromiseUtil,
     Crc32Util: Crc32Util_1.default,
     BooleanUtil: BooleanUtil_1.BooleanUtil,
     NumberUtil: NumberUtil_1.NumberUtil,
+    GetDecorateUtils: GetDecorateUtils_1.GetDecorateUtils,
     SelfDecrypt: SelfDecrypt_1.SelfDecrypt,
     CollisionDetectionUtil: CollisionDetectionUtil_1.CollisionDetectionUtil,
 };

package/common/util/GetDecorateUtils.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetDecorateUtils = void 0;
+/**
+ * 获取装饰的相关参数
+ * @author Aonaufly
+ */
+var GetDecorateUtils = /** @class */ (function () {
+    function GetDecorateUtils() {
+    }
+    /**
+     * 获取类中成员
+     * @param obj
+     * @param memberName 成员名称
+     */
+    GetDecorateUtils.getObjMember = function (obj, memberName) {
+        if (!obj)
+            return null;
+        if (obj[memberName]) {
+            return obj[memberName];
+        }
+        if (obj["__proto__"] && obj["__proto__"]["constructor"] && obj["__proto__"]["constructor"][memberName]) {
+            return obj["__proto__"]["constructor"][memberName];
+        }
+        if (obj["prototype"] && obj["prototype"][memberName]) {
+            return obj["prototype"][memberName];
+        }
+        return null;
+    };
+    /**
+     * 绑定方法
+     * @param classObj
+     * @param funName
+     * @param fun
+     */
+    GetDecorateUtils.bindFun = function (classObj, funName, fun) {
+        if (classObj[funName] != null) {
+            classObj[funName] = fun.bind(classObj);
+        }
+        else if (classObj["__proto__"] && classObj["__proto__"]["constructor"] && classObj["__proto__"]["constructor"][funName]) {
+            classObj["__proto__"]["constructor"][funName] = fun.bind(classObj);
+        }
+        else if (classObj["prototype"] && classObj["prototype"][funName]) {
+            classObj["prototype"][funName] = fun.bind(classObj);
+        }
+        else {
+            console.warn("".concat(funName, " \u7ED1\u5B9A\u65B9\u6CD5\u5931\u8D25!"));
+        }
+    };
+    /**
+     * 设置字段/属性的值
+     * @param classObj
+     * @param fieldName
+     * @param value
+     */
+    GetDecorateUtils.setFieldValue = function (classObj, fieldName, value) {
+        if (classObj[fieldName] != null) {
+            classObj[fieldName] = value;
+            return true;
+        }
+        else if (classObj["__proto__"] && classObj["__proto__"]["constructor"] && classObj["__proto__"]["constructor"][fieldName]) {
+            classObj["__proto__"]["constructor"][fieldName] = value;
+            return true;
+        }
+        else if (classObj["prototype"] && classObj["prototype"][fieldName]) {
+            classObj["prototype"][fieldName] = value;
+            return true;
+        }
+        return false;
+    };
+    return GetDecorateUtils;
+}());
+exports.GetDecorateUtils = GetDecorateUtils;

package/common/util/PromiseUtil.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromiseUtil = void 0;
 /**
  * 异步处理工具
  * @author Aonaufly
@@ -44,31 +45,58 @@ var PromiseUtil = /** @class */ (function () {
     function PromiseUtil() {
     }
     /**
-     * 执行所有异步并返回数据
+     * 执行所有异步并返回数据<br>
+     * <div style="color: #FF0000;">⚠️:参数为异步方法数组,封装了异步方法的执行</div>
      */
     PromiseUtil.all = function (promiseArr) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var promises = Array.from(promiseArr);
-                        var r = [];
-                        var len = promises.length;
-                        var count = 0;
-                        var _loop_1 = function (i) {
-                            Promise.resolve(promises[i]).then(function (o) {
-                                r[i] = o;
-                                if (++count === len) {
-                                    resolve(r);
+                        if (!promiseArr || promiseArr.length == 0) {
+                            resolve(new Error('promiseArr is null'));
+                            return;
+                        }
+                        var execAsync = function (isFunc) {
+                            var arr = [];
+                            if (isFunc) {
+                                var promiseFuncs = promiseArr.slice(0);
+                                for (var i = 0; i < promiseFuncs.length; i++) {
+                                    arr.push(promiseFuncs[i]());
+                                }
+                            }
+                            else {
+                                var promiseObjects = promiseArr.slice(0);
+                                var item = void 0;
+                                for (var i = 0; i < promiseObjects.length; i++) {
+                                    item = promiseObjects[i];
+                                    if (item.params && item.params.length > 0) {
+                                        arr.push(item.asyncFunc.apply(item, item.params));
+                                    }
+                                    else {
+                                        arr.push(item.asyncFunc());
+                                    }
                                 }
-                            }).catch(function (e) { return reject(e); });
+                            }
+                            return arr;
                         };
-                        for (var i = 0; i < len; i++) {
-                            _loop_1(i);
-                        }
+                        var allPromises = execAsync(promiseArr[0] instanceof Function);
+                        Promise.all(allPromises).then(function (promiseResult) {
+                            resolve(promiseResult);
+                        }).catch(function (e) { return reject(e); });
                     })];
             });
         });
     };
+    /**
+     * 拼接带参数的异步列表
+     */
+    PromiseUtil.spliceExistParamsAsyncFuncList = function (funcList, params) {
+        var arr = [];
+        for (var i = 0; i < funcList.length; i++) {
+            arr.push({ asyncFunc: funcList[i], params: params[i] });
+        }
+        return arr;
+    };
     return PromiseUtil;
 }());
-exports.default = PromiseUtil;
+exports.PromiseUtil = PromiseUtil;

package/package.json

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

package/pool/PoolObj.js

@@ -56,8 +56,8 @@ var PoolObj = /** @class */ (function () {
     };
     /**
      * 获得一个Item<br>
-     * <b style="color:green">如果size==0，则自动使用createCallback创建</b><br>
-     * <b style="color:red">⚠️如果size==0 && createCallback==null,则返回null</b>
+     * <div style="color: #FF0000;">⚠️友情提示：如果有createCallback需要判断是否是New的item则提前使用 this.size == 0保存句柄</div><br>
+     * <b style="color:#FFFF00">⚠️如果size==0，则自动使用createCallback创建 ,如果size==0 && createCallback==null,则返回null</b>
      */
     PoolObj.prototype.one = function () {
         if (this._pool.length == 0) {

package/type/index.d.ts

@@ -35,8 +35,8 @@ export declare class PoolObj<T> implements IClear {
 	put(obj: T): boolean;
 	/**
 	 * 获得一个Item<br>
-	 * <b style="color:green">如果size==0，则自动使用createCallback创建</b><br>
-	 * <b style="color:red">⚠️如果size==0 && createCallback==null,则返回null</b>
+	 * <div style="color: #FF0000;">⚠️友情提示：如果有createCallback需要判断是否是New的item则提前使用 this.size == 0保存句柄</div><br>
+	 * <b style="color:#FFFF00">⚠️如果size==0，则自动使用createCallback创建 ,如果size==0 && createCallback==null,则返回null</b>
 	 */
 	one(): T;
 	/**
@@ -338,9 +338,20 @@ export declare class MD5 extends BaseSingleton {
  */
 export declare class PromiseUtil {
 	/**
-	 * 执行所有异步并返回数据
+	 * 执行所有异步并返回数据<br>
+	 * <div style="color: #FF0000;">⚠️:参数为异步方法数组,封装了异步方法的执行</div>
 	 */
-	static all(promiseArr: Promise<any>[]): Promise<any>;
+	static all(promiseArr: (() => Promise<any>)[] | {
+		asyncFunc: (...args: any[]) => Promise<any>;
+		params: any[];
+	}[]): Promise<any>;
+	/**
+	 * 拼接带参数的异步列表
+	 */
+	static spliceExistParamsAsyncFuncList(funcList: ((...args: any[]) => Promise<any>)[], params: any[][]): {
+		asyncFunc: (...args: any[]) => Promise<any>;
+		params: any[];
+	}[];
 }
 /**
  * Crc32验证工具
@@ -507,5 +518,31 @@ export declare abstract class SetterGetterBase {
 	 */
 	protected onPropertyChanged?(propertyName: string, newValue: any, oldValue: any): void;
 }
+/**
+ * 获取装饰的相关参数
+ * @author Aonaufly
+ */
+export declare class GetDecorateUtils {
+	/**
+	 * 获取类中成员
+	 * @param obj
+	 * @param memberName 成员名称
+	 */
+	static getObjMember<T>(obj: any, memberName: string): T;
+	/**
+	 * 绑定方法
+	 * @param classObj
+	 * @param funName
+	 * @param fun
+	 */
+	static bindFun(classObj: any, funName: string, fun: Function): void;
+	/**
+	 * 设置字段/属性的值
+	 * @param classObj
+	 * @param fieldName
+	 * @param value
+	 */
+	static setFieldValue<T>(classObj: any, fieldName: string, value: T): boolean;
+}
 
 export {};