@hw-component/form 1.7.5 → 1.7.7

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, useFormItemLabel } from './hooks.js';
+import { usePositionClassName, useHide, useFormItemLabel, useFormItemHover } from './hooks.js';
 import { useFormContext } from '../Context/index.js';
 import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
@@ -93,16 +93,16 @@ var Index = function Index(props) {
     form: form
   });
   var formItemLabel = useFormItemLabel(form, label);
+  var itemHover = useFormItemHover(form, hover);
   if (hideItem) {
     return null;
   }
-  console.log(colon, align, "lllll", className);
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsx(Form.Item, _objectSpread(_objectSpread({
       className: className,
       label: !hideLabel && jsx(Index$1, {
-        hover: hover,
+        hover: itemHover,
         labelWidth: labelWidth,
         required: required,
         colon: colon,

package/es/Form/FormItem/RegularFormItem.js

@@ -16,7 +16,6 @@ var RegularFormItem = (function (props) {
   var type = props.type,
     colon = props.colon,
     itemSpan = props.itemSpan;
-  console.log(props, "....pppp");
   return jsx(Index, _objectSpread(_objectSpread({}, props), {}, {
     itemSpan: itemSpan,
     colon: type === "submit" ? false : colon

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

@@ -1,5 +1,5 @@
 import type React from "react";
-import type { HFormInstance, HItemProps } from "../modal";
+import type { HFormInstance, HItemProps, HoverFn, HoverModal } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
@@ -10,4 +10,5 @@ export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps,
 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 declare const useFormItemHover: (form: HFormInstance, hover?: string | HoverModal | HoverFn) => string | HoverModal | undefined;
 export {};

package/es/Form/FormItem/hooks.js

@@ -48,6 +48,9 @@ var usePositionClassName = function usePositionClassName(position) {
 var useFormItemLabel = function useFormItemLabel(form, label) {
   return typeof label === "function" ? label(form) : label;
 };
+var useFormItemHover = function useFormItemHover(form, hover) {
+  return typeof hover === "function" ? hover(form) : hover;
+};
 
-export { useFormItemDomControl, useFormItemLabel, useHide, usePositionClassName, useShouldUpdate };
+export { useFormItemDomControl, useFormItemHover, useFormItemLabel, useHide, usePositionClassName, useShouldUpdate };
 // powered by hdj

package/es/Form/modal.d.ts

@@ -23,6 +23,7 @@ export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;
 }
+export type HoverFn = (form: HFormInstance) => string | HoverModal;
 export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
 export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
@@ -39,7 +40,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     itemProps?: ItemPropsType;
     render?: RenderFun;
     helper?: HelperModal | React.ReactNode;
-    hover?: string | HoverModal;
+    hover?: string | HoverModal | HoverFn;
     labelWidth?: number;
     hide?: boolean | HideModal;
     placeholder?: string | string[];

package/es/TDPicker/hooks.js

@@ -120,7 +120,6 @@ var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
       var start = valueMap.start,
         end = valueMap.end;
       if (!start || !end) {
-        console.error("日期value格式错误!");
         return;
       }
       var startTime = value[start],

package/lib/Form/FormItem/BasicItem.js

@@ -96,16 +96,16 @@ var Index = function Index(props) {
     form: form
   });
   var formItemLabel = hooks.useFormItemLabel(form, label);
+  var itemHover = hooks.useFormItemHover(form, hover);
   if (hideItem) {
     return null;
   }
-  console.log(colon, align, "lllll", className);
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
     className: "".concat(colClassName, " ").concat(itemClassName),
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
       className: className,
       label: !hideLabel && jsxRuntime.jsx(Label.default, {
-        hover: hover,
+        hover: itemHover,
         labelWidth: labelWidth,
         required: required,
         colon: colon,

package/lib/Form/FormItem/RegularFormItem.js

@@ -19,7 +19,6 @@ var RegularFormItem = (function (props) {
   var type = props.type,
     colon = props.colon,
     itemSpan = props.itemSpan;
-  console.log(props, "....pppp");
   return jsxRuntime.jsx(BasicItem.default, _objectSpread(_objectSpread({}, props), {}, {
     itemSpan: itemSpan,
     colon: type === "submit" ? false : colon

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

@@ -1,5 +1,5 @@
 import type React from "react";
-import type { HFormInstance, HItemProps } from "../modal";
+import type { HFormInstance, HItemProps, HoverFn, HoverModal } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: import("../modal").HFormItemProps) => JSX.Element;
@@ -10,4 +10,5 @@ export declare const useShouldUpdate: ({ hide, shouldUpdate, }: Omit<HItemProps,
 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 declare const useFormItemHover: (form: HFormInstance, hover?: string | HoverModal | HoverFn) => string | HoverModal | undefined;
 export {};

package/lib/Form/FormItem/hooks.js

@@ -49,8 +49,12 @@ var usePositionClassName = function usePositionClassName(position) {
 var useFormItemLabel = function useFormItemLabel(form, label) {
   return typeof label === "function" ? label(form) : label;
 };
+var useFormItemHover = function useFormItemHover(form, hover) {
+  return typeof hover === "function" ? hover(form) : hover;
+};
 
 exports.useFormItemDomControl = useFormItemDomControl;
+exports.useFormItemHover = useFormItemHover;
 exports.useFormItemLabel = useFormItemLabel;
 exports.useHide = useHide;
 exports.usePositionClassName = usePositionClassName;

package/lib/Form/modal.d.ts

@@ -23,6 +23,7 @@ export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;
 }
+export type HoverFn = (form: HFormInstance) => string | HoverModal;
 export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
 export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
@@ -39,7 +40,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     itemProps?: ItemPropsType;
     render?: RenderFun;
     helper?: HelperModal | React.ReactNode;
-    hover?: string | HoverModal;
+    hover?: string | HoverModal | HoverFn;
     labelWidth?: number;
     hide?: boolean | HideModal;
     placeholder?: string | string[];

package/lib/TDPicker/hooks.js

@@ -121,7 +121,6 @@ var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
       var start = valueMap.start,
         end = valueMap.end;
       if (!start || !end) {
-        console.error("日期value格式错误!");
         return;
       }
       var startTime = value[start],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "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 { useFormItemLabel, useHide, usePositionClassName } from "./hooks";
+import {useFormItemHover, useFormItemLabel, useHide, usePositionClassName} from "./hooks";
 import { useFormContext } from "../Context";
 import type { HItemProps } from "../modal";
 import { useDefaultRender } from "../hooks/useDefaultRender";
@@ -68,10 +68,10 @@ const Index: React.FC<HFormItemProps> = (props) => {
   const className = usePositionClassName(align);
   const hideItem = useHide({ hide, form });
   const formItemLabel = useFormItemLabel(form, label);
+  const itemHover=useFormItemHover(form,hover)
   if (hideItem) {
     return null;
   }
-  console.log(colon,align,"lllll",className)
   return (
     <Col {...itemSpan} className={`${colClassName} ${itemClassName}`}>
       <Form.Item
@@ -79,7 +79,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
         label={
           !hideLabel && (
             <Label
-              hover={hover}
+              hover={itemHover}
               labelWidth={labelWidth}
               required={required}
               colon={colon}

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

@@ -3,7 +3,6 @@ import type { HItemProps } from "../modal";
 
 export default (props: HItemProps) => {
   const { type, colon, itemSpan } = props;
-  console.log(props,"....pppp")
   return (
     <BasicItem
       {...props}

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

@@ -2,7 +2,7 @@ import UpFormItem from "./UpFormItem";
 import RegularFormItem from "./RegularFormItem";
 import type React from "react";
 import { useMemo } from "react";
-import type { HFormInstance, HItemProps } from "../modal";
+import type {HFormInstance, HItemProps, HoverFn, HoverModal} from "../modal";
 import type { LabelAlignModal } from "../modal";
 import { useClassName } from "../../hooks";
 import type { HelperModal } from "../modal";
@@ -61,3 +61,10 @@ export const useFormItemLabel = (
 ) => {
   return typeof label === "function" ? label(form) : label;
 };
+
+export const useFormItemHover = (
+    form: HFormInstance,
+    hover?:string|HoverModal|HoverFn
+) => {
+  return typeof hover === "function" ? hover(form) : hover;
+};

package/src/components/Form/modal.ts

@@ -62,6 +62,7 @@ export interface HoverModal {
   text?: string;
   icon?: React.ReactNode;
 }
+export type HoverFn=(form: HFormInstance)=>string|HoverModal
 export type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 
 export type HideModal = (form: HFormInstance) => boolean;
@@ -85,7 +86,7 @@ export interface HItemProps
   itemProps?: ItemPropsType;
   render?: RenderFun;
   helper?: HelperModal | React.ReactNode;
-  hover?: string | HoverModal;
+  hover?: string | HoverModal|HoverFn;
   // formItems?: HItemProps[]; 保留感觉没必要
   labelWidth?: number;
   hide?: boolean | HideModal;

package/src/components/TDPicker/hooks.ts

@@ -151,7 +151,6 @@ export const useRangePickerTimeVal = ({
     if (!Array.isArray(value)) {
       const { start, end } = valueMap;
       if (!start || !end) {
-        console.error("日期value格式错误!");
         return;
       }
       const { [start as string]: startTime, [end as string]: endTime } = value;

package/src/pages/Form/index.tsx

@@ -57,6 +57,12 @@ const formData = (options) => {
                     name: "test321",
                     colon:false,
                     rules:[{required:true}],
+                    hover:()=>{
+                      return "ff"
+                    },
+                    hide:()=>{
+                        return false;
+                    },
                     labelAlign:"right",
                     itemProps: {
                         options: [