@zwa73/utils 1.0.64 → 1.0.66

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { ComposedClassMult, ComposedClassPart, FuncPropNames, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
+import { ComposedClassMult, ComposedClassPart, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
 /**常用函数 */
 export declare namespace UtilFunc {
     /**获取当前时间戳
@@ -64,7 +64,7 @@ export declare namespace UtilFunc {
      * @param fields - 需要混入的字段
      * @returns 混合完成的类
      */
-    function composeClassPart<Base extends object, Mixin extends object, Field extends FuncPropNames<Mixin>>(base: Base, mixin: Mixin, ...fields: Field[]): ComposedClassPart<Base, Mixin, Field>;
+    function composeClassPart<Base extends object, Mixin extends object, Field extends keyof Mixin>(base: Base, mixin: Mixin, ...fields: Field[]): ComposedClassPart<Base, Mixin, Field>;
     /**类组合
      * 将mixinList每个成员的字段混入base
      * @param base      - 基础类

package/dist/UtilFunctions.js

@@ -216,7 +216,19 @@ var UtilFunc;
                 configurable: true
             });
             */
-            compObj[fd] = mixin[fd].bind(mixin);
+            if (typeof mixin[fd] === 'function') {
+                compObj[fd] = (...args) => mixin[fd].apply(mixin, args);
+                //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+            }
+            else {
+                Object.defineProperty(compObj, fd, {
+                    get: () => mixin[fd],
+                    set: (value) => { mixin[fd] = value; },
+                    enumerable: true,
+                    //writable: true  ,
+                    configurable: true
+                });
+            }
         }
         return compObj;
     }

package/package.json

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

package/src/UtilFunctions.ts

@@ -221,7 +221,7 @@ export async function repeatPromise<T>(procFn:PromiseProcFn<T>,verifyFn?:Promise
  * @returns 混合完成的类
  */
 export function composeClassPart
-    <Base extends object,Mixin extends object,Field extends FuncPropNames<Mixin>>
+    <Base extends object,Mixin extends object,Field extends keyof Mixin>
     (base:Base,mixin:Mixin,...fields:Field[]):ComposedClassPart<Base,Mixin,Field>{
     const compObj = base as any;
     for(const fd of fields){
@@ -234,7 +234,18 @@ export function composeClassPart
             configurable: true
         });
         */
-        (compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+        if(typeof mixin[fd] === 'function') {
+            (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: ()=>mixin[fd],
+                set: (value)=>{mixin[fd] = value},
+                enumerable:true ,
+                //writable: true  ,
+                configurable: true
+            });
+        }
     }
     return compObj;
 }