@hw-component/form 0.0.6-beta-v9 → 0.0.7-beta-v1

package/es/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/es/Form/config.d.ts

@@ -24,6 +24,13 @@ declare const componentConfig: {
     urlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("../Upload/modal").IUrlUploadProps) => JSX.Element;
     submit: ({ text, type, form, loading, position, reset, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
     textArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
-    colorInput: ({ value, onChange, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
+    colorInput: ({ value, onChange, defaultColor, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
+    cascader: (<OptionType extends import("rc-cascader").DefaultOptionType | import("rc-cascader").BaseOptionType = import("rc-cascader").DefaultOptionType>(props: import("react").PropsWithChildren<import("antd").CascaderProps<OptionType>> & {
+        ref?: import("react").Ref<import("antd/lib/cascader").CascaderRef> | undefined;
+    }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) & {
+        displayName: string;
+        SHOW_PARENT: "SHOW_PARENT";
+        SHOW_CHILD: "SHOW_CHILD";
+    };
 };
 export default componentConfig;

package/es/Form/config.js

@@ -16,6 +16,7 @@ import Index$4 from '../Upload/UrlUpload/index.js';
 import HSubmit from '../Submit/index.js';
 import TextArea from '../TextArea/index.js';
 import ColorInput from '../Input/ColorInput/index.js';
+import { Cascader } from 'antd';
 
 var placeholderConfig = {
   inputType: ["input", "inputNumber", "selectInput", "buttonInput"],
@@ -38,7 +39,8 @@ var componentConfig = {
   urlUpload: Index$4,
   submit: HSubmit,
   textArea: TextArea,
-  colorInput: ColorInput
+  colorInput: ColorInput,
+  cascader: Cascader
 };
 
 export { componentConfig as default, placeholderConfig };

package/es/Form/modal.d.ts

@@ -1,4 +1,4 @@
-import type { FormInstance, FormItemProps, FormProps } from "antd";
+import type { CascaderProps, FormInstance, FormItemProps, FormProps } from "antd";
 import type { HCheckboxProps } from "../CheckboxGroup/modal";
 import type React from "react";
 import type { HButtonProps, HInputProps, HSelectInputProps } from "../Input/modal";
@@ -15,7 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 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;
+type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;

package/lib/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/lib/Form/config.d.ts

@@ -24,6 +24,13 @@ declare const componentConfig: {
     urlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("../Upload/modal").IUrlUploadProps) => JSX.Element;
     submit: ({ text, type, form, loading, position, reset, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
     textArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
-    colorInput: ({ value, onChange, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
+    colorInput: ({ value, onChange, defaultColor, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
+    cascader: (<OptionType extends import("rc-cascader").DefaultOptionType | import("rc-cascader").BaseOptionType = import("rc-cascader").DefaultOptionType>(props: import("react").PropsWithChildren<import("antd").CascaderProps<OptionType>> & {
+        ref?: import("react").Ref<import("antd/lib/cascader").CascaderRef> | undefined;
+    }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) & {
+        displayName: string;
+        SHOW_PARENT: "SHOW_PARENT";
+        SHOW_CHILD: "SHOW_CHILD";
+    };
 };
 export default componentConfig;

package/lib/Form/config.js

@@ -19,6 +19,7 @@ var index$8 = require('../Upload/UrlUpload/index.js');
 var index$9 = require('../Submit/index.js');
 var index$a = require('../TextArea/index.js');
 var index$b = require('../Input/ColorInput/index.js');
+var antd = require('antd');
 
 var placeholderConfig = {
   inputType: ["input", "inputNumber", "selectInput", "buttonInput"],
@@ -41,7 +42,8 @@ var componentConfig = {
   urlUpload: index$8.default,
   submit: index$9.default,
   textArea: index$a.default,
-  colorInput: index$b.default
+  colorInput: index$b.default,
+  cascader: antd.Cascader
 };
 
 exports.default = componentConfig;

package/lib/Form/modal.d.ts

@@ -1,4 +1,4 @@
-import type { FormInstance, FormItemProps, FormProps } from "antd";
+import type { CascaderProps, FormInstance, FormItemProps, FormProps } from "antd";
 import type { HCheckboxProps } from "../CheckboxGroup/modal";
 import type React from "react";
 import type { HButtonProps, HInputProps, HSelectInputProps } from "../Input/modal";
@@ -15,7 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 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;
+type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
     text?: string;
     icon?: React.ReactNode;

package/package.json

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

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -4,7 +4,9 @@ import { useCurrentForm, useModifyProps, useSub } from "../hooks";
 import HForm from "../../Form";
 import Title from "./Title";
 import Footer from "./Footer";
-import FormConfigProvider,{useFormConfigContext} from "../../Form/Context/FormConfigProvider";
+import FormConfigProvider, {
+  useFormConfigContext,
+} from "../../Form/Context/FormConfigProvider";
 export default ({
   visible,
   title,
@@ -27,7 +29,7 @@ export default ({
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
-  const providerConfig=useFormConfigContext();
+  const providerConfig = useFormConfigContext();
   const {
     modalVisible,
     modalFormData,
@@ -35,7 +37,7 @@ export default ({
     initValue,
     onAfterClose,
     formParams,
-    title:modalTitle
+    title: modalTitle,
   } = useModifyProps({
     configData,
     visible,
@@ -43,7 +45,7 @@ export default ({
     dialogForm: currentForm,
     params,
     title,
-    onCancel
+    onCancel,
   });
   const cancel = () => {
     onAfterClose();
@@ -79,22 +81,22 @@ export default ({
     >
       <FormConfigProvider {...providerConfig}>
         <HForm
-            configData={modalFormData}
-            initialValues={initValue}
-            onValuesChange={onValuesChange}
-            {...props}
-            form={currentForm}
-            params={formParams}
-            onFinish={async (values, subParams) => {
-              const result = await run(values, subParams);
-              const close = onOk?.(result, subParams);
-              if (close === false) {
-                return;
-              }
-              cancel();
-            }}
-            infoRequest={infoRequest}
-            labelWidth={labelWidth}
+          configData={modalFormData}
+          initialValues={initValue}
+          onValuesChange={onValuesChange}
+          {...props}
+          form={currentForm}
+          params={formParams}
+          onFinish={async (values, subParams) => {
+            const result = await run(values, subParams);
+            const close = onOk?.(result, subParams);
+            if (close === false) {
+              return;
+            }
+            cancel();
+          }}
+          infoRequest={infoRequest}
+          labelWidth={labelWidth}
         />
       </FormConfigProvider>
     </Drawer>

package/src/components/DialogForm/ModalForm.tsx

@@ -1,7 +1,9 @@
 import { Modal } from "antd";
 import type { DialogFormProps } from "./modal";
 import HForm from "../Form";
-import FormConfigProvider, {useFormConfigContext} from '../Form/Context/FormConfigProvider'
+import FormConfigProvider, {
+  useFormConfigContext,
+} from "../Form/Context/FormConfigProvider";
 import { useCurrentForm, useModifyProps, useSub } from "./hooks";
 export default ({
   visible,
@@ -20,7 +22,7 @@ export default ({
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
-  const providerConfig=useFormConfigContext();
+  const providerConfig = useFormConfigContext();
   const {
     modalVisible,
     modalFormData,
@@ -35,7 +37,7 @@ export default ({
     dialogForm: currentForm,
     params,
     title,
-    onCancel
+    onCancel,
   });
   const cancel = () => {
     if (onCancel) {
@@ -60,21 +62,21 @@ export default ({
     >
       <FormConfigProvider {...providerConfig}>
         <HForm
-            configData={modalFormData}
-            initialValues={initValue}
-            onValuesChange={onValuesChange}
-            onFinish={async (values, outParams) => {
-              const result = await run(values, outParams);
-              const close = onOk?.(result, outParams);
-              if (close === false) {
-                return;
-              }
-              cancel();
-            }}
-            {...props}
-            params={formParams}
-            form={currentForm}
-            infoRequest={infoRequest}
+          configData={modalFormData}
+          initialValues={initValue}
+          onValuesChange={onValuesChange}
+          onFinish={async (values, outParams) => {
+            const result = await run(values, outParams);
+            const close = onOk?.(result, outParams);
+            if (close === false) {
+              return;
+            }
+            cancel();
+          }}
+          {...props}
+          params={formParams}
+          form={currentForm}
+          infoRequest={infoRequest}
         />
       </FormConfigProvider>
     </Modal>

package/src/components/DialogForm/hooks.ts

@@ -15,7 +15,7 @@ export const useModifyProps = ({
   afterClose,
   params,
   title,
-                                 onCancel
+  onCancel,
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);

package/src/components/Form/config.ts

@@ -15,7 +15,7 @@ import HUrlUpload from "../Upload/UrlUpload";
 import HSubmit from "../Submit";
 import TextArea from "../TextArea";
 import ColorInput from "../Input/ColorInput";
-
+import {Cascader} from 'antd';
 export const placeholderConfig = {
   inputType: ["input", "inputNumber", "selectInput", "buttonInput"],
   selectType: ["select", "datePicker", "timePicker", "colorInput"],
@@ -38,6 +38,7 @@ const componentConfig = {
   submit: HSubmit,
   textArea: TextArea,
   colorInput: ColorInput,
+  cascader:Cascader
 };
 
 export default componentConfig;

package/src/components/Form/hooks/index.ts

@@ -50,7 +50,7 @@ export const useInfoReq = ({
       form?.setFieldsValue(result);
       return result || {};
     }
-    const setValue = initialValues||{};
+    const setValue = initialValues || {};
     form?.setFieldsValue(setValue);
     return setValue;
   });

package/src/components/Form/modal.ts

@@ -1,4 +1,4 @@
-import type { FormInstance, FormItemProps, FormProps } from "antd";
+import type {CascaderProps, FormInstance, FormItemProps, FormProps} from "antd";
 import type { HCheckboxProps } from "../CheckboxGroup/modal";
 import type React from "react";
 import type {
@@ -46,7 +46,8 @@ type ItemPropsType =
   | HRangePickerProps
   | HTimePickerProps
   | TextAreaProps
-  | IUpLoadProps;
+  | IUpLoadProps
+    |CascaderProps<any>;
 
 export interface HoverModal {
   text?: string;
@@ -147,7 +148,7 @@ export interface HFormInstance extends FormInstance {
   addDispatchListener: AddDispatchListenerFn;
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
-  clear:VoidFunction;
+  clear: VoidFunction;
 }
 
 export interface ConnectConfigModal {

package/src/pages/ModalForm/index.tsx

@@ -1,7 +1,11 @@
 import { Button } from "antd";
-import { HModalForm, useHDialogForm ,HFormConfigProvider} from "../../components";
-import {useState} from "react";
-import {ShowParamsModal} from "@/components/DialogForm/modal";
+import {
+  HModalForm,
+  useHDialogForm,
+  HFormConfigProvider,
+} from "../../components";
+import { useState } from "react";
+import { ShowParamsModal } from "@/components/DialogForm/modal";
 const data = [
   {
     label: "输入框",
@@ -120,8 +124,6 @@ const data = [
 let num = 0;
 export default () => {
   const modalForm = useHDialogForm();
-  const [testModal,setTestModal]=useState<ShowParamsModal>({});
-  const {visible,params}=testModal;
   return (
     <>
       <Button
@@ -151,21 +153,23 @@ export default () => {
         宣誓
       </Button>
       <HFormConfigProvider
-          uploadProps={{
-             request:()=>{
-               console.log("request,request,request,request")
-               return Promise.resolve({url:"https://gw.alicdn.com/imgextra/i2/O1CN01MYuwJQ1GXVBWryCFJ_!!6000000000632-2-tps-1125-570.png_468x468q75.jpg_.webp"});
-             }
-          }}
+        uploadProps={{
+          request: () => {
+            console.log("request,request,request,request");
+            return Promise.resolve({
+              url: "https://gw.alicdn.com/imgextra/i2/O1CN01MYuwJQ1GXVBWryCFJ_!!6000000000632-2-tps-1125-570.png_468x468q75.jpg_.webp",
+            });
+          },
+        }}
       >
         <HModalForm
-            configData={data}
-            labelWidth={88}
-            request={(val, params) => {
-              console.log(val, params);
-            }}
-            dialogForm={modalForm}
-            title="测试"
+          configData={data}
+          labelWidth={88}
+          request={(val, params) => {
+            console.log(val, params);
+          }}
+          dialogForm={modalForm}
+          title="测试"
         />
       </HFormConfigProvider>
     </>