@hw-component/form 1.6.7 → 1.6.9

package/es/DialogForm/ChildComponent.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+import { HDialogFormInstance } from "@/components/DialogForm/modal";
+interface IProps<P = any> {
+    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance, params: P) => React.ReactNode;
+    dialogForm: HDialogFormInstance;
+    params: P;
+    formNode: React.ReactNode;
+}
+declare const Index: React.FC<IProps>;
+export default Index;

package/es/DialogForm/ChildComponent.js

@@ -0,0 +1,22 @@
+// welcome to hoo hoo hoo
+import { jsx, Fragment } from 'react/jsx-runtime';
+import React from 'react';
+
+var Index = function Index(_ref) {
+  var contentRender = _ref.contentRender,
+    formNode = _ref.formNode,
+    params = _ref.params,
+    dialogForm = _ref.dialogForm,
+    children = _ref.children;
+  var cuNode = children ? /*#__PURE__*/React.cloneElement(children, {
+    dialogForm: dialogForm,
+    params: params,
+    formNode: formNode
+  }) : formNode;
+  return jsx(Fragment, {
+    children: contentRender ? contentRender(cuNode, dialogForm, params) : cuNode
+  });
+};
+
+export { Index as default };
+// powered by hdj

package/es/DialogForm/DrawerForm/index.d.ts

@@ -1,3 +1,4 @@
 import type { DialogFormProps } from "../modal";
-declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, autoClear, contentRender, ...props }: DialogFormProps) => JSX.Element;
-export default _default;
+import React from "react";
+declare const Index: React.FC<DialogFormProps>;
+export default Index;

package/es/DialogForm/DrawerForm/index.js

@@ -16,12 +16,13 @@ import { useCurrentForm, useModifyProps, useSub } from '../hooks.js';
 import HForm from '../../Form/index.js';
 import Title from './Title.js';
 import Footer from './Footer.js';
-import Index, { useFormConfigContext } from '../../Form/Context/FormConfigProvider.js';
+import Index$1, { useFormConfigContext } from '../../Form/Context/FormConfigProvider.js';
+import Index$2 from '../ChildComponent.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var DrawerForm = (function (_ref) {
+var Index = function Index(_ref) {
   var visible = _ref.visible,
     title = _ref.title,
     onCancel = _ref.onCancel,
@@ -44,6 +45,7 @@ var DrawerForm = (function (_ref) {
     _ref$autoClear = _ref.autoClear,
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = useCurrentForm(dialogForm);
   var providerConfig = useFormConfigContext();
@@ -82,6 +84,9 @@ var DrawerForm = (function (_ref) {
     if (footer === null) {
       return null;
     }
+    if (typeof footer === "function") {
+      return footer(dialogForm, loading, formParams);
+    }
     return footer || jsx(Footer, {
       onCancel: cancel,
       onOk: currentForm.submit,
@@ -139,11 +144,17 @@ var DrawerForm = (function (_ref) {
     closable: false,
     destroyOnClose: true,
     footer: footerComponent(),
-    children: jsx(Index, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender(node, currentForm, params) : node
+    children: jsx(Index$1, _objectSpread(_objectSpread({}, providerConfig), {}, {
+      children: jsx(Index$2, {
+        dialogForm: currentForm,
+        contentRender: contentRender,
+        params: params,
+        formNode: node,
+        children: children
+      })
     }))
   }));
-});
+};
 
-export { DrawerForm as default };
+export { Index as default };
 // powered by hdj

package/es/DialogForm/ModalForm.d.ts

@@ -1,3 +1,4 @@
 import type { DialogFormProps } from "./modal";
-declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, footer, ...props }: DialogFormProps) => JSX.Element;
-export default _default;
+import React from "react";
+declare const Index: React.FC<DialogFormProps>;
+export default Index;

package/es/DialogForm/ModalForm.js

@@ -13,13 +13,14 @@ import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx } from 'react/jsx-runtime';
 import { Modal } from 'antd';
 import HForm from '../Form/index.js';
-import Index, { useFormConfigContext } from '../Form/Context/FormConfigProvider.js';
+import Index$1, { useFormConfigContext } from '../Form/Context/FormConfigProvider.js';
 import { useCurrentForm, useModifyProps, useSub, useFooterRender } from './hooks.js';
+import Index$2 from './ChildComponent.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var ModalForm = (function (_ref) {
+var Index = function Index(_ref) {
   var visible = _ref.visible,
     title = _ref.title,
     onCancel = _ref.onCancel,
@@ -37,6 +38,7 @@ var ModalForm = (function (_ref) {
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
     footer = _ref.footer,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = useCurrentForm(dialogForm);
   var providerConfig = useFormConfigContext();
@@ -126,11 +128,17 @@ var ModalForm = (function (_ref) {
     onOk: currentForm.submit,
     destroyOnClose: true,
     footer: defaultFooter,
-    children: jsx(Index, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm, formParams) : node
+    children: jsx(Index$1, _objectSpread(_objectSpread({}, providerConfig), {}, {
+      children: jsx(Index$2, {
+        dialogForm: currentForm,
+        contentRender: contentRender,
+        formNode: node,
+        params: params,
+        children: children
+      })
     }))
   }));
-});
+};
 
