@hw-component/form 1.2.1 → 1.2.3

package/es/CheckboxGroup/CheckBox/index.js

@@ -1,14 +1,27 @@
 // welcome to hoo hoo hoo
+import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.symbol.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/es.object.get-own-property-descriptor.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
+import 'core-js/modules/es.object.get-own-property-descriptors.js';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx } from 'react/jsx-runtime';
 import { Checkbox } from 'antd';
 import { useMemo } from 'react';
 import { useMatchConfigProps } from '../../hooks/index.js';
 
+var _excluded = ["value", "onChange", "children", "valueMap"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     children = _ref.children,
-    propsValueCheckMap = _ref.valueMap;
+    propsValueCheckMap = _ref.valueMap,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = useMatchConfigProps({
       valueCheckMap: propsValueCheckMap
     }),
@@ -31,11 +44,12 @@ var Index = function Index(_ref) {
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
-  return jsx(Checkbox, {
+  return jsx(Checkbox, _objectSpread(_objectSpread({
     checked: checkedVal,
-    onChange: change,
+    onChange: change
+  }, props), {}, {
     children: children
-  });
+  }));
 };
 
 export { Index as default };

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,9 +92,11 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var formItemLabel = useFormItemLabel(form, label);
   if (hideItem) {
     return null;
   }
+  console.log(inProps, formItemLabel);
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsx(Form.Item, _objectSpread(_objectSpread({
@@ -104,7 +106,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/CheckboxGroup/CheckBox/index.js

@@ -2,16 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var React = require('react');
 var index = require('../../hooks/index.js');
 
+var _excluded = ["value", "onChange", "children", "valueMap"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     children = _ref.children,
-    propsValueCheckMap = _ref.valueMap;
+    propsValueCheckMap = _ref.valueMap,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = index.useMatchConfigProps({
       valueCheckMap: propsValueCheckMap
     }),
@@ -34,11 +47,12 @@ var Index = function Index(_ref) {
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
-  return jsxRuntime.jsx(antd.Checkbox, {
+  return jsxRuntime.jsx(antd.Checkbox, _objectSpread(_objectSpread({
     checked: checkedVal,
-    onChange: change,
+    onChange: change
+  }, props), {}, {
     children: children
-  });
+  }));
 };
 
 exports.default = Index;

package/lib/Form/FormItem/BasicItem.js

@@ -95,9 +95,11 @@ var Index = function Index(props) {
     hide: hide,
     form: form
   });
+  var formItemLabel = hooks.useFormItemLabel(form, label);
   if (hideItem) {
     return null;
   }
+  console.log(inProps, formItemLabel);
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
@@ -107,7 +109,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.1",
+  "version": "1.2.3",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/CheckboxGroup/CheckBox/index.tsx

@@ -9,6 +9,7 @@ const Index: React.FC<HCheckboxProps> = ({
   onChange,
   children,
   valueMap: propsValueCheckMap,
+  ...props
 }) => {
   const { valueCheckMap = {} } = useMatchConfigProps({
     valueCheckMap: propsValueCheckMap,
@@ -30,7 +31,7 @@ const Index: React.FC<HCheckboxProps> = ({
     onChange?.(subVal);
   };
   return (
-    <Checkbox checked={checkedVal} onChange={change}>
+    <Checkbox checked={checkedVal} onChange={change} {...props}>
       {children}
     </Checkbox>
   );

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,9 +67,11 @@ const Index: React.FC<HFormItemProps> = (props) => {
   );
   const className = usePositionClassName(align);
   const hideItem = useHide({ hide, form });
+  const formItemLabel=useFormItemLabel(form,label);
   if (hideItem) {
     return null;
   }
+  console.log(inProps,formItemLabel)
   return (
     <Col {...itemSpan} className={`${colClassName} ${itemClassName}`}>
       <Form.Item
@@ -82,7 +84,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" },