@hw-component/form 1.9.85 → 1.9.86

package/lib/Form/hooks/useHForm.js

@@ -200,6 +200,16 @@ var useHForm = (function () {
         });
         form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
       },
+      resetFieldsValues: function resetFieldsValues() {
+        var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        var oldValue = form.getFieldsValue(true);
+        var keys = Object.keys(oldValue);
+        var newVale = {};
+        keys.forEach(function (key) {
+          newVale[key] = undefined;
+        });
+        form.setFieldsValue(_objectSpread(_objectSpread({}, newVale), values));
+      },
       clear: function clear() {
         form.resetFields();
         isLoading = false;

package/lib/Form/modal.d.ts

@@ -149,6 +149,7 @@ export interface HFormInstance extends FormInstance {
     reload: PromiseFnResult;
     clear: VoidFunction;
     resetFieldsInitValue: (values?: Record<string, any>) => void;
+    resetFieldsValues: (values?: Record<string, any>) => void;
     clearFormat: (name: string) => void;
     inited: boolean;
     resetFormStatus: VoidFunction;

package/package.json

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

package/src/components/Btn.tsx

@@ -4,41 +4,41 @@ import React from "react";
 import { useRequest } from "ahooks";
 
 export interface BtnProps<R = any> extends ButtonProps {
-    request?: () => Promise<any>;
-    onSuccess?: (data: R) => void;
+  request?: () => Promise<any>;
+  onSuccess?: (data: R) => void;
 }
 export default ({
-                    loading,
-                    request,
-                    children,
-                    onClick,
-                    style,
-                    type,
-                    onSuccess,
-                    ...props
-                }:BtnProps) => {
-    const { run, loading: reqLoading } = useRequest(
-        () => {
-            return request?.();
-        },
-        { manual: true, onSuccess }
-    );
-    const click = (e) => {
-        if (request) {
-            run();
-            return;
-        }
-        onClick?.(e);
-    };
-    return (
-        <Button
-            {...props}
-            type={type}
-            style={{ borderRadius: 4, ...style }}
-            onClick={click}
-            loading={loading || reqLoading}
-        >
-            {children}
-        </Button>
-    );
-};
+  loading,
+  request,
+  children,
+  onClick,
+  style,
+  type,
+  onSuccess,
+  ...props
+}: BtnProps) => {
+  const { run, loading: reqLoading } = useRequest(
+    () => {
+      return request?.();
+    },
+    { manual: true, onSuccess }
+  );
+  const click = (e) => {
+    if (request) {
+      run();
+      return;
+    }
+    onClick?.(e);
+  };
+  return (
+    <Button
+      {...props}
+      type={type}
+      style={{ borderRadius: 4, ...style }}
+      onClick={click}
+      loading={loading || reqLoading}
+    >
+      {children}
+    </Button>
+  );
+};

package/src/components/CheckboxGroup/index.tsx