-export { ModalForm as default };
+export { Index as default };
 // powered by hdj

package/es/Form/FormItem/index.js

@@ -22,6 +22,7 @@ var Item = (function (props) {
     _props$labelAlign = props.labelAlign,
     labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign;
   var Component = useFormItemDomControl(props);
+  console.log(formLabelWidth, "formLabelWidth");
   return jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
     labelAlign: labelAlign,
     labelWidth: labelWidth

package/es/index.d.ts

@@ -22,8 +22,8 @@ export declare const HInputNumber: ({ style, ...props }: import("antd").InputNum
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
 export declare const HColorInput: ({ value, onChange, defaultColor, ...props }: import("./Input/modal").HInputProps<any>) => JSX.Element;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, footer, ...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, onValuesChange, autoClear, contentRender, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HModalForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;
+export declare const HDrawerForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;
 export declare const HCascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("./Cascader").HCascaderProps) => JSX.Element;
 export declare const HVerificationCodeInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HTrimInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;

package/es/index.js

@@ -6,8 +6,8 @@ export { default as useHForm } from './Form/hooks/useHForm.js';
 export { useHDialogForm } from './DialogForm/hooks.js';
 export { default as HFormConnect } from './Form/HFormConnect.js';
 export { default as HFormConfigProvider } from './Form/Context/FormConfigProvider.js';
-import ModalForm from './DialogForm/ModalForm.js';
-import DrawerForm from './DialogForm/DrawerForm/index.js';
+import Index$1 from './DialogForm/ModalForm.js';
+import Index$2 from './DialogForm/DrawerForm/index.js';
 
 var HSelect = componentConfig.select;
 var HInput = componentConfig.input;
@@ -26,8 +26,8 @@ var HInputNumber = componentConfig.inputNumber;
 var HPageHandler = Index;
 var HTextArea = componentConfig.textArea;
 var HColorInput = componentConfig.colorInput;
-var HModalForm = ModalForm;
-var HDrawerForm = DrawerForm;
+var HModalForm = Index$1;
+var HDrawerForm = Index$2;
 var HCascader = componentConfig.cascader;
 var HVerificationCodeInput = componentConfig.verificationCodeInput;
 var HTrimInput = componentConfig.trimInput;

package/lib/DialogForm/ChildComponent.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+import { HDialogFormInstance } from "@/components/DialogForm/modal";
+interface IProps<P = any> {
+    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance, params: P) => React.ReactNode;
+    dialogForm: HDialogFormInstance;
+    params: P;
+    formNode: React.ReactNode;
+}
+declare const Index: React.FC<IProps>;
+export default Index;

package/lib/DialogForm/ChildComponent.js

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
+
+var Index = function Index(_ref) {
+  var contentRender = _ref.contentRender,
+    formNode = _ref.formNode,
+    params = _ref.params,
+    dialogForm = _ref.dialogForm,
+    children = _ref.children;
+  var cuNode = children ? /*#__PURE__*/React.cloneElement(children, {
+    dialogForm: dialogForm,
+    params: params,
+    formNode: formNode
+  }) : formNode;
+  return jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: contentRender ? contentRender(cuNode, dialogForm, params) : cuNode
+  });
+};
+
+exports.default = Index;
+// powered by h

