@hw-component/form 1.9.61 → 1.9.63

package/es/InputGroup/index.js

@@ -6,7 +6,7 @@ import React from 'react';
 import { useClassName } from '../hooks/index.js';
 import { Input } from 'antd';
 
-var _excluded = ["addonAfter", "addonBefore", "children", "value", "onChange"];
+var _excluded = ["addonAfter", "addonBefore", "children", "value", "className", "onChange"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Addon = function Addon(_ref) {
@@ -36,13 +36,15 @@ var Index = function Index(_ref2) {
     addonBefore = _ref2.addonBefore,
     children = _ref2.children,
     value = _ref2.value,
+    _ref2$className = _ref2.className,
+    className = _ref2$className === void 0 ? "" : _ref2$className,
     onChange = _ref2.onChange,
     props = _objectWithoutProperties(_ref2, _excluded);
   var contentClassname = useClassName(["hw-input-group"]);
   var bodyClassname = useClassName(["hw-input-group-body"]);
   return jsxs(Input.Group, {
     compact: true,
-    className: contentClassname,
+    className: "".concat(contentClassname, " ").concat(className),
     children: [jsx(Addon, {
       value: value,
       onChange: onChange,

package/es/Text/index.d.ts

@@ -1,4 +1,4 @@
-import { TextProps } from "antd/lib/typography/Text";
+import type { TextProps } from "antd/lib/typography/Text";
 import React from "react";
 export interface HFormTextProps<V = any> extends TextProps {
     value?: V;

package/es/index.css

@@ -164,12 +164,12 @@
   background-color: #f5f5f5;
 }
 .ant-hw-input-group .ant-hw-input-group-number-body {
-  width: 100%;
-  border: 1px solid #d9d9d9;
   display: -webkit-box !important;
   display: -webkit-flex !important;
   display: -ms-flexbox !important;
   display: flex !important;
+  width: 100%;
+  border: 1px solid #d9d9d9;
 }
 .ant-hw-input-group .ant-hw-input-group-not-disabled:hover {
   border-color: #40a9ff;

package/lib/DialogForm/hooks.js

@@ -88,6 +88,9 @@ var useModifyProps = function useModifyProps(_ref) {
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
+  dialogForm.getParams = function () {
+    return formParams || {};
+  };
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,
@@ -105,7 +108,10 @@ var useHDialogForm = function useHDialogForm() {
   return React.useMemo(function () {
     return _objectSpread(_objectSpread({}, hForm), {}, {
       show: function show(params) {},
-      hide: function hide() {}
+      hide: function hide() {},
+      getParams: function getParams() {
+        return {};
+      }
     });
   }, []);
 };

package/lib/DialogForm/modal.d.ts

@@ -25,6 +25,7 @@ export interface ShowParamsModal<P = any, T = any> {
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
+    getParams: () => Record<string, any>;
 }
 export type FooterRender = (dialogForm?: HDialogFormInstance, loading?: boolean, params?: Record<string, any>) => React.ReactNode;
 export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"> {

package/lib/Form/modal.d.ts

@@ -18,7 +18,7 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
-import { HFormTextProps } from "../Text";
+import type { HFormTextProps } from "../Text";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps | HFormTextProps;
 export interface HoverModal {

package/lib/Input/InputNumberGroup.js

@@ -38,14 +38,12 @@ var Content = function Content(_ref) {
     _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? ["请输入", "请输入"] : _ref$placeholder,
     _ref$inputNumberProps = _ref.inputNumberProps,
-    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps;
-    _ref.addonAfter;
-    var _ref$noHandlerWrap = _ref.noHandlerWrap,
+    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps,
+    _ref$noHandlerWrap = _ref.noHandlerWrap,
     noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
     addFormat = _ref.addFormat,
-    disabled = _ref.disabled;
-    _ref.addonBefore;
-    var minValMk = _ref.minValMk,
+    disabled = _ref.disabled,
+    minValMk = _ref.minValMk,
     maxValMk = _ref.maxValMk;
   var min = valueMap.min,
     max = valueMap.max;

package/lib/InputGroup/index.d.ts

@@ -4,6 +4,7 @@ interface HInputGroupProps<T = any> {
     value?: T;
     onChange?: (value: T) => void;
     addonBefore?: React.ReactNode;
+    className?: string;
 }
 declare const Index: React.FC<HInputGroupProps>;
 export default Index;

package/lib/InputGroup/index.js

@@ -9,7 +9,7 @@ var React = require('react');
 var index = require('../hooks/index.js');
 var antd = require('antd');
 
-var _excluded = ["addonAfter", "addonBefore", "children", "value", "onChange"];
+var _excluded = ["addonAfter", "addonBefore", "children", "value", "className", "onChange"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Addon = function Addon(_ref) {
@@ -39,13 +39,15 @@ var Index = function Index(_ref2) {
     addonBefore = _ref2.addonBefore,
     children = _ref2.children,
     value = _ref2.value,
+    _ref2$className = _ref2.className,
+    className = _ref2$className === void 0 ? "" : _ref2$className,
     onChange = _ref2.onChange,
     props = _objectWithoutProperties(_ref2, _excluded);
   var contentClassname = index.useClassName(["hw-input-group"]);
   var bodyClassname = index.useClassName(["hw-input-group-body"]);
   return jsxRuntime.jsxs(antd.Input.Group, {
     compact: true,
-    className: contentClassname,
+    className: "".concat(contentClassname, " ").concat(className),
     children: [jsxRuntime.jsx(Addon, {
       value: value,
       onChange: onChange,

package/lib/Text/index.d.ts

@@ -1,4 +1,4 @@
-import { TextProps } from "antd/lib/typography/Text";
+import type { TextProps } from "antd/lib/typography/Text";
 import React from "react";
 export interface HFormTextProps<V = any> extends TextProps {
     value?: V;

package/lib/index.css

@@ -164,12 +164,12 @@
   background-color: #f5f5f5;
 }
 .ant-hw-input-group .ant-hw-input-group-number-body {
-  width: 100%;
-  border: 1px solid #d9d9d9;
   display: -webkit-box !important;
   display: -webkit-flex !important;
   display: -ms-flexbox !important;
   display: flex !important;
+  width: 100%;
+  border: 1px solid #d9d9d9;
 }
 .ant-hw-input-group .ant-hw-input-group-not-disabled:hover {
   border-color: #40a9ff;

package/package.json

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

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

@@ -46,7 +46,7 @@ const Index: React.FC<DialogFormProps> = ({
     initValue,
     formParams,
     title: modalTitle,
-      saveOldParams
+    saveOldParams,
   } = useModifyProps({
     configData,
     visible,
@@ -99,11 +99,11 @@ const Index: React.FC<DialogFormProps> = ({
       title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
       {...props}
       onClose={cancel}
-      afterVisibleChange={(changeVisible)=>{
-         if (!changeVisible){
-           dialogForm?.clear();
-           afterClose?.();
-         }
+      afterVisibleChange={(changeVisible) => {
+        if (!changeVisible) {
+          dialogForm?.clear();
+          afterClose?.();
+        }
       }}
       closable={false}
       destroyOnClose

package/src/components/DialogForm/hooks.tsx

@@ -28,9 +28,9 @@ export const useModifyProps = ({
       old: {},
     };
   }, []);
-  const saveOldParams=()=>{
+  const saveOldParams = () => {
     saveOldParamsObj.old = dialogForm.outputValues();
-  }
+  };
   useEffect(() => {
     setModalVisible(visible);
   }, [visible]);
@@ -72,6 +72,9 @@ export const useModifyProps = ({
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
+  dialogForm.getParams=()=>{
+    return (formParams as Record<string, any>)||{};
+  }
   return {
     modalFormData,
     modalVisible,
@@ -81,7 +84,7 @@ export const useModifyProps = ({
     setInitValue,
     formParams,
     title: modalTitle,
-    saveOldParams
+    saveOldParams,
   };
 };
 export const useHDialogForm = () => {
@@ -91,6 +94,9 @@ export const useHDialogForm = () => {
       ...hForm,
       show: (params) => {},
       hide: () => {},
+      getParams:()=>{
+        return {}
+      }
     };
   }, []);
 };

package/src/components/DialogForm/modal.ts

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

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

@@ -173,7 +173,7 @@ export default () => {
             });
         });
       },
-      resetFieldsInitValue: (values={}) => {
+      resetFieldsInitValue: (values = {}) => {
         const oldValue = form.getFieldsValue();
         const keys = Object.keys(oldValue);
         const newVale = {};
@@ -183,7 +183,7 @@ export default () => {
         form.setFieldsValue({
           ...newVale,
           ...initSaveValue,
-          ...values
+          ...values,
         });
       },
       clear: () => {

package/src/components/Form/modal.ts

@@ -36,7 +36,7 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
-import { HFormTextProps } from "../Text";
+import type { HFormTextProps } from "../Text";
 
 type RenderFun = (
   props: HItemProps,
@@ -199,7 +199,7 @@ export interface HFormInstance extends FormInstance {
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
   clear: VoidFunction;
-  resetFieldsInitValue:( values?: Record<string, any>)=>void;
+  resetFieldsInitValue: (values?: Record<string, any>) => void;
   clearFormat: (name: string) => void;
 }
 

package/src/components/Input/InputNumberGroup.tsx

@@ -5,7 +5,7 @@ import type { InputNumberProps } from "antd/lib/input-number";
 import { useClassName } from "../hooks";
 import type { addFormatItemModal, HItemProps } from "@/components/Form/modal";
 import HFormConnect from "../Form/HFormConnect";
-import InputGroup from '../InputGroup'
+import InputGroup from "../InputGroup";
 interface IProps<T = any> {
   placeholder?: [string, string] | string;
   addonAfter?: React.ReactNode;
@@ -32,18 +32,15 @@ const useArrayProps = (props: any) => {
   }, [props]);
 };
 
-
 const Content = ({
   value = {},
   valueMap = { min: "min", max: "max" },
   onChange,
   placeholder = ["请输入", "请输入"],
   inputNumberProps = {},
-  addonAfter,
   noHandlerWrap = true,
   addFormat,
   disabled,
-  addonBefore,
   minValMk,
   maxValMk,
 }: IProps) => {
@@ -99,14 +96,15 @@ const Content = ({
     newVal[key] = val;
     onChange?.(newVal);
   };
-  return <div
+  return (
+    <div
       className={`${bodyClassname} 
         ${focus ? activeClassname : ""} 
         ${noHandlerWrap ? noHandlerWrapClassname : ""}
          ${disabled ? disabledClassname : notDisabledClassname}
         `}
-  >
-    <InputNumber<number>
+    >
+      <InputNumber<number>
         bordered={false}
         value={minVal}
         max={maxValMk ? maxValMk(maxVal) : maxVal}
@@ -124,11 +122,11 @@ const Content = ({
         placeholder={fsPlaceholder}
         {...fsProps}
         disabled={disabled}
-    />
-    <div className={iconClassname}>
-      <SwapRightOutlined />
-    </div>
-    <InputNumber<number>
+      />
+      <div className={iconClassname}>
+        <SwapRightOutlined />
+      </div>
+      <InputNumber<number>
         bordered={false}
         value={maxVal}
         className={oneClassname}
@@ -145,15 +143,17 @@ const Content = ({
         }}
         {...edProps}
         disabled={disabled}
-    />
-  </div>
-
+      />
+    </div>
+  );
+};
+const InputNumberGroup = (props) => {
+  return (
+    <InputGroup {...props}>
+      <Content />
+    </InputGroup>
+  );
 };
-const InputNumberGroup=(props)=>{
-  return <InputGroup {...props}>
-      <Content/>
-  </InputGroup>
-}
 
 const Index = HFormConnect(InputNumberGroup);
 export default {

package/src/components/Input/index.less

@@ -4,10 +4,10 @@
   .@{all-input-group}-disabled {
     background-color: #f5f5f5;
   }
-  .@{all-input-group}-number-body{
+  .@{all-input-group}-number-body {
+    display: flex !important;
     width: 100%;
     border: 1px solid #d9d9d9;
-    display: flex !important;
   }
   .@{all-input-group}-not-disabled {
     &:hover {

package/src/components/InputGroup/index.less

@@ -23,4 +23,4 @@
   .@{all-input-group}-body {
     border-color: #ff4d4f !important;
   }
-}
+}

package/src/components/InputGroup/index.tsx

@@ -1,42 +1,53 @@
 import React from "react";
-import {useClassName} from "../hooks";
-import {Input} from "antd"
-interface HInputGroupProps<T=any> {
-    addonAfter?: React.ReactNode;
-    value?: T;
-    onChange?: (value: T) => void;
-    addonBefore?: React.ReactNode;
+import { useClassName } from "../hooks";
+import { Input } from "antd";
+interface HInputGroupProps<T = any> {
+  addonAfter?: React.ReactNode;
+  value?: T;
+  onChange?: (value: T) => void;
+  addonBefore?: React.ReactNode;
+  className?:string;
 }
 const Addon: React.FC<HInputGroupProps> = ({ children, value, onChange }) => {
-    const addonClassname = useClassName(["hw-addon"]);
-    if (!children) {
-        return <></>;
-    }
-    if (React.isValidElement(children)) {
-        return (
-            <div className={addonClassname}>
-                {React.cloneElement(children as any, { value, onChange })}
-            </div>
-        );
-    }
-    return <div className={addonClassname}>{children}</div>;
+  const addonClassname = useClassName(["hw-addon"]);
+  if (!children) {
+    return <></>;
+  }
+  if (React.isValidElement(children)) {
+    return (
+      <div className={addonClassname}>
+        {React.cloneElement(children as any, { value, onChange })}
+      </div>
+    );
+  }
+  return <div className={addonClassname}>{children}</div>;
 };
 
-const Index:React.FC<HInputGroupProps>=({addonAfter,addonBefore,children,value,onChange,...props})=>{
-    const contentClassname = useClassName(["hw-input-group"]);
-    const bodyClassname = useClassName(["hw-input-group-body"]);
+const Index: React.FC<HInputGroupProps> = ({
+  addonAfter,
+  addonBefore,
+  children,
+  value,
+                                             className="",
+  onChange,
+  ...props
+}) => {
+  const contentClassname = useClassName(["hw-input-group"]);
+  const bodyClassname = useClassName(["hw-input-group-body"]);
 
-    return <Input.Group compact className={contentClassname}>
-        <Addon value={value} onChange={onChange}>
-            {addonBefore}
-        </Addon>
-       <div className={bodyClassname}>
-           {React.cloneElement((children as any),{value,onChange,...props})}
-       </div>
-        <Addon value={value} onChange={onChange}>
-            {addonAfter}
-        </Addon>
+  return (
+    <Input.Group compact className={`${contentClassname} ${className}`}>
+      <Addon value={value} onChange={onChange}>
+        {addonBefore}
+      </Addon>
+      <div className={bodyClassname}>
+        {React.cloneElement(children as any, { value, onChange, ...props })}
+      </div>
+      <Addon value={value} onChange={onChange}>
+        {addonAfter}
+      </Addon>
     </Input.Group>
-}
+  );
+};
 
-export default Index;
+export default Index;

package/src/components/Text/index.tsx

@@ -1,7 +1,7 @@
 import { Space, Typography } from "antd";
-import { TextProps } from "antd/lib/typography/Text";
+import type { TextProps } from "antd/lib/typography/Text";
 import React, { useMemo } from "react";
-const {Text}=Typography;
+const { Text } = Typography;
 export interface HFormTextProps<V = any> extends TextProps {
   value?: V;
   addonBefore?: React.ReactNode;
@@ -21,9 +21,11 @@ export default ({
     }
     return value;
   }, [value]);
-  return <Space size={size} align={"center"}>
-     <Text {...props}>{addonBefore}</Text>
-    <Text {...props}>{text}</Text>
-    <Text {...props}>{addonAfter}</Text>
-  </Space>
+  return (
+    <Space size={size} align={"center"}>
+      <Text {...props}>{addonBefore}</Text>
+      <Text {...props}>{text}</Text>
+      <Text {...props}>{addonAfter}</Text>
+    </Space>
+  );
 };

package/src/components/TextArea/index.less

@@ -1,8 +1,8 @@
 @import "../styles/local.less";
 
-.@{ant-prefix}-hw-text-area-no-border{
-   border: none !important;
-   &:focus{
-     box-shadow: none !important;
-   }
-}
+.@{ant-prefix}-hw-text-area-no-border {
+  border: none !important;
+  &:focus {
+    box-shadow: none !important;
+  }
+}

package/src/components/TextArea/index.tsx

@@ -1,17 +1,23 @@
 import { Input } from "antd";
 import type { TextAreaProps } from "antd/es/input";
-import {useClassName} from "../hooks";
-export interface HTextAreaProps extends TextAreaProps{
-   bordered?:boolean;
+import { useClassName } from "../hooks";
+export interface HTextAreaProps extends TextAreaProps {
+  bordered?: boolean;
 }
 
 export default ({
   autoSize = { minRows: 4, maxRows: 4 },
-                  bordered=true,
-    className="",
+  bordered = true,
+  className = "",
   ...props
 }: HTextAreaProps) => {
-  const noBorderClassName=useClassName("hw-text-area-no-border") ;
-  const borderClassName=!bordered?noBorderClassName:"";
-  return <Input.TextArea autoSize={autoSize} {...props} className={`${borderClassName} ${className}`}/>;
+  const noBorderClassName = useClassName("hw-text-area-no-border");
+  const borderClassName = !bordered ? noBorderClassName : "";
+  return (
+    <Input.TextArea
+      autoSize={autoSize}
+      {...props}
+      className={`${borderClassName} ${className}`}
+    />
+  );
 };

package/src/pages/DrawerForm/index.tsx

@@ -78,9 +78,15 @@ export default () => {
           console.log("contentRender");
           return <div>{node}</div>;
         }}
-        title={<div onClick={()=>{
-            modalForm.hide()
-        }}>关闭</div>}
+        title={
+          <div
+            onClick={() => {
+              modalForm.hide();
+            }}
+          >
+            关闭
+          </div>
+        }
       >
         <Test1 />
       </HDrawerForm>

package/src/pages/Form/index.tsx

@@ -117,7 +117,7 @@ export default () => {
                         height: "100%",
                       }}
                     >
-                      <div style={{ height: 200 }}></div>
+                      <div style={{ height: 200 }} />
                     </div>
                   );
                 },
@@ -133,14 +133,15 @@ export default () => {
                         backgroundColor: "black",
                         height: "100%",
                       }}
-                    ></div>
+                    />
                   );
                 },
-              },{
-                label:"数字输入框",
-                name:"yyy",
-                type:"inputNumberGroup",
-                rules:[{required:true}]
+              },
+              {
+                label: "数字输入框",
+                name: "yyy",
+                type: "inputNumberGroup",
+                rules: [{ required: true }],
               },
               {
                 label: "文字",
@@ -163,7 +164,7 @@ export default () => {
             ]}
             dismissOnPressEnter={false}
             formItemStyle={{
-              marginBottom:100
+              marginBottom: 100,
             }}
             labelWidth={88}
             form={form}

package/src/pages/Input/index.tsx

@@ -6,7 +6,7 @@ import {
   HColorInput,
   HVerificationCodeInput,
   HInputNumberGroup,
-    HTextArea,
+  HTextArea,
 } from "../../components";
 import { Space } from "antd";
 import { useState } from "react";
@@ -37,7 +37,7 @@ export default () => {
           },
         ]}
       />
-        <HTextArea />
+      <HTextArea />
     </Space>
   );
 };