rxtutils 1.1.4-beta.3 → 1.1.4-beta.5

package/cjs/hooks/useCombineControlValue.cjs

@@ -5,19 +5,30 @@ var react = require('react');
 /**
  * @param param props 组件属性
  * @param param valueKey 组件值的key，默认value, undefined 被认为是有值，只有当 key 不存在时，转换为非受控模式
- * @param param defaultValue 默认值
+ * @param param defaultValue 默认值，当 value 和 defaultValue 同时存在时，以 value 为默认值
  * @param param onChange 值改变时的回调
  * @returns value: 组件应该采用的值，onChange：值改变时的回调，处理非受控值与向父组件传递值的逻辑
  */
-var useCombineControlValue = function (_a) {
+function useCombineControlValue(_a, resolveFn) {
     var props = _a.props, _b = _a.valueKey, valueKey = _b === void 0 ? 'value' : _b, defaultValue = _a.defaultValue, onChange = _a.onChange;
     var _c = props, _d = valueKey, value = _c[_d];
     var hasValue = Object.prototype.hasOwnProperty.call(props, valueKey);
     var _e = react.useState(value !== null && value !== void 0 ? value : defaultValue), internalValue = _e[0], setInternalValue = _e[1];
-    var handleChange = react.useCallback(function (nextVal) {
-        setInternalValue(nextVal);
-        onChange === null || onChange === void 0 ? void 0 : onChange(nextVal);
-    }, [onChange]);
+    var handleChange = react.useCallback(function () {
+        var params = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            params[_i] = arguments[_i];
+        }
+        var realNextVal;
+        if (typeof resolveFn === 'function') {
+            realNextVal = resolveFn.apply(void 0, params);
+        }
+        else {
+            realNextVal = params[0];
+        }
+        setInternalValue(realNextVal);
+        onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, params);
+    }, [onChange, resolveFn]);
     var finalValue = react.useMemo(function () {
         if (hasValue)
             return value;
@@ -27,6 +38,6 @@ var useCombineControlValue = function (_a) {
         value: finalValue,
         onChange: handleChange
     };
-};
+}
 
 exports.useCombineControlValue = useCombineControlValue;

package/cjs/hooks/useCombineControlValue.d.ts