package/lib/DialogForm/DrawerForm/index.d.ts

@@ -1,3 +1,4 @@
 import type { DialogFormProps } from "../modal";
-declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, autoClear, contentRender, ...props }: DialogFormProps) => JSX.Element;
-export default _default;
+import React from "react";
+declare const Index: React.FC<DialogFormProps>;
+export default Index;

package/lib/DialogForm/DrawerForm/index.js

@@ -20,11 +20,12 @@ var index = require('../../Form/index.js');
 var Title = require('./Title.js');
 var Footer = require('./Footer.js');
 var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
+var ChildComponent = require('../ChildComponent.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var DrawerForm = (function (_ref) {
+var Index = function Index(_ref) {
   var visible = _ref.visible,
     title = _ref.title,
     onCancel = _ref.onCancel,
@@ -47,6 +48,7 @@ var DrawerForm = (function (_ref) {
     _ref$autoClear = _ref.autoClear,
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var providerConfig = FormConfigProvider.useFormConfigContext();
@@ -85,6 +87,9 @@ var DrawerForm = (function (_ref) {
     if (footer === null) {
       return null;
     }
+    if (typeof footer === "function") {
+      return footer(dialogForm, loading, formParams);
+    }
     return footer || jsxRuntime.jsx(Footer.default, {
       onCancel: cancel,
       onOk: currentForm.submit,
@@ -143,10 +148,16 @@ var DrawerForm = (function (_ref) {
     destroyOnClose: true,
     footer: footerComponent(),
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender(node, currentForm, params) : node
+      children: jsxRuntime.jsx(ChildComponent.default, {
+        dialogForm: currentForm,
+        contentRender: contentRender,
+        params: params,
+        formNode: node,
+        children: children
+      })
     }))
   }));
-});
+};
 
-exports.default = DrawerForm;
+exports.default = Index;
 // powered by h

package/lib/DialogForm/ModalForm.d.ts

@@ -1,3 +1,4 @@
 import type { DialogFormProps } from "./modal";
-declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, footer, ...props }: DialogFormProps) => JSX.Element;
-export default _default;
+import React from "react";
+declare const Index: React.FC<DialogFormProps>;
+export default Index;

package/lib/DialogForm/ModalForm.js

@@ -18,11 +18,12 @@ var antd = require('antd');
 var index = require('../Form/index.js');
 var FormConfigProvider = require('../Form/Context/FormConfigProvider.js');
 var hooks = require('./hooks.js');
+var ChildComponent = require('./ChildComponent.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var ModalForm = (function (_ref) {
+var Index = function Index(_ref) {
   var visible = _ref.visible,
     title = _ref.title,
     onCancel = _ref.onCancel,
@@ -40,6 +41,7 @@ var ModalForm = (function (_ref) {
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
     footer = _ref.footer,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var providerConfig = FormConfigProvider.useFormConfigContext();
@@ -130,10 +132,16 @@ var ModalForm = (function (_ref) {
     destroyOnClose: true,
     footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm, formParams) : node
+      children: jsxRuntime.jsx(ChildComponent.default, {
+        dialogForm: currentForm,
+        contentRender: contentRender,
+        formNode: node,
+        params: params,
+        children: children
+      })
     }))
   }));
-});
+};
 
-exports.default = ModalForm;
+exports.default = Index;
 // powered by h

package/lib/Form/FormItem/index.js

