@fairys/rn-valtio-form-basic 1.0.4 → 1.0.6

package/esm/hooks/form.item.js

@@ -16,7 +16,7 @@ function useFairysValtioFormItemAttrs(props) {
     const parent_isInvalidBorderRed = layoutAttrs.isInvalidBorderRed;
     const parent_isInvalidTextRed = layoutAttrs.isInvalidTextRed;
     const parent_showColon = layoutAttrs.showColon;
-    const { name, valuePropName = 'value', getValuePath = 'text', getValueFromEvent, formatValue, onAfterUpdate, trigger = 'onChange', style, labelStyle, bodyStyle, children, labelMode = parent_labelMode, errorLayout = parent_errorLayout, colSpan = 1, isRequired: _isRequired, itemBorderType = parent_borderedType, attrs = {}, showColon = parent_showColon, itemBorderColor = parent_itemBorderColor, isInvalidBorderRed = parent_isInvalidBorderRed, isInvalidTextRed = parent_isInvalidTextRed, isJoinParentField = true, rules, useRules = (rules)=>rules, isRemoveValueOnUnmount = false } = props;
+    const { name, valuePropName = 'value', getValuePath = 'text', getValueFromEvent, formatValue, onAfterUpdate, trigger = 'onChange', style, labelStyle, bodyStyle, children, labelMode = parent_labelMode, errorLayout = parent_errorLayout, colSpan = 1, isRequired: _isRequired, itemBorderType = parent_borderedType, attrs = {}, showColon = parent_showColon, itemBorderColor = parent_itemBorderColor, isInvalidBorderRed = parent_isInvalidBorderRed, isInvalidTextRed = parent_isInvalidTextRed, isJoinParentField = true, rules, useRules = (rules)=>rules, userAttrs = (params)=>params, isRemoveValueOnUnmount = false } = props;
     const { name: _name, paths, parentName, formAttrsNameInstance } = useFairysValtioFormAttrsName({
         name,
         isJoinParentField
@@ -76,6 +76,7 @@ function useFairysValtioFormItemAttrs(props) {
         [valuePropName]: value,
         [trigger]: onValueChange
     };
+    const _attrs = userAttrs?.(baseControl, formInstance) || baseControl;
     const isRequired = useMemo(()=>{
         if (_isRequired) return _isRequired;
         if (Array.isArray(_lastRules)) return _lastRules.some((rule)=>rule.required);
@@ -210,12 +211,12 @@ function useFairysValtioFormItemAttrs(props) {
         errorStyle: itemError_style,
         helpStyle: itemHelp_style,
         children: react.isValidElement(children) ? react.cloneElement(children, {
-            ...baseControl
+            ..._attrs
         }) : children
     };
 }
 function useFairysValtioFormItemNoStyleAttrs(props) {
-    const { name, valuePropName = 'value', getValuePath = 'text', getValueFromEvent, formatValue, onAfterUpdate, trigger = 'onChange', children, attrs = {}, isJoinParentField = true, rules, useRules = (rules)=>rules, isRequired: _isRequired, isRemoveValueOnUnmount = false } = props;
+    const { name, valuePropName = 'value', getValuePath = 'text', getValueFromEvent, formatValue, onAfterUpdate, trigger = 'onChange', children, attrs = {}, isJoinParentField = true, rules, useRules = (rules)=>rules, isRequired: _isRequired, isRemoveValueOnUnmount = false, userAttrs = (params)=>params } = props;
     const [state, errorState, formInstance] = useFairysValtioFormInstanceContextState();
     const { name: _name, paths, parentName, formAttrsNameInstance } = useFairysValtioFormAttrsName({
         name,
@@ -260,6 +261,7 @@ function useFairysValtioFormItemNoStyleAttrs(props) {
         [valuePropName]: value,
         [trigger]: onValueChange
     };
+    const _attrs = userAttrs?.(baseControl, formInstance) || baseControl;
     const isRequired = useMemo(()=>{
         if (_isRequired) return _isRequired;
         if (Array.isArray(_lastRules)) return _lastRules.some((rule)=>rule.required);
@@ -289,7 +291,7 @@ function useFairysValtioFormItemNoStyleAttrs(props) {
         parentName,
         formAttrsNameInstance,
         children: react.isValidElement(children) ? react.cloneElement(children, {
-            ...baseControl
+            ..._attrs
         }) : children
     };
 }

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "rn表单框架组件",
   "homepage": "https://github.com/autumn-fairy-tales/valtio-form-basic",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",
@@ -25,7 +25,7 @@
     "esm"
   ],
   "dependencies": {
-    "@fairys/valtio-form-basic": "^1.0.4"
+    "@fairys/valtio-form-basic": "^1.0.6"
   },
   "devDependencies": {
     "@types/react": "~18.2.21",

package/src/hooks/form.item.ts

@@ -76,6 +76,7 @@ export function useFairysValtioFormItemAttrs<T extends MObject<T> = Record<strin
     isJoinParentField = true,
     rules,
     useRules = (rules) => rules,
+    userAttrs = (params) => params,
     isRemoveValueOnUnmount = false,
   } = props;
   const {
@@ -150,6 +151,8 @@ export function useFairysValtioFormItemAttrs<T extends MObject<T> = Record<strin
     [valuePropName]: value,
     [trigger]: onValueChange,
   };
+  /**自定义输入框属性*/
+  const _attrs = userAttrs?.(baseControl, formInstance) || baseControl;
 
   /**判断是否必填*/
   const isRequired = useMemo(() => {
@@ -294,7 +297,7 @@ export function useFairysValtioFormItemAttrs<T extends MObject<T> = Record<strin
     itemExtraStyle: itemExtra_style,
     errorStyle: itemError_style,
     helpStyle: itemHelp_style,
-    children: React.isValidElement(children) ? React.cloneElement(children, { ...baseControl }) : children,
+    children: React.isValidElement(children) ? React.cloneElement(children, { ..._attrs }) : children,
   } as FairysValtioFormItemAttrsReturn<T>;
 }
 
@@ -386,6 +389,7 @@ export function useFairysValtioFormItemNoStyleAttrs<T extends MObject<T> = Recor
     useRules = (rules) => rules,
     isRequired: _isRequired,
     isRemoveValueOnUnmount = false,
+    userAttrs = (params) => params,
   } = props;
   const [state, errorState, formInstance] = useFairysValtioFormInstanceContextState<T>();
   const {
@@ -444,6 +448,8 @@ export function useFairysValtioFormItemNoStyleAttrs<T extends MObject<T> = Recor
     [valuePropName]: value,
     [trigger]: onValueChange,
   };
+  /**自定义输入框属性*/
+  const _attrs = userAttrs?.(baseControl, formInstance) || baseControl;
 
   /**判断是否必填*/
   const isRequired = useMemo(() => {
@@ -478,7 +484,7 @@ export function useFairysValtioFormItemNoStyleAttrs<T extends MObject<T> = Recor
     paths,
     parentName,
     formAttrsNameInstance,
-    children: React.isValidElement(children) ? React.cloneElement(children, { ...baseControl }) : children,
+    children: React.isValidElement(children) ? React.cloneElement(children, { ..._attrs }) : children,
   } as FairysValtioFormItemNoStyleAttrsReturn<T>;
 }