@zwa73/utils 1.0.73 → 1.0.75

package/dist/UtilFunctions.d.ts

@@ -12,7 +12,7 @@ export declare namespace UtilFunc {
      * @param defaultVal - 默认值
      * @returns 最终值
      */
-    function initField<T>(obj: Record<string, T>, field: string, defaultVal: T): T;
+    function initField<T extends object, K extends keyof T>(obj: T, field: K, defaultVal: T[K]): T[K];
     /**生成一串uuid
      * @returns uuid
      */

package/dist/UtilFunctions.js

@@ -213,26 +213,27 @@ var UtilFunc;
         for (const fd of fields) {
             if (compObj[fd] !== undefined)
                 UtilLogger_1.SLogger.warn(`field: ${fd} 已存在于基础类中, 混入可能导致类型问题, 如需覆盖, 请使用 ${key}=val`);
-            Object.defineProperty(compObj, fd, {
-                get: () => compObj[key][fd],
-                set: (value) => { compObj[key][fd] = value; },
-                enumerable: true,
-                //writable: true  ,
-                configurable: true
-            });
-            //if(typeof mixin[fd] === 'function') {
-            //    compObj[fd] = (...args: any[]) => compObj[key][fd](...args);
-            //    //(compObj as any)[fd] = (...args: any[]) => (mixin[fd] as any).apply(mixin, args);
-            //    //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
-            //} else {
-            //    Object.defineProperty(compObj, fd, {
-            //        get: ()=>compObj[key][fd],
-            //        set: (value)=>{compObj[key][fd] = value},
-            //        enumerable:true ,
-            //        //writable: true  ,
-            //        configurable: true
-            //    });
-            //}
+            //Object.defineProperty(compObj, fd, {
+            //    get: ()=>compObj[key][fd],
+            //    set: (value)=>{compObj[key][fd] = value},
+            //    enumerable:true ,
+            //    //writable: true  ,
+            //    configurable: true
+            //});
+            if (typeof mixin[fd] === 'function') {
+                compObj[fd] = (...args) => compObj[key][fd](...args);
+                //(compObj as any)[fd] = (...args: any[]) => (mixin[fd] as any).apply(mixin, args);
+                //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+            }
+            else {
+                Object.defineProperty(compObj, fd, {
+                    get: () => compObj[key][fd],
+                    set: (value) => { compObj[key][fd] = value; },
+                    enumerable: true,
+                    //writable: true  ,
+                    configurable: true
+                });
+            }
         }
         return compObj;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFunctions.ts

@@ -19,11 +19,11 @@ export function getTime(): number {
  * @param defaultVal - 默认值
  * @returns 最终值
  */
-export function initField<T>(
-    obj: Record<string, T>,
-    field: string,
-    defaultVal: T
-): T {
+export function initField<T extends object,K extends keyof T>(
+    obj: T,
+    field: K,
+    defaultVal: T[K]
+): T[K] {
     if (!(field in obj)) obj[field] = defaultVal;
     return obj[field];
 }
@@ -231,26 +231,26 @@ export function composeClassPart
     for(const fd of fields){
         if(compObj[fd]!==undefined)
             SLogger.warn(`field: ${fd as string} 已存在于基础类中, 混入可能导致类型问题, 如需覆盖, 请使用 ${key}=val`);
-        Object.defineProperty(compObj, fd, {
-            get: ()=>compObj[key][fd],
-            set: (value)=>{compObj[key][fd] = value},
-            enumerable:true ,
-            //writable: true  ,
-            configurable: true
-        });
-        //if(typeof mixin[fd] === 'function') {
-        //    compObj[fd] = (...args: any[]) => compObj[key][fd](...args);
-        //    //(compObj as any)[fd] = (...args: any[]) => (mixin[fd] as any).apply(mixin, args);
-        //    //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
-        //} else {
-        //    Object.defineProperty(compObj, fd, {
-        //        get: ()=>compObj[key][fd],
-        //        set: (value)=>{compObj[key][fd] = value},
-        //        enumerable:true ,
-        //        //writable: true  ,
-        //        configurable: true
-        //    });
-        //}
+        //Object.defineProperty(compObj, fd, {
+        //    get: ()=>compObj[key][fd],
+        //    set: (value)=>{compObj[key][fd] = value},
+        //    enumerable:true ,
+        //    //writable: true  ,
+        //    configurable: true
+        //});
+        if(typeof mixin[fd] === 'function') {
+            compObj[fd] = (...args: any[]) => compObj[key][fd](...args);
+            //(compObj as any)[fd] = (...args: any[]) => (mixin[fd] as any).apply(mixin, args);
+            //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+        } else {
+            Object.defineProperty(compObj, fd, {
+                get: ()=>compObj[key][fd],
+                set: (value)=>{compObj[key][fd] = value},
+                enumerable:true ,
+                //writable: true  ,
+                configurable: true
+            });
+        }
     }
     return compObj;
 }