@hw-component/form 1.2.2 → 1.2.4

package/es/Form/FormItem/BasicItem.js

@@ -15,7 +15,7 @@ import { Col, Form, Space } from 'antd';
 import React from 'react';
 import Index$2 from './Helper.js';
 import { useClassName } from '../../hooks/index.js';
-import { usePositionClassName, useHide } from './hooks.js';
+import { usePositionClassName, useHide, useFormItemLabel } from './hooks.js';
 import { useFormContext } from '../Context/index.js';
 import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
@@ -92,6 +92,7 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var formItemLabel = useFormItemLabel(form, label);
   if (hideItem) {
     return null;
   }
@@ -104,7 +105,7 @@ var Index = function Index(props) {
         labelWidth: labelWidth,
         required: required,
         colon: colon,
-        children: label
+        children: formItemLabel
       })
     }, oProps), {}, {
       style: style || formItemStyle,

package/es/Form/FormItem/hooks.d.ts

@@ -1,5 +1,7 @@
+import React from "react";
 import type { HFormInstance, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
+import { HelperModal } from "../modal";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;
@@ -7,4 +9,5 @@ interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
 export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
 export declare const useHide: ({ hide, form }: UseHideUpItemModal) => boolean;
 export declare const usePositionClassName: (position: LabelAlignModal) => string;
+export declare const useFormItemLabel: (form: HFormInstance, label?: React.ReactNode | HelperModal) => any;
 export {};

package/es/Form/FormItem/hooks.js

@@ -45,6 +45,9 @@ var usePositionClassName = function usePositionClassName(position) {
   var className = classNameData[position];
   return useClassName(className);
 };
+var useFormItemLabel = function useFormItemLabel(form, label) {
+  return typeof label === "function" ? label(form) : label;
+};
 
-export { useFormItemDomControl, useHide, usePositionClassName, useShouldUpdate };
+export { useFormItemDomControl, useFormItemLabel, useHide, usePositionClassName, useShouldUpdate };
 // powered by hdj

package/es/Form/modal.d.ts

@@ -22,7 +22,7 @@ export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;
 }
-type HelperModal = (form: HFormInstance) => React.ReactNode | string;
+export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
 export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
 export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
@@ -33,7 +33,7 @@ export interface DispatchModal<T = string | string[]> {
     reset?: boolean;
 }
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
-export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
+export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label"> {
     type?: string;
     itemProps?: ItemPropsType;
     render?: RenderFun;
@@ -47,6 +47,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
     itemSpan?: ColProps;
     hideLabel?: boolean;
     labelAlign?: LabelAlignModal;
+    label?: React.ReactNode | HelperModal;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];

package/lib/Form/FormItem/BasicItem.js

@@ -95,6 +95,7 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var formItemLabel = hooks.useFormItemLabel(form, label);
   if (hideItem) {
     return null;
   }
@@ -107,7 +108,7 @@ var Index = function Index(props) {
         labelWidth: labelWidth,
         required: required,
         colon: colon,
-        children: label
+        children: formItemLabel
       })
     }, oProps), {}, {
       style: style || formItemStyle,

package/lib/Form/FormItem/hooks.d.ts

@@ -1,5 +1,7 @@
+import React from "react";
 import type { HFormInstance, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
+import { HelperModal } from "../modal";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;
@@ -7,4 +9,5 @@ interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
 export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps, "name">) => import("rc-field-form/lib/Field").ShouldUpdate<any> | undefined;
 export declare const useHide: ({ hide, form }: UseHideUpItemModal) => boolean;
 export declare const usePositionClassName: (position: LabelAlignModal) => string;
+export declare const useFormItemLabel: (form: HFormInstance, label?: React.ReactNode | HelperModal) => any;
 export {};

package/lib/Form/FormItem/hooks.js

@@ -46,8 +46,12 @@ var usePositionClassName = function usePositionClassName(position) {
   var className = classNameData[position];
   return index.useClassName(className);
 };
+var useFormItemLabel = function useFormItemLabel(form, label) {
+  return typeof label === "function" ? label(form) : label;
+};
 
 exports.useFormItemDomControl = useFormItemDomControl;
+exports.useFormItemLabel = useFormItemLabel;
 exports.useHide = useHide;
 exports.usePositionClassName = usePositionClassName;
 exports.useShouldUpdate = useShouldUpdate;

package/lib/Form/modal.d.ts

@@ -22,7 +22,7 @@ export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;
 }
