@hw-component/form 0.0.3-beta-v2 → 0.0.3-beta-v4

package/es/Form/hooks/useInitConfigData.js

@@ -1,5 +1,4 @@
 // welcome to hoo hoo hoo
-import React, { useMemo } from 'react';
 import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
@@ -13,6 +12,7 @@ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWitho
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js/instance/index-of';
+import React, { useMemo } from 'react';
 import FormConfig, { placeholderConfig } from '../config.js';
 
 var _excluded = ["render", "type", "itemProps"],
@@ -83,7 +83,10 @@ var defaultRenderMaker = function defaultRenderMaker(props) {
       form: form
     }));
     if (render) {
-      return render(props, node, form);
+      var resultNode = render(props, node, form);
+      return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), {}, {
+        form: form
+      }));
     }
     return node;
   };

package/es/Form/modal.d.ts

@@ -13,7 +13,7 @@ import type { SelectProps } from "antd";
 import type { RangePickerProps } from "antd/es/date-picker";
 import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
 import type { ForwardedRef } from "react";
-type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => void;
+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;
 export interface HoverModal {
     text?: string;

package/es/index.d.ts

@@ -3,6 +3,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 { default as HFormConnect } from "./Form/HFormConnect";
 export declare const HSelect: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: import("./Select/modal").HSelectProps) => JSX.Element;
 export declare const HInput: ({ ...props }: import("antd").InputProps) => JSX.Element;
 export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
@@ -20,5 +21,5 @@ export declare const HInputNumber: ({ style, ...props }: import("antd").InputNum
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HFormConfigProvider: import("react").FC<import("./Form/modal").IFormConfigContextProps>;
 export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
-export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;

package/es/index.js

@@ -4,6 +4,7 @@ import Index from './PageHandler/index.js';
 export { default as HForm } from './Form/index.js';
 export { default as useHForm } from './Form/hooks/useHForm.js';
 export { useHDialogForm } from './DialogForm/hooks.js';
+export { default as HFormConnect } from './Form/HFormConnect.js';
 import ModalForm from './DialogForm/ModalForm.js';
 import DrawerForm from './DialogForm/DrawerForm/index.js';
 

package/lib/Form/hooks/useInitConfigData.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
@@ -16,6 +15,7 @@ var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWit
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
+var React = require('react');
 var config = require('../config.js');
 
 var _excluded = ["render", "type", "itemProps"],
@@ -86,7 +86,10 @@ var defaultRenderMaker = function defaultRenderMaker(props) {
       form: form
     }));
     if (render) {
-      return render(props, node, form);
+      var resultNode = render(props, node, form);
+      return /*#__PURE__*/React.cloneElement(resultNode, _objectSpread(_objectSpread(_objectSpread({}, componentProps), itemProps), {}, {
+        form: form
+      }));
     }
     return node;
   };

package/lib/Form/modal.d.ts

@@ -13,7 +13,7 @@ import type { SelectProps } from "antd";
 import type { RangePickerProps } from "antd/es/date-picker";
 import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
 import type { ForwardedRef } from "react";
-type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => void;
+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;
 export interface HoverModal {
     text?: string;

package/lib/index.d.ts

@@ -3,6 +3,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 { default as HFormConnect } from "./Form/HFormConnect";
 export declare const HSelect: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: import("./Select/modal").HSelectProps) => JSX.Element;
 export declare const HInput: ({ ...props }: import("antd").InputProps) => JSX.Element;
 export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
@@ -20,5 +21,5 @@ export declare const HInputNumber: ({ style, ...props }: import("antd").InputNum
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HFormConfigProvider: import("react").FC<import("./Form/modal").IFormConfigContextProps>;
 export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
-export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;

package/lib/index.js

@@ -5,6 +5,7 @@ var index$1 = require('./PageHandler/index.js');
 var index = require('./Form/index.js');
 var useHForm = require('./Form/hooks/useHForm.js');
 var hooks = require('./DialogForm/hooks.js');
+var HFormConnect = require('./Form/HFormConnect.js');
 var ModalForm = require('./DialogForm/ModalForm.js');
 var index$2 = require('./DialogForm/DrawerForm/index.js');
 
@@ -31,6 +32,7 @@ var HDrawerForm = index$2.default;
 exports.HForm = index.default;
 exports.useHForm = useHForm.default;
 exports.useHDialogForm = hooks.useHDialogForm;
+exports.HFormConnect = HFormConnect.default;
 exports.HButtonInput = HButtonInput;
 exports.HCheckBox = HCheckBox;
 exports.HCheckboxGroup = HCheckboxGroup;

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import React, { useMemo } from "react";
 import type {
   FormItemWithRender,
   HFormItemProps,
@@ -62,7 +62,8 @@ const defaultRenderMaker = (props: HFormItemProps) => {
       <Component {...componentProps} {...itemProps} form={form} />
     );
     if (render) {
-      return render(props, node, form);
+      const resultNode=render(props, node, form);
+      return React.cloneElement<any>((resultNode as any),{...componentProps,...itemProps,form})
     }
     return node;
   };

package/src/components/Form/modal.ts

@@ -30,7 +30,7 @@ type RenderFun = (
   props: HItemProps,
   node: React.ReactNode,
   form: FormInstance
-) => void;
+) => React.ReactNode;
 type ItemPropsType =
   | HCheckboxProps
   | HInputProps

package/src/components/index.tsx

@@ -4,6 +4,8 @@ import PageHandler from "./PageHandler";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
 export { useHDialogForm } from "./DialogForm/hooks";
+export { default as HFormConnect } from "./Form/HFormConnect";
+
 import ModalForm from "./DialogForm/ModalForm";
 import DrawerForm from "./DialogForm/DrawerForm";
 export const HSelect = FormConfig.select;