@@ -20,7 +20,7 @@ const Index = ({
 }: HCheckboxProps) => {
   const { valueCheckMap: resultValueCheckMap, fieldNames: resultFieldNames } =
     useMatchConfigProps({ fieldNames, valueCheckMap: valueMap }); //匹配全局
-  const checkOptions:Record<string, any>[]|undefined = useChangeOptions({
+  const checkOptions: Record<string, any>[] | undefined = useChangeOptions({
     options,
     fieldNames: resultFieldNames,
   });
@@ -63,9 +63,10 @@ const Index = ({
   return (
     <Space direction={direction} wrap={wrap}>
       {checkOptions?.map((item) => {
-        const { label, value: itemVal ,disabled:itemDisabled} = item;
+        const { label, value: itemVal, disabled: itemDisabled } = item;
         const checked = val[itemVal];
-        const nDis=typeof itemDisabled==="undefined"?disabled:itemDisabled;
+        const nDis =
+          typeof itemDisabled === "undefined" ? disabled : itemDisabled;
         return (
           <Checkbox
             value={checked}

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

@@ -35,7 +35,7 @@ const Index: React.FC<DialogFormProps> = ({
   autoClear = true,
   contentRender,
   children,
-                                            destroyOnClose=true,
+  destroyOnClose = true,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -67,29 +67,29 @@ const Index: React.FC<DialogFormProps> = ({
     setModalVisible(false);
   };
   const { loading, run } = useSub({ request, onFinish });
-  const finish=async (values, subParams) => {
+  const finish = async (values, subParams) => {
     const result = await run(values, subParams);
     const close = onOk?.(result, subParams);
     if (close === false) {
       return;
     }
     cancel();
-  }
-  const footerOnOk=()=>{
-    if (modalFormData){
+  };
+  const footerOnOk = () => {
+    if (modalFormData) {
       dialogForm?.submit();
       return;
     }
-    finish({},formParams);
-  }
+    finish({}, formParams);
+  };
   const defaultFooter = useFooterRender({
     dialogForm,
     footer,
     confirmLoading: loading,
     params: formParams,
-    onOk :footerOnOk
+    onOk: footerOnOk,
   });
-  const node = modalFormData&&(
+  const node = modalFormData && (
     <HForm
       configData={modalFormData}
       initialValues={initValue}
@@ -102,13 +102,13 @@ const Index: React.FC<DialogFormProps> = ({
       labelWidth={labelWidth}
     />
   );
-  const selfAfterClose=()=>{
-    if (autoClear){
+  const selfAfterClose = () => {
+    if (autoClear) {
       dialogForm?.clear();
       return;
     }
     dialogForm?.resetFormStatus();
-  }
+  };
   return (
     <Drawer
       visible={modalVisible}
@@ -116,7 +116,7 @@ const Index: React.FC<DialogFormProps> = ({
       {...props}
       onClose={cancel}
       afterVisibleChange={(changeVisible) => {
-        if (changeVisible){
+        if (changeVisible) {
           return;
         }
         selfAfterClose();

package/src/components/DialogForm/ModalForm.tsx

@@ -30,7 +30,7 @@ const Index: React.FC<DialogFormProps> = ({
   contentRender,
   footer,
   children,
-                                            destroyOnClose=true,
+  destroyOnClose = true,
   ...props
 }) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -52,7 +52,7 @@ const Index: React.FC<DialogFormProps> = ({
     params,
     title,
     onCancel,
-    autoClear
+    autoClear,
   });
   const cancel = () => {
     saveOldParams();
@@ -62,22 +62,22 @@ const Index: React.FC<DialogFormProps> = ({
     setModalVisible(false);
   };
   const { loading, run } = useSub({ request, onFinish });
-  const finish=async (values, outParams)=>{
+  const finish = async (values, outParams) => {
     const result = await run(values, outParams);
     const close = onOk?.(result, outParams);
     if (close === false) {
       return;
     }
     cancel();
-  }
-  const footerOnOk=()=>{
-     if (modalFormData){
-       dialogForm?.submit();
-       return;
-     }
-     finish({},formParams);
-  }
-  const node = modalFormData&&(
+  };
+  const footerOnOk = () => {
+    if (modalFormData) {
+      dialogForm?.submit();
+      return;
+    }
+    finish({}, formParams);
+  };
+  const node = modalFormData && (
     <HForm
       configData={modalFormData}
       initialValues={initValue}
@@ -94,15 +94,15 @@ const Index: React.FC<DialogFormProps> = ({
     footer,
     confirmLoading: loading,
     params: formParams,
-    onOk:footerOnOk
+    onOk: footerOnOk,
   });
-  const selfAfterClose=()=>{
-    if (autoClear){
+  const selfAfterClose = () => {
+    if (autoClear) {
       dialogForm?.clear();
       return;
     }
     dialogForm?.resetFormStatus();
-  }
+  };
   return (
     <Modal
       title={modalTitle}

package/src/components/DialogForm/hooks.tsx

@@ -119,8 +119,8 @@ export const useSub = ({ request, onFinish }: Partial<DialogFormProps>) => {
     { manual: true }
   );
 };
-interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData">{
-   onOk:VoidFunction;
+interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
+  onOk: VoidFunction;
 }
 
 export const useFooterRender = ({
@@ -128,7 +128,7 @@ export const useFooterRender = ({
   confirmLoading,
   dialogForm,
   params,
-  onOk
+  onOk,
 }: FooterRenderParamsModal) => {
   if (footer === null) {
     return null;

package/src/components/DialogForm/modal.ts

@@ -38,10 +38,16 @@ export type FooterRender = (
 export interface DialogFormProps<P = any, T = any>
   extends Omit<
     RootProps,
-    "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"|"configData"
+    | "onFinish"
+    | "onCancel"
+    | "onOk"
+    | "infoRequest"
+    | "title"
+    | "footer"
+    | "configData"
   > {
   dialogForm?: HDialogFormInstance;
-  configData?:HFormProps["configData"];
+  configData?: HFormProps["configData"];
   onFinish?: (values: T, params: P) => Promise<any>;
   onCancel?: VoidFunction;
   onOk?: (data: T, params: P) => boolean | void;

package/src/components/Form/HFormConnect.tsx

@@ -1,13 +1,18 @@
 import { useFormContext } from "./Context";
 import React from "react";
-import type { addFormatItemModal ,HFormItemProps,ConnectResultProps,argsFn} from "./modal";
-import {formatMaker} from "./hooks/useAddFormat";
+import type {
+  addFormatItemModal,
+  HFormItemProps,
+  ConnectResultProps,
+  argsFn,
+} from "./modal";
+import { formatMaker } from "./hooks/useAddFormat";
 
 export default (
   component:
     | React.FunctionComponent
     | React.ComponentClass
-    | React.ForwardRefRenderFunction<any, any>,
+    | React.ForwardRefRenderFunction<any, any>
 ) => {
   const Index: React.ForwardRefRenderFunction<any, HFormItemProps> = (
     props: HFormItemProps,

package/src/components/Form/InitSet.tsx

@@ -5,10 +5,10 @@ export default () => {
   const { form } = useFormContext();
   useEffect(() => {
     form.initValues();
-    form.inited=true;
-    return ()=>{
-      form.inited=false;
-    }
+    form.inited = true;
+    return () => {
+      form.inited = false;
+    };
   }, []);
   return <></>;
 };

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

@@ -129,6 +129,4 @@ export const useValuesChange = ({
   };
 };
 
-export const useAddFormat=()=>{
-
-}
+export const useAddFormat = () => {};

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

@@ -1,44 +1,42 @@
-import {addFormatItemModal, HFormItemProps} from "../modal";
-import {useFormContext} from "@/components/Form/Context";
-import {useEffect} from "react";
+import { addFormatItemModal, HFormItemProps } from "../modal";
+import { useFormContext } from "@/components/Form/Context";
+import { useEffect } from "react";
 
 interface ResultModal {
-    inputValue?: (value: Record<string, any>) => Record<string, any>;
-    outputValue?: (value: Record<string, any>) => Record<string, any>;
+  inputValue?: (value: Record<string, any>) => Record<string, any>;
+  outputValue?: (value: Record<string, any>) => Record<string, any>;
 }
 
 export const formatMaker = (
-    itemProps: HFormItemProps,
-    formats?: addFormatItemModal
+  itemProps: HFormItemProps,
+  formats?: addFormatItemModal
 ) => {
-    const { inputValue, outputValue } = formats || {};
-    const { initValueProvider = inputValue, subProvider = outputValue } =
-        itemProps;
-    const resultObj: ResultModal = {};
-    if (initValueProvider) {
-        resultObj.inputValue = (value) => {
-            return initValueProvider(itemProps, value);
-        };
-    }
-    if (subProvider) {
-        resultObj.outputValue = (value) => {
-            return subProvider(itemProps, value);
-        };
-    }
-    const keysLen = Object.keys(resultObj).length;
-    return keysLen === 0 ? undefined : resultObj;
+  const { inputValue, outputValue } = formats || {};
+  const { initValueProvider = inputValue, subProvider = outputValue } =
+    itemProps;
+  const resultObj: ResultModal = {};
+  if (initValueProvider) {
+    resultObj.inputValue = (value) => {
+      return initValueProvider(itemProps, value);
+    };
+  }
+  if (subProvider) {
+    resultObj.outputValue = (value) => {
+      return subProvider(itemProps, value);
+    };
+  }
+  const keysLen = Object.keys(resultObj).length;
+  return keysLen === 0 ? undefined : resultObj;
 };
 
-
-
-export default (props:HFormItemProps)=>{
-    const {name,itemProps}=props;
-    const { form, valueType = "float" } = useFormContext();
-    const relName = Array.isArray(name) ? name.join(".") : name;
-    useEffect(() => {
-        if (!relName||!itemProps) {
-            return;
-        }
-        form?.addFormat(relName, formatMaker((itemProps as HFormItemProps)));
-    }, [valueType, props]);
-}
+export default (props: HFormItemProps) => {
+  const { name, itemProps } = props;
+  const { form, valueType = "float" } = useFormContext();
+  const relName = Array.isArray(name) ? name.join(".") : name;
+  useEffect(() => {
+    if (!relName || !itemProps) {
+      return;
+    }
+    form?.addFormat(relName, formatMaker(itemProps as HFormItemProps));
+  }, [valueType, props]);
+};

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

@@ -186,14 +186,26 @@ export default () => {
           ...values,
         });
       },
+      resetFieldsValues: (values = {}) => {
+        const oldValue = form.getFieldsValue(true);
+        const keys = Object.keys(oldValue);
+        const newVale = {};
+        keys.forEach((key) => {
+          newVale[key] = undefined;
+        });
+        form.setFieldsValue({
+          ...newVale,
+          ...values,
+        });
+      },
       clear: () => {
         form.resetFields();
         isLoading = false;
       },
-      resetFormStatus:()=>{
+      resetFormStatus: () => {
         isLoading = false;
       },
-      inited:false
+      inited: false,
     };
   }, []);
 };

package/src/components/Form/modal.ts

@@ -208,9 +208,10 @@ export interface HFormInstance extends FormInstance {
   reload: PromiseFnResult;
   clear: VoidFunction;
   resetFieldsInitValue: (values?: Record<string, any>) => void;
+  resetFieldsValues: (values?: Record<string, any>) => void;
   clearFormat: (name: string) => void;
-  inited:boolean;
-  resetFormStatus:VoidFunction
+  inited: boolean;
+  resetFormStatus: VoidFunction;
 }
 
 export interface ConnectConfigModal {

package/src/components/RichEditor/hooks.ts

@@ -3,7 +3,7 @@ import { baseConfig } from "../config";
 import { IHRichEditorProps } from "src/components/RichEditor/modal";
 import { useClassName } from "../hooks";
 import { useEffect, useMemo, useRef, useState } from "react";
-import BraftEditor, {EditorState} from "braft-editor";
+import BraftEditor, { EditorState } from "braft-editor";
 
 export const useProps = ({ fileRequest, valueType }: IHRichEditorProps) => {
   const {
@@ -46,38 +46,40 @@ export const useFocusClassname = ({
   };
 };
 
-export const useVC=({value,onChange,valueType}:IHRichEditorProps)=>{
-    const richValue: EditorState | undefined = valueType === "html" ? BraftEditor.createEditorState(value) : (value as EditorState);
-    const change = (editorState) => {
-        const changeVal = valueType === "html" ? editorState.toHTML() : editorState;
-        const isEmpty = !!richValue ? richValue.isEmpty() : true;
-        if (isEmpty && editorState.isEmpty()) {
-            return;
-        }
-        onChange?.(changeVal);
-    };
-    return {
-        richValue,
-        change
+export const useVC = ({ value, onChange, valueType }: IHRichEditorProps) => {
+  const richValue: EditorState | undefined =
+    valueType === "html"
+      ? BraftEditor.createEditorState(value)
+      : (value as EditorState);
+  const change = (editorState) => {
+    const changeVal = valueType === "html" ? editorState.toHTML() : editorState;
+    const isEmpty = !!richValue ? richValue.isEmpty() : true;
+    if (isEmpty && editorState.isEmpty()) {
+      return;
     }
-}
-
+    onChange?.(changeVal);
+  };
+  return {
+    richValue,
+    change,
+  };
+};
 
-export const useUploadFn=({fileRequest}:IHRichEditorProps)=>{
-    return async (params)=>{
-        const { file, id } = params;
-        const { url } = await fileRequest?.(file, params);
-        params.success({
-            url,
-            meta: {
-                id,
-                title: file.name,
-                alt: "媒体资源",
-                loop: false,
-                autoPlay: false,
-                controls: true,
-                poster: url,
-            },
-        });
-    }
-}
+export const useUploadFn = ({ fileRequest }: IHRichEditorProps) => {
+  return async (params) => {
+    const { file, id } = params;
+    const { url } = await fileRequest?.(file, params);
+    params.success({
+      url,
+      meta: {
+        id,
+        title: file.name,
+        alt: "媒体资源",
+        loop: false,
+        autoPlay: false,
+        controls: true,
+        poster: url,
+      },
+    });
+  };
+};

package/src/components/RichEditor/index.tsx

@@ -1,7 +1,7 @@
 import BraftEditor, { EditorState } from "braft-editor";
 import "braft-editor/dist/index.css";
 import { IHRichEditorProps } from "./modal";
-import {useFocusClassname, useProps, useUploadFn, useVC} from "./hooks";
+import { useFocusClassname, useProps, useUploadFn, useVC } from "./hooks";
 import { useClassName } from "../hooks";
 import React from "react";
 import HFormConnect from "../Form/HFormConnect";
@@ -19,8 +19,8 @@ const Index: React.ForwardRefRenderFunction<any, IHRichEditorProps> = (
     media,
     contentStyle = defaultContentStyle,
     bordered = true,
-      onBlur,
-      onFocus,
+    onBlur,
+    onFocus,
     addFormat,
     ...props
   },
@@ -30,37 +30,45 @@ const Index: React.ForwardRefRenderFunction<any, IHRichEditorProps> = (
     fileRequest,
     valueType,
   });
-  const { focusClassname, onFocus:selfFocus, onBlur:selfBlur } = useFocusClassname({
+  const {
+    focusClassname,
+    onFocus: selfFocus,
+    onBlur: selfBlur,
+  } = useFocusClassname({
     bordered,
     onBlur,
-    onFocus
+    onFocus,
   });
-  const {richValue,change}=useVC({value,onChange,valueType:vType});
-  const uploadFn = useUploadFn({fileRequest:fileReq});
+  const { richValue, change } = useVC({ value, onChange, valueType: vType });
+  const uploadFn = useUploadFn({ fileRequest: fileReq });
   const bodyClassName = useClassName("hw-rich-editor");
   const borderClassName = useClassName("hw-rich-editor-border");
   addFormat?.({
-    float:{
-      inputValue:(item, initValue)=>{
+    float: {
+      inputValue: (item, initValue) => {
         const { name = "" } = item;
-        const keyName=(name as string);
-        const itemVal=initValue[keyName];
-        const initVal=typeof itemVal==="string"?BraftEditor.createEditorState(itemVal):itemVal;
+        const keyName = name as string;
+        const itemVal = initValue[keyName];
+        const initVal =
+          typeof itemVal === "string"
+            ? BraftEditor.createEditorState(itemVal)
+            : itemVal;
         return {
-            [keyName]:initVal
+          [keyName]: initVal,
         };
       },
-      outputValue:(item, outputValue)=>{
+      outputValue: (item, outputValue) => {
         const { name = "" } = item;
-          const keyName=(name as string);
-        const itemVal=outputValue[keyName];
-        const outputVal=typeof itemVal==="string"?itemVal:itemVal?.toHTML();
+        const keyName = name as string;
+        const itemVal = outputValue[keyName];
+        const outputVal =
+          typeof itemVal === "string" ? itemVal : itemVal?.toHTML();
         return {
-            [keyName]:outputVal
-        }
-      }
-    }
-  })
+          [keyName]: outputVal,
+        };
+      },
+    },
+  });
   return (
     <div
       className={`${bodyClassName} ${
@@ -81,4 +89,4 @@ const Index: React.ForwardRefRenderFunction<any, IHRichEditorProps> = (
   );
 };
 
-export default HFormConnect((React.forwardRef(Index) as any));
+export default HFormConnect(React.forwardRef(Index) as any);