@hw-component/form 1.9.46 → 1.9.48

package/lib/index.css

@@ -19,9 +19,9 @@
           flex-direction: row;
 }
 .ant-hw-select-box .ant-hw-group-addon-before {
-  border-bottom-left-radius: 2px;
+  border-right: 0;
   border-top-left-radius: 2px;
-  border-right: 0px;
+  border-bottom-left-radius: 2px;
 }
 .ant-hw-select-box .ant-select {
   -webkit-box-flex: 1;
@@ -30,17 +30,17 @@
           flex: 1;
 }
 .ant-hw-select-box .ant-hw-group-addon-after {
-  border-bottom-right-radius: 2px;
+  border-left: 0;
   border-top-right-radius: 2px;
-  border-left: 0px;
+  border-bottom-right-radius: 2px;
 }
 .ant-hw-select-box-addon-before .ant-select .ant-select-selector {
-  border-bottom-left-radius: 0px !important;
-  border-top-left-radius: 0px !important;
+  border-top-left-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
 }
 .ant-hw-select-box-addon-after .ant-select .ant-select-selector {
-  border-bottom-right-radius: 0px !important;
-  border-top-right-radius: 0px !important;
+  border-top-right-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
 }
 .ant-hw-form-item-colon:after {
   position: relative;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
-export { useHDialogForm } from "./DialogForm/hooks";
+export { useHDialogForm } from "@/components/DialogForm/hooks";
 export { default as HFormConnect } from "./Form/HFormConnect";
 export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
 export { default as HBasicForm } from "./Form/Basic";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.46",
+  "version": "1.9.48",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",
@@ -85,13 +85,15 @@
     "webpack": "^5.83.1",
     "webpack-cli": "^5.1.1",
     "webpack-dev-server": "^4.15.0",
-    "webpackbar": "^5.0.2"
+    "webpackbar": "^5.0.2",
+    "@hw-component/hj": "0.9.0"
   },
   "peerDependencies": {
     "@ant-design/icons": "4.6.2",
     "antd": "4.20.7",
     "react": "17.0.0",
-    "react-dom": "17.0.2"
+    "react-dom": "17.0.2",
+    "@hw-component/hj": "0.9.0"
   },
   "cssPrefix": "hw"
 }

package/src/components/CheckboxGroup/index.tsx

