@hw-component/form 0.0.7-beta-v5 → 0.0.7-beta-v6

package/es/DialogForm/modal.d.ts

@@ -28,7 +28,7 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
     dialogForm?: HDialogFormInstance;
     onFinish?: (values: T, params: P) => Promise<any>;
     onCancel?: VoidFunction;
-    onOk?: (data: T, params: P) => boolean | undefined;
+    onOk?: (data: T, params: P) => boolean | void;
     infoRequest?: (params: P) => Promise<T>;
 }
 export {};

package/es/Form/modal.d.ts

@@ -14,7 +14,7 @@ import type { RangePickerProps } from "antd/es/date-picker";
 import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
-import { ColProps } from "antd/lib/grid/col";
+import type { ColProps } from "antd/lib/grid/col";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {

package/lib/DialogForm/modal.d.ts

@@ -28,7 +28,7 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
     dialogForm?: HDialogFormInstance;
     onFinish?: (values: T, params: P) => Promise<any>;
     onCancel?: VoidFunction;
-    onOk?: (data: T, params: P) => boolean | undefined;
+    onOk?: (data: T, params: P) => boolean | void;
     infoRequest?: (params: P) => Promise<T>;
 }
 export {};

package/lib/Form/modal.d.ts

@@ -14,7 +14,7 @@ import type { RangePickerProps } from "antd/es/date-picker";
 import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
-import { ColProps } from "antd/lib/grid/col";
+import type { ColProps } from "antd/lib/grid/col";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {

package/package.json

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

package/src/components/DialogForm/modal.ts

@@ -32,6 +32,6 @@ export interface DialogFormProps<P = any, T = any>
   dialogForm?: HDialogFormInstance;
   onFinish?: (values: T, params: P) => Promise<any>;
   onCancel?: VoidFunction;
-  onOk?: (data: T, params: P) => boolean | undefined;
+  onOk?: (data: T, params: P) => boolean | void;
   infoRequest?: (params: P) => Promise<T>;
 }

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

@@ -1,5 +1,5 @@
 import Label from "../Label";
-import { Form, Space ,Col} from "antd";
+import { Form, Space, Col } from "antd";
 import React from "react";
 import Helper from "./Helper";
 import { useClassName } from "../../hooks";
@@ -43,7 +43,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     helper,
     hide,
     render,
-    itemSpan={span:24},
+    itemSpan = { span: 24 },
     ...oProps
   } = props;
   const { form } = useFormContext();
@@ -54,25 +54,25 @@ const Index: React.FC<HFormItemProps> = (props) => {
     return null;
   }
   return (
-     <Col {...itemSpan}>
-       <Form.Item
-           label={
-             <Label
-                 hover={hover}
-                 labelWidth={labelWidth}
-                 required={required}
-                 colon={colon}
-             >
-               {label}
-             </Label>
-           }
-           {...oProps}
-           colon={false}
-           required={false}
-       >
-         <Content helper={helper}>{defaultRender(form)}</Content>
-       </Form.Item>
-     </Col>
+    <Col {...itemSpan}>
+      <Form.Item
+        label={
+          <Label
+            hover={hover}
+            labelWidth={labelWidth}
+            required={required}
+            colon={colon}
+          >
+            {label}
+          </Label>
+        }
+        {...oProps}
+        colon={false}
+        required={false}
+      >
+        <Content helper={helper}>{defaultRender(form)}</Content>
+      </Form.Item>
+    </Col>
   );
 };
 

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

@@ -2,6 +2,12 @@ import BasicItem from "./BasicItem";
 import type { HItemProps } from "../modal";
 
 export default (props: HItemProps) => {
-  const { type, colon,itemSpan} = props;
-  return <BasicItem {...props} itemSpan={itemSpan} colon={type === "submit" ? false : colon} />;
+  const { type, colon, itemSpan } = props;
+  return (
+    <BasicItem
+      {...props}
+      itemSpan={itemSpan}
+      colon={type === "submit" ? false : colon}
+    />
+  );
 };

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

@@ -7,7 +7,7 @@ export default ({
   shouldUpdate,
   dependencies,
   hide,
-                  itemSpan,
+  itemSpan,
   ...props
 }: HFormItemProps) => {
   const resultShouldUpdate = useShouldUpdate({ shouldUpdate, hide });

package/src/components/Form/index.tsx

@@ -1,4 +1,4 @@
-import { Form ,Row} from "antd";
+import { Form, Row } from "antd";
 import type { HFormProps, HItemProps } from "./modal";
 import Item from "./FormItem";
 import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
@@ -72,12 +72,12 @@ export default ({
             {newConfigData.map((itemData: HItemProps, index) => {
               const { labelWidth: itemLabelWidth } = itemData;
               return (
-                  <Item
-                      {...itemData}
-                      key={index}
-                      itemSpan={itemSpan}
-                      labelWidth={itemLabelWidth || labelWidth}
-                  />
+                <Item
+                  {...itemData}
+                  key={index}
+                  itemSpan={itemSpan}
+                  labelWidth={itemLabelWidth || labelWidth}
+                />
               );
             })}
           </Row>

package/src/components/Form/modal.ts

@@ -32,7 +32,7 @@ import type {
 } from "../modal";
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
-import {ColProps} from "antd/lib/grid/col";
+import type { ColProps } from "antd/lib/grid/col";
 
 type RenderFun = (
   props: HItemProps,
@@ -87,7 +87,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
   // formatKeys?: string[];
   name?: string;
   dispatch?: DispatchModal;
-  itemSpan?:ColProps
+  itemSpan?: ColProps;
 }
 
 export interface HFormProps<T = any, R = any>
@@ -100,13 +100,13 @@ export interface HFormProps<T = any, R = any>
   form?: HFormInstance;
   params?: any;
   onFinish?: (values: T, params?: any) => void;
-  itemSpan?:ColProps
+  itemSpan?: ColProps;
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;
   value?: any;
   onChange?: (val: any, item: any) => void;
-  itemSpan?:ColProps
+  itemSpan?: ColProps;
 }
 export type argsFn = (...args: any[]) => void;
 export interface FormContextProps {

package/src/pages/Form/index.tsx

@@ -169,7 +169,7 @@ export default () => {
           initialValues={{
             name: "fff",
           }}
-          itemSpan={{span:12}}
+          itemSpan={{ span: 12 }}
           onFinish={(value) => {
             console.log(value);
           }}