-type HelperModal = (form: HFormInstance) => React.ReactNode | string;
+export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
 export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
 export type DispatchSourceDataModal = Record<string, Record<string, DispatchModal>>;
@@ -33,7 +33,7 @@ export interface DispatchModal<T = string | string[]> {
     reset?: boolean;
 }
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
-export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
+export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" | "label"> {
     type?: string;
     itemProps?: ItemPropsType;
     render?: RenderFun;
@@ -47,6 +47,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
     itemSpan?: ColProps;
     hideLabel?: boolean;
     labelAlign?: LabelAlignModal;
+    label?: React.ReactNode | HelperModal;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
     configData: HItemProps[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/FormItem/BasicItem.tsx

@@ -3,7 +3,7 @@ import { Form, Space, Col } from "antd";
 import React from "react";
 import Helper from "./Helper";
 import { useClassName } from "../../hooks";
-import { useHide, usePositionClassName } from "./hooks";
+import {useFormItemLabel, useHide, usePositionClassName} from "./hooks";
 import { useFormContext } from "../Context";
 import type { HItemProps } from "../modal";
 import { useDefaultRender } from "../hooks/useDefaultRender";
@@ -67,6 +67,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
   );
   const className = usePositionClassName(align);
   const hideItem = useHide({ hide, form });
+  const formItemLabel=useFormItemLabel(form,label);
   if (hideItem) {
     return null;
   }
@@ -82,7 +83,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
               required={required}
               colon={colon}
             >
-              {label}
+              {formItemLabel}
             </Label>
           )
         }

package/src/components/Form/FormItem/hooks.tsx

@@ -1,9 +1,10 @@
 import UpFormItem from "./UpFormItem";
 import RegularFormItem from "./RegularFormItem";
-import { useMemo } from "react";
+import React, { useMemo } from "react";
 import type { HFormInstance, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import { useClassName } from "../../hooks";
+import {HelperModal} from "../modal";
 
 export const useFormItemDomControl = ({
   shouldUpdate,
@@ -52,3 +53,7 @@ export const usePositionClassName = (position: LabelAlignModal) => {
   const className = classNameData[position];
   return useClassName(className);
 };
+
+export const useFormItemLabel=(form:HFormInstance,label?:React.ReactNode|HelperModal,)=>{
+   return  typeof label==="function"?label(form):label;
+}

package/src/components/Form/modal.ts

@@ -60,7 +60,7 @@ export interface HoverModal {
   text?: string;
   icon?: React.ReactNode;
 }
-type HelperModal = (form: HFormInstance) => React.ReactNode | string;
+export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 
 export type HideModal = (form: HFormInstance) => boolean;
 
@@ -77,7 +77,7 @@ export interface DispatchModal<T = string | string[]> {
 }
 export type LabelAlignModal = "left" | "right" | "topLeft" | "topRight" | "top";
 
-export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
+export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"|"label"> {
   type?: string;
   itemProps?: ItemPropsType;
   render?: RenderFun;
@@ -93,6 +93,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign"> {
   itemSpan?: ColProps;
   hideLabel?: boolean;
   labelAlign?: LabelAlignModal;
+  label?:React.ReactNode|HelperModal;
 }
 export interface HFormProps<T = any, R = any>
   extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {

package/src/pages/Form/index.tsx

@@ -35,10 +35,16 @@ const formData = () => {
       },
     },
     {
-      label: "选择",
+      label:(form)=>{
+        const nameTest=form.getFieldValue("nameTest")
+        return nameTest;
+      },
       name: "checkboxGroup",
       type: "checkboxGroup",
       rules: [{ required: true }],
+      shouldUpdate:()=>{
+        return true;
+      },
       helper: "帮助我",
       options: [
         { value: "选择1", key: "check1" },