@@ -43,15 +43,15 @@ const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [(name as string)]: resultObj,
+          [name as string]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [(name as string)]: itemVal = {} } = outputValue;
+        const { [name as string]: itemVal = {} } = outputValue;
         if (Array.isArray(itemVal)) {
           return {
-            [(name as string)]: itemVal,
+            [name as string]: itemVal,
           };
         }
         return {

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

@@ -1,4 +1,5 @@
-import { Row, Space, Button } from "antd";
+import { Row, Space } from "antd";
+import {HJBtn} from "@hw-component/hj";
 
 interface IProps {
   onOk?: VoidFunction;
@@ -7,13 +8,14 @@ interface IProps {
 }
 
 export default ({ onCancel, onOk, confirmLoading }: IProps) => {
+
   return (
     <Row justify={"end"}>
-      <Space size={"middle"}>
-        <Button onClick={onCancel}>关闭</Button>
-        <Button type={"primary"} onClick={onOk} loading={confirmLoading}>
+      <Space size={"small"}>
+        <HJBtn onClick={onCancel}>关闭</HJBtn>
+        <HJBtn type={"primary"} onClick={onOk} loading={confirmLoading}>
           确定
-        </Button>
+        </HJBtn>
       </Space>
     </Row>
   );

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

@@ -1,9 +1,8 @@
 import { Drawer } from "antd";
 import type { DialogFormProps } from "../modal";
-import { useCurrentForm, useModifyProps, useSub } from "../hooks";
+import {useCurrentForm, useFooterRender, useModifyProps, useSub} from "@/components/DialogForm/hooks";
 import HForm from "../../Form";
 import Title from "./Title";
-import Footer from "./Footer";
 import FormConfigProvider, {
   useFormConfigContext,
 } from "../../Form/Context/FormConfigProvider";
@@ -62,23 +61,13 @@ const Index: React.FC<DialogFormProps> = ({
     setModalVisible(false);
   };
   const { loading, run } = useSub({ request, onFinish });
-  const footerComponent = () => {
-    if (footer === null) {
-      return null;
-    }
-    if (typeof footer === "function") {
-      return footer(dialogForm, loading, formParams);
-    }
-    return (
-      footer || (
-        <Footer
-          onCancel={cancel}
-          onOk={currentForm.submit}
-          confirmLoading={loading}
-        />
-      )
-    );
-  };
+
+  const defaultFooter = useFooterRender({
+    dialogForm,
+    footer,
+    confirmLoading: loading,
+    params: formParams,
+  });
   const node = (
     <HForm
       configData={modalFormData}
@@ -106,8 +95,8 @@ const Index: React.FC<DialogFormProps> = ({
       {...props}
       onClose={cancel}
       closable={false}
-      destroyOnClose={true}
-      footer={footerComponent()}
+      destroyOnClose
+      footer={defaultFooter}
     >
       <FormConfigProvider {...providerConfig}>
         <ChildComponent

package/src/components/DialogForm/ModalForm.tsx

@@ -9,7 +9,7 @@ import {
   useFooterRender,
   useModifyProps,
   useSub,
-} from "./hooks";
+} from "@/components/DialogForm/hooks";
 import ChildComponent from "./ChildComponent";
 import React from "react";
 const Index: React.FC<DialogFormProps> = ({
@@ -97,7 +97,7 @@ const Index: React.FC<DialogFormProps> = ({
       }}
       {...props}
       onOk={currentForm.submit}
-      destroyOnClose={true}
+      destroyOnClose
       footer={defaultFooter}
     >
       <FormConfigProvider {...providerConfig}>

package/src/components/DialogForm/{hooks.ts → hooks.tsx}

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import useHForm from "../Form/hooks/useHForm";
 import type {
   DialogFormProps,
@@ -6,6 +6,7 @@ import type {
   ModifyPropsModal,
 } from "./modal";
 import { useRequest } from "ahooks";
+import Footer from "@/components/DialogForm/DrawerForm/Footer";
 
 export const useModifyProps = ({
   visible,
@@ -127,11 +128,23 @@ export const useFooterRender = ({
   dialogForm,
   params,
 }: Omit<DialogFormProps, "configData">) => {
-  if (!footer) {
-    return footer;
+  if (footer===null){
+    return null;
   }
   if (typeof footer === "function") {
     return footer(dialogForm, confirmLoading, params);
   }
-  return footer;
+  return (
+      footer || (
+          <Footer
+              onCancel={()=>{
+                dialogForm?.hide();
+              }}
+              onOk={()=>{
+                dialogForm?.submit()
+              }}
+              confirmLoading={confirmLoading}
+          />
+      )
+  );
 };

package/src/components/DialogForm/modal.ts

@@ -29,7 +29,7 @@ export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
   show: (data?: ShowParamsModal<P, T>) => void;
   hide: VoidFunction;
 }
-type FooterRender = (
+export type FooterRender = (
   dialogForm?: HDialogFormInstance,
   loading?: boolean,
   params?: Record<string, any>

package/src/components/Form/Basic.tsx

@@ -53,8 +53,8 @@ export default ({
           ...formItemProps,
           ...itemProps,
         };
-        const arrayName=Array.isArray(name)?name.join("."):name;
-        const key=arrayName||nameKey;
+        const arrayName = Array.isArray(name) ? name.join(".") : name;
+        const key = arrayName || nameKey;
         return (
           <Item
             {...itemData}

package/src/components/Form/HFormConnect.tsx

@@ -45,7 +45,7 @@ export default (
   ) => {
     const { form, valueType = "float" } = useFormContext();
     const { name } = props;
-    const relName=Array.isArray(name)?name.join("."):name;
+    const relName = Array.isArray(name) ? name.join(".") : name;
     useEffect(() => {
       if (!relName) {
         return;
@@ -59,11 +59,11 @@ export default (
       form?.addFormat(relName, formatMaker(props, aFormat[valueType]));
     };
     const addDispatchListener = (key: string, fn: argsFn) => {
-      const {dispatch } = props;
+      const { dispatch } = props;
       if (!relName) {
         return;
       }
-      form?.addDispatchListener({ key, name:relName, dispatch }, fn);
+      form?.addDispatchListener({ key, name: relName, dispatch }, fn);
     };
     const Component = component as React.ForwardRefRenderFunction<
       any,

package/src/components/Form/config.ts

@@ -21,7 +21,7 @@ import VerificationCodeInput from "../Input/VerificationCodeInput";
 import TrimInput from "../Input/TrimInput";
 import TrimTextArea from "../TextArea/TrimTextArea";
 import HInputNumberGroup from "../Input/InputNumberGroup";
-import HText from '../Text'
+import HText from "../Text";
 export const placeholderConfig = {
   inputType: [
     "input",

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

@@ -33,19 +33,19 @@ export const useInfoReq = ({
       params: saveParams,
     };
   }, [params]);
- const {infoReq:initReq,options}=useMemo(()=>{
-    if (typeof infoRequest==="object"){
-      const {request:infoReq,...op}=infoRequest;
+  const { infoReq: initReq, options } = useMemo(() => {
+    if (typeof infoRequest === "object") {
+      const { request: infoReq, ...op } = infoRequest;
       return {
         infoReq,
-        options:op
-      }
+        options: op,
+      };
     }
     return {
-      infoReq:infoRequest,
-      options:{}
+      infoReq: infoRequest,
+      options: {},
     };
- },[infoRequest]);
+  }, [infoRequest]);
 
   const subControl = useRequest(
     async (value) => {
@@ -69,7 +69,7 @@ export const useInfoReq = ({
     }
     form?.setFieldsValue(initialValues);
     return initialValues;
-  },options);
+  }, options);
   const { run, mutate } = infoControl;
   useEffect(() => {
     if (form) {

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

@@ -135,7 +135,7 @@ const dispatchProvider = (
   dispatchSourceData: DispatchSourceDataModal
 ) => {
   const { name = "", dispatch = {}, dependencies = "allDependencies" } = item;
-  const relName=Array.isArray(name)?name.join("."):name;
+  const relName = Array.isArray(name) ? name.join(".") : name;
   const {
     fnKey,
     dependencies: dispatchDependencies = dependencies as string | string[],
@@ -151,7 +151,7 @@ const dispatchProvider = (
     };
     dispatchDependencies.forEach((key) => {
       const itemDispatch = itemDispatchProvider(
-          relName,
+        relName,
         { dependencies: key, fnKey, manual, reset },
         dispatchSourceData
       );
@@ -163,7 +163,7 @@ const dispatchProvider = (
     return allDispatch;
   }
   const itemDispatch = itemDispatchProvider(
-      relName,
+    relName,
     { dependencies: dispatchDependencies, fnKey, manual, reset },
     dispatchSourceData
   );

package/src/components/Form/index.tsx

@@ -77,7 +77,6 @@ export default ({
       error={infoErr}
       data={infoData}
       reload={infoRun}
-
     >
       <FormContext.Provider
         value={{

package/src/components/Form/modal.ts

@@ -35,8 +35,8 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
-import { NamePath } from "rc-field-form/es/interface";
-import {BaseOptions} from "@ahooksjs/use-request/lib/types";
+import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import {HFormTextProps} from "../Text";
 
 type RenderFun = (
   props: HItemProps,
@@ -58,7 +58,7 @@ export type ItemPropsType =
   | TextAreaProps
   | IUpLoadProps
   | CascaderProps<any>
-  | IUrlUploadProps;
+  | IUrlUploadProps|HFormTextProps;
 
 export interface HoverModal {
   text?: string;
@@ -92,7 +92,7 @@ export interface HItemProps
   labelWidth?: number;
   hide?: boolean | HideModal;
   placeholder?: string | string[];
-  name?: string|string[];
+  name?: string | string[];
   dispatch?: DispatchModal;
   itemSpan?: ColProps;
   hideLabel?: boolean;
@@ -100,17 +100,17 @@ export interface HItemProps
   label?: React.ReactNode | HelperModal;
   hidden?: boolean | HideModal;
   rowWrapper?: boolean;
-  nameKey?:string;
+  nameKey?: string;
 }
-interface InfoRequestOp extends BaseOptions<any,any> {
-  request:PromiseFnResult;
+interface InfoRequestOp extends BaseOptions<any, any> {
+  request: PromiseFnResult;
 }
 export interface HFormProps<T = any, R = any>
   extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
   configData: HItemProps[];
   labelWidth?: number;
   request?: (values: T, params?: any) => Promise<R>;
-  infoRequest?: PromiseFnResult|InfoRequestOp;
+  infoRequest?: PromiseFnResult | InfoRequestOp;
   valueType?: string;
   form?: HFormInstance;
   params?: any;

package/src/components/Input/ButtonInput.tsx

@@ -1,26 +1,26 @@
-import { Input, Button } from "antd";
+import { Input} from "antd";
 import React from "react";
 import { useRequest } from "ahooks";
 import type { HButtonInputProps } from "./modal";
-
+import {HJBtn} from '@hw-component/hj'
 const Index: React.FC<HButtonInputProps> = ({
   buttonProps = {},
   value,
   onChange,
   children,
   request,
-                                              layType="group",
+  layType = "group",
   ...props
 }) => {
   const {
     onClick,
-    type ,
+    type,
     ghost = true,
     loading: btnLoading,
     ...oProps
   } = buttonProps;
-  const defaultBtnType=layType==="group"?"primary":"link"
-  const btnType=type||defaultBtnType
+  const defaultBtnType = layType === "group" ? "primary" : "link";
+  const btnType = type || defaultBtnType;
   const { run, loading } = useRequest(
     (val) => {
       return request?.(val);
@@ -37,36 +37,38 @@ const Index: React.FC<HButtonInputProps> = ({
     }
     onClick?.(result, onChange);
   };
-  if (layType==="text"){
-     return  <Input
-         {...props}
-         suffix={
-           <Button
-               type={btnType}
-               onClick={click}
-               size={"small"}
-               loading={loading || btnLoading}
-               ghost={ghost}
-               {...oProps}
-           >
-             {children}
-           </Button>
-         }
-     />
+  if (layType === "text") {
+    return (
+      <Input
+        {...props}
+        suffix={
+          <HJBtn
+            type={btnType}
+            onClick={click}
+            size={"small"}
+            loading={loading || btnLoading}
+            ghost={ghost}
+            {...oProps}
+          >
+            {children}
+          </HJBtn>
+        }
+      />
+    );
   }
   return (
     <Input.Group compact style={{ display: "flex" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
-      <Button
+      <HJBtn
         type={btnType}
         onClick={click}
         loading={loading || btnLoading}
-        style={{ marginLeft: 8, borderRadius: 4 }}
+        style={{ marginLeft: 8}}
         ghost={ghost}
         {...oProps}
       >
         {children}
-      </Button>
+      </HJBtn>
     </Input.Group>
   );
 };

package/src/components/Input/InputNumberGroup.tsx

@@ -80,11 +80,11 @@ const InputNumberGroup = ({
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         const { min: minKey, max: maxKey } = valueMap;
-        const cuValue = initValue[(valueName as string)];
+        const cuValue = initValue[valueName as string];
         const minInitVal = initValue[minKey];
         const maxInitVal = initValue[maxKey];
         return {
-          [(valueName as string)]: {
+          [valueName as string]: {
             [min]: minInitVal,
             [max]: maxInitVal,
             ...cuValue,
@@ -93,7 +93,7 @@ const InputNumberGroup = ({
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [(valueName as string)]: itemVal = {} } = outputValue;
+        const { [valueName as string]: itemVal = {} } = outputValue;
         const { min: minKey, max: maxKey } = valueMap;
         const {
           [minKey]: minSubVal,
@@ -103,7 +103,7 @@ const InputNumberGroup = ({
         return {
           [maxKey]: maxSubVal,
           [minKey]: minSubVal,
-          [(valueName as string)]: oItemVal,
+          [valueName as string]: oItemVal,
         };
       },
     },

package/src/components/Input/SelectInput.tsx

@@ -37,13 +37,14 @@ export const Index = ({
         Object.values(valueName).forEach((key) => {
           resultObj[key] = initValue[key];
         });
+        console.log(item, valueName);
         return {
-          [(name as string)]: resultObj,
+          [name as string]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [(name as string)]: itemVal = {} } = outputValue;
+        const { [name as string]: itemVal = {} } = outputValue;
         const newItemVal = { [itemVal[select]]: itemVal[input] };
         return {
           ...newItemVal,

package/src/components/Input/TrimInput.tsx

@@ -8,14 +8,14 @@ const Index = ({ addFormat, ...props }: HInputProps) => {
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         return {
-          [(valueName as string)]: initValue[(valueName as string)],
+          [valueName as string]: initValue[valueName as string],
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [(name as string)]: itemVal } = outputValue;
+        const { [name as string]: itemVal } = outputValue;
         return {
-          [(name as string)]: itemVal?.trim(),
+          [name as string]: itemVal?.trim(),
         };
       },
     },

package/src/components/Input/index.less

@@ -70,4 +70,4 @@
     border-color: #ff4d4f !important;
     box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
   }
-}
+}

package/src/components/Input/modal.ts

@@ -37,5 +37,5 @@ export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
 export interface HButtonInputProps extends HInputProps {
   buttonProps?: HButtonProps;
   request?: PromiseFnResult;
-  layType?:"group"|"text";
+  layType?: "group" | "text";
 }

package/src/components/PageHandler/ErrorComponent.tsx

@@ -1,6 +1,7 @@
-import { Button, Row, Space, Typography } from "antd";
+import { Row, Space, Typography } from "antd";
 import { ExclamationCircleOutlined } from "@ant-design/icons";
 import type { IHPageHandler } from "./modal";
+import {HJBtn} from "@hw-component/hj";
 
 const { Text } = Typography;
 export default ({ error, reload }: IHPageHandler) => {
@@ -11,9 +12,9 @@ export default ({ error, reload }: IHPageHandler) => {
           <ExclamationCircleOutlined size={24} />
         </Text>
         <Text type={"danger"}>{error?.message}</Text>
-        <Button type="primary" size={"small"} onClick={reload}>
+        <HJBtn type="primary" size={"small"} onClick={reload}>
           重新加载
-        </Button>
+        </HJBtn>
       </Space>
     </Row>
   );

package/src/components/PageHandler/index.tsx

@@ -3,7 +3,6 @@ import Loading from "./LoadingComponent";
 import ErrorComponent from "./ErrorComponent";
 import type { IHPageHandler } from "./modal";
 const Index: React.FC<IHPageHandler> = ({ error, data, reload, children }) => {
-
   if (error) {
     return <ErrorComponent error={error} reload={reload} />;
   }

package/src/components/PageHandler/modal.ts

@@ -3,5 +3,5 @@ export interface IHPageHandler<T = any> {
   error?: Error;
   reload: VoidFunction;
   data?: T;
-  loadingHideInData?:boolean;
+  loadingHideInData?: boolean;
 }