@@ -1,18 +1,19 @@
-/**
- * @param param props 组件属性
- * @param param valueKey 组件值的key，默认value, undefined 被认为是有值，只有当 key 不存在时，转换为非受控模式
- * @param param defaultValue 默认值
- * @param param onChange 值改变时的回调
- * @returns value: 组件应该采用的值，onChange：值改变时的回调，处理非受控值与向父组件传递值的逻辑
- */
-declare const useCombineControlValue: <V>({ props, valueKey, defaultValue, onChange }: {
+type UseCombineControlValueOptions<V> = {
     props: Record<string, any>;
     valueKey?: string;
     defaultValue?: V;
     onChange?: (val: V) => void;
-}) => {
-    value: any;
+};
+type UseCombineControlValueEasyResult<V> = {
+    value: V;
     onChange: (nextVal: V) => void;
 };
+type UseCombineControlValueResolveResult<V, R extends (...args: any[]) => any> = {
+    value: V;
+    onChange: (...args: Parameters<R>) => void;
+};
+declare function useCombineControlValue<V>(options: UseCombineControlValueOptions<V>): UseCombineControlValueEasyResult<V>;
+declare function useCombineControlValue<V, R extends (...args: any[]) => any>(options: UseCombineControlValueOptions<V>, resolveFn: (...args: Parameters<R>) => V): UseCombineControlValueResolveResult<V, R>;
 
 export { useCombineControlValue };
+export type { UseCombineControlValueEasyResult, UseCombineControlValueOptions, UseCombineControlValueResolveResult };

package/cjs/validator/validator.cjs

@@ -2,6 +2,7 @@
 
 var tslib = require('tslib');
 
+var KEY_SYMBOL = Symbol("key-description");
 /**
  * 基础验证器类
  * 提供字段验证功能，可通过装饰器为类属性添加验证规则
@@ -13,8 +14,7 @@ var BaseValidator = /** @class */ (function () {
      */
     function BaseValidator() {
         /** 用于存储验证器映射的私有符号 */
-        this.__keySymbol = Symbol("key-description");
-        this.__keySymbol = Symbol("key-description");
+        this.__keySymbol = KEY_SYMBOL;
         this[this.__keySymbol] = {};
     }
     /**

package/es/hooks/useCombineControlValue.d.ts

@@ -1,18 +1,19 @@
-/**
- * @param param props 组件属性
- * @param param valueKey 组件值的key，默认value, undefined 被认为是有值，只有当 key 不存在时，转换为非受控模式
- * @param param defaultValue 默认值
- * @param param onChange 值改变时的回调
- * @returns value: 组件应该采用的值，onChange：值改变时的回调，处理非受控值与向父组件传递值的逻辑
- */
-declare const useCombineControlValue: <V>({ props, valueKey, defaultValue, onChange }: {
+type UseCombineControlValueOptions<V> = {
     props: Record<string, any>;
     valueKey?: string;
     defaultValue?: V;
     onChange?: (val: V) => void;
-}) => {
-    value: any;
+};
+type UseCombineControlValueEasyResult<V> = {
+    value: V;
     onChange: (nextVal: V) => void;
 };
+type UseCombineControlValueResolveResult<V, R extends (...args: any[]) => any> = {
+    value: V;
+    onChange: (...args: Parameters<R>) => void;
+};
+declare function useCombineControlValue<V>(options: UseCombineControlValueOptions<V>): UseCombineControlValueEasyResult<V>;
+declare function useCombineControlValue<V, R extends (...args: any[]) => any>(options: UseCombineControlValueOptions<V>, resolveFn: (...args: Parameters<R>) => V): UseCombineControlValueResolveResult<V, R>;
 
 export { useCombineControlValue };
+export type { UseCombineControlValueEasyResult, UseCombineControlValueOptions, UseCombineControlValueResolveResult };

package/es/hooks/useCombineControlValue.mjs

@@ -3,19 +3,30 @@ import { useState, useCallback, useMemo } from 'react';
 /**
  * @param param props 组件属性
  * @param param valueKey 组件值的key，默认value, undefined 被认为是有值，只有当 key 不存在时，转换为非受控模式
- * @param param defaultValue 默认值
+ * @param param defaultValue 默认值，当 value 和 defaultValue 同时存在时，以 value 为默认值
  * @param param onChange 值改变时的回调
  * @returns value: 组件应该采用的值，onChange：值改变时的回调，处理非受控值与向父组件传递值的逻辑
  */
-var useCombineControlValue = function (_a) {
+function useCombineControlValue(_a, resolveFn) {
     var props = _a.props, _b = _a.valueKey, valueKey = _b === void 0 ? 'value' : _b, defaultValue = _a.defaultValue, onChange = _a.onChange;
     var _c = props, _d = valueKey, value = _c[_d];
     var hasValue = Object.prototype.hasOwnProperty.call(props, valueKey);
     var _e = useState(value !== null && value !== void 0 ? value : defaultValue), internalValue = _e[0], setInternalValue = _e[1];
-    var handleChange = useCallback(function (nextVal) {
-        setInternalValue(nextVal);
-        onChange === null || onChange === void 0 ? void 0 : onChange(nextVal);
-    }, [onChange]);
+    var handleChange = useCallback(function () {
+        var params = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            params[_i] = arguments[_i];
+        }
+        var realNextVal;
+        if (typeof resolveFn === 'function') {
+            realNextVal = resolveFn.apply(void 0, params);
+        }
+        else {
+            realNextVal = params[0];
+        }
+        setInternalValue(realNextVal);
+        onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, params);
+    }, [onChange, resolveFn]);
     var finalValue = useMemo(function () {
         if (hasValue)
             return value;
@@ -25,6 +36,6 @@ var useCombineControlValue = function (_a) {
         value: finalValue,
         onChange: handleChange
     };
-};
+}
 
 export { useCombineControlValue };

package/es/validator/validator.mjs

@@ -1,5 +1,6 @@
 import { __spreadArray } from 'tslib';
 
+var KEY_SYMBOL = Symbol("key-description");
 /**
  * 基础验证器类
  * 提供字段验证功能，可通过装饰器为类属性添加验证规则
@@ -11,8 +12,7 @@ var BaseValidator = /** @class */ (function () {
      */
     function BaseValidator() {
         /** 用于存储验证器映射的私有符号 */
-        this.__keySymbol = Symbol("key-description");
-        this.__keySymbol = Symbol("key-description");
+        this.__keySymbol = KEY_SYMBOL;
         this[this.__keySymbol] = {};
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxtutils",
-  "version": "1.1.4-beta.3",
+  "version": "1.1.4-beta.5",
   "type": "module",
   "main": "cjs/index.cjs",
   "module": "es/index.mjs",
@@ -13,7 +13,7 @@
     "build": "pnpm clean && rollup -c",
     "clean": "rm -rf es cjs",
     "publishNpm": "npm publish --registry https://registry.npmjs.org",
-    "login": "npm login --registry https://registry.npmjs.org"
+    "loginNpm": "npm login --registry https://registry.npmjs.org"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^12.1.2",