@@ -25,6 +25,7 @@ var Item = (function (props) {
     _props$labelAlign = props.labelAlign,
     labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign;
   var Component = hooks.useFormItemDomControl(props);
+  console.log(formLabelWidth, "formLabelWidth");
   return jsxRuntime.jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
     labelAlign: labelAlign,
     labelWidth: labelWidth

package/lib/index.d.ts

@@ -22,8 +22,8 @@ export declare const HInputNumber: ({ style, ...props }: import("antd").InputNum
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
 export declare const HColorInput: ({ value, onChange, defaultColor, ...props }: import("./Input/modal").HInputProps<any>) => JSX.Element;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, footer, ...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, onValuesChange, autoClear, contentRender, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HModalForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;
+export declare const HDrawerForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;
 export declare const HCascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("./Cascader").HCascaderProps) => JSX.Element;
 export declare const HVerificationCodeInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HTrimInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;

package/package.json

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

package/src/components/DialogForm/ChildComponent.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import {HDialogFormInstance} from "@/components/DialogForm/modal";
+
+interface IProps<P=any> {
+    contentRender?: (
+        dom: React.ReactNode,
+        form: HDialogFormInstance,
+        params: P
+    ) => React.ReactNode;
+    dialogForm:HDialogFormInstance;
+    params:P;
+    formNode:React.ReactNode
+}
+const Index:React.FC<IProps>=({contentRender,formNode,params,dialogForm,children})=>{
+    const cuNode=children?React.cloneElement((children as any),{dialogForm,params,formNode}):formNode;
+    return  <>{contentRender?contentRender(cuNode,dialogForm,params):cuNode}</>;
+}
+
+
+export default Index;

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

@@ -7,29 +7,32 @@ import Footer from "./Footer";
 import FormConfigProvider, {
   useFormConfigContext,
 } from "../../Form/Context/FormConfigProvider";
-export default ({
-  visible,
-  title,
-  onCancel,
-  configData,
-  infoRequest,
-  request,
-  afterClose,
-  dialogForm,
-  closable = true,
-  initialValues,
-  labelWidth,
-  onOk,
-  onFinish,
-  size,
-  form,
-  footer,
-  params,
-  onValuesChange,
-  autoClear = true,
-  contentRender,
-  ...props
-}: DialogFormProps) => {
+import React from "react";
+import ChildComponent from '../ChildComponent'
+const Index:React.FC<DialogFormProps>=({
+               visible,
+               title,
+               onCancel,
+               configData,
+               infoRequest,
+               request,
+               afterClose,
+               dialogForm,
+               closable = true,
+               initialValues,
+               labelWidth,
+               onOk,
+               onFinish,
+               size,
+               form,
+               footer,
+               params,
+               onValuesChange,
+               autoClear = true,
+               contentRender,
+    children,
+               ...props
+             }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
   const providerConfig = useFormConfigContext();
   const {
@@ -63,49 +66,60 @@ export default ({
     if (footer === null) {
       return null;
     }
+    if (typeof footer==="function"){
+        return  footer(dialogForm,loading,formParams)
+    }
     return (
-      footer || (
-        <Footer
-          onCancel={cancel}
-          onOk={currentForm.submit}
-          confirmLoading={loading}
-        />
-      )
+        footer || (
+            <Footer
+                onCancel={cancel}
+                onOk={currentForm.submit}
+                confirmLoading={loading}
+            />
+        )
     );
   };
   const node = (
-    <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}
-    />
+      <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}
+      />
   );
   return (
-    <Drawer
-      visible={modalVisible}
-      title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
-      {...props}
-      onClose={cancel}
-      closable={false}
-      destroyOnClose={true}
-      footer={footerComponent()}
-    >
-      <FormConfigProvider {...providerConfig}>
-        {contentRender ? contentRender(node, currentForm, params) : node}
-      </FormConfigProvider>
-    </Drawer>
+      <Drawer
+          visible={modalVisible}
+          title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
+          {...props}
+          onClose={cancel}
+          closable={false}
+          destroyOnClose={true}
+          footer={footerComponent()}
+      >
+        <FormConfigProvider {...providerConfig}>
+          <ChildComponent dialogForm={currentForm}
+                          contentRender={contentRender}
+                          params={params}
+                          formNode={node}
+          >
+            {children}
+          </ChildComponent>
+        </FormConfigProvider>
+      </Drawer>
   );
 };
+
+export default Index;

package/src/components/DialogForm/ModalForm.tsx

@@ -10,27 +10,31 @@ import {
   useModifyProps,
   useSub,
 } from "./hooks";
-export default ({
-  visible,
-  title,
-  onCancel,
-  configData,
-  infoRequest,
-  request,
-  afterClose,
-  dialogForm,
-  initialValues,
-  onFinish,
-  params,
-  onOk,
-  onValuesChange,
-  autoClear = true,
-  contentRender,
-  footer,
-  ...props
-}: DialogFormProps) => {
+import ChildComponent from './ChildComponent'
+import React from "react";
+const Index:React.FC<DialogFormProps>= ({
+                visible,
+                title,
+                onCancel,
+                configData,
+                infoRequest,
+                request,
+                afterClose,
+                dialogForm,
+                initialValues,
+                onFinish,
+                params,
+                onOk,
+                onValuesChange,
+                autoClear = true,
+                contentRender,
+                footer,
+    children,
+                ...props
+              }) => {
   const currentForm = useCurrentForm(dialogForm);
   const providerConfig = useFormConfigContext();
+
   const {
     modalVisible,
     modalFormData,
@@ -55,23 +59,23 @@ export default ({
   };
   const { loading, run } = useSub({ request, onFinish });
   const node = (
-    <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}
-    />
+      <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}
+      />
   );
   const defaultFooter = useFooterRender({
     dialogForm,
@@ -79,27 +83,33 @@ export default ({
     confirmLoading: loading,
     params: formParams,
   });
-
   return (
-    <Modal
-      title={modalTitle}
-      visible={modalVisible}
-      onCancel={cancel}
-      confirmLoading={loading}
-      afterClose={() => {
-        if (autoClear) {
-          currentForm.clear();
-        }
-        afterClose?.();
-      }}
-      {...props}
-      onOk={currentForm.submit}
-      destroyOnClose={true}
-      footer={defaultFooter}
-    >
-      <FormConfigProvider {...providerConfig}>
-        {contentRender ? contentRender?.(node, currentForm, formParams) : node}
-      </FormConfigProvider>
-    </Modal>
+      <Modal
+          title={modalTitle}
+          visible={modalVisible}
+          onCancel={cancel}
+          confirmLoading={loading}
+          afterClose={() => {
+            if (autoClear) {
+              currentForm.clear();
+            }
+            afterClose?.();
+          }}
+          {...props}
+          onOk={currentForm.submit}
+          destroyOnClose={true}
+          footer={defaultFooter}
+      >
+        <FormConfigProvider {...providerConfig}>
+            <ChildComponent dialogForm={currentForm}
+                            contentRender={contentRender}
+                            formNode={node}
+                            params={params}>
+                {children}
+            </ChildComponent>
+        </FormConfigProvider>
+      </Modal>
   );
 };
+
+export default Index;

package/src/components/Form/FormItem/index.tsx

@@ -7,5 +7,6 @@ export default (props: HItemProps) => {
   const {labelWidth:formLabelWidth,labelAlign:formLabelAlign}=useFormContext();
   const {labelWidth=formLabelWidth,labelAlign=formLabelAlign}=props;
   const Component = useFormItemDomControl(props);
+  console.log(formLabelWidth,"formLabelWidth")
   return <Component {...props} labelAlign={labelAlign} labelWidth={labelWidth}/>;
 };

package/src/pages/DrawerForm/index.tsx

@@ -1,61 +1,29 @@
 import { Button } from "antd";
 import { HDrawerForm, useHDialogForm } from "../../components";
 import { MediaTypeEnum } from "../../components/Upload/enums";
+import FormItem from '../../components/Form/FormItem'
+import {useEffect} from "react";
+const Test=()=>{
+  return <FormItem name="123" label="你好"/>
+}
 const data = [
   {
-    label: "选择",
-    name: "checkboxGroup",
-    type: "radioGroup",
-    rules: [{ required: true }],
-    helper: "帮助我",
-    options: [
-      { label: "选择1", value: 0 },
-      { label: "选择2", value: 1 },
-    ],
-  },
-  {
-    label: "选择",
-    name: "select",
-    type: "select",
-    helper: "select",
-    itemProps: {
-      mode: "tags",
-      options: [
-        { label: "选择1", value: 0 },
-        { label: "选择2", value: 1 },
-      ],
-    },
-  },
-  {
-    label: "地址文件",
-    name: "urlUpload",
-    type: "urlUpload",
-    rules: [{ required: true }],
-    hide: (form) => {
-      const check = form.getFieldValue("checkboxGroup");
-      return check !== 0;
-    },
-    itemProps: {
-      style: { width: 368 },
-      placeholder: "粘贴图片地址鼠标移出输入框自动保存",
-      maxSize: 1024 * 1024 * 10,
-      thumbUrl:
-        "http://gips3.baidu.com/it/u=3886271102,3123389489&fm=3028&app=3028&f=JPEG&fmt=auto?w=1280&h=960",
-      mediaType: MediaTypeEnum.video,
-    },
-  },
-  {
-    label: "验证码",
-    type: "verificationCodeInput",
-    name: "verificationCodeInput",
-    itemProps: {
-      request: () => {
-        return Promise.resolve({ code: 200 });
-      },
-    },
-  },
+    hideLabel:true,
+    render:()=>{
+       return <Test/>
+    }
+  }
 ];
 let num = 0;
+const Test1=({formNode,dialogForm,params})=>{
+  useEffect(() => {
+    console.log("渲染")
+  }, []);
+  return   <div>
+    <div>测试一些</div>
+    {formNode}
+  </div>
+}
 export default () => {
   const modalForm = useHDialogForm();
   return (
@@ -98,14 +66,23 @@ export default () => {
         labelWidth={88}
         labelAlign={"left"}
         dialogForm={modalForm}
+        footer={()=>{
+            return <div>ff</div>
+        }}
+        request={(values)=>{
+          console.log(values)
+        }}
         afterClose={() => {
           console.log("afterClose");
         }}
         contentRender={(node) => {
+          console.log("contentRender");
           return <div>{node}</div>;
         }}
         title="测试"
-      />
+      >
+      <Test1/>
+      </HDrawerForm>
     </>
   );
 };

package/src/pages/ModalForm/index.tsx

@@ -5,7 +5,7 @@ import {
   HFormConfigProvider,
   HUrlUpload,
 } from "../../components";
-import { useState } from "react";
+import {useEffect, useState} from "react";
 import { ShowParamsModal } from "@/components/DialogForm/modal";
 
 const Test = (props) => {
@@ -144,6 +144,15 @@ const data = [
   },
 ];
 let num = 0;
+const Test1=({formNode})=>{
+  useEffect(() => {
+     console.log("渲染")
+  }, []);
+  return   <div>
+    <div>测试一些</div>
+    {formNode}
+  </div>
+}
 export default () => {
   const modalForm = useHDialogForm();
   return (
@@ -190,33 +199,14 @@ export default () => {
           configData={data}
           labelWidth={88}
           labelAlign={"left"}
-          footer={(dialogForm, loading, params = {}) => {
-            const { name } = params;
-            return (
-              <Button
-                loading={loading}
-                onClick={() => {
-                  dialogForm?.submit();
-                }}
-              >
-                {name}
-              </Button>
-            );
-          }}
           request={(values, params) => {
             console.log(values, params);
           }}
-          contentRender={(node, form) => {
-            return (
-              <div>
-                <div>测试一些</div>
-                {node}
-              </div>
-            );
-          }}
           dialogForm={modalForm}
           title={<div>fff</div>}
-        />
+        >
+           <Test1/>
+        </HModalForm>
       </HFormConfigProvider>
     </>
   );