@hw-component/form 1.9.71 → 1.9.73

package/es/CheckboxGroup/index.js

@@ -71,15 +71,17 @@ var Index = function Index(_ref) {
     wrap: wrap,
     children: checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (item) {
       var label = item.label,
-        itemVal = item.value;
+        itemVal = item.value,
+        itemDisabled = item.disabled;
       var checked = val[itemVal];
+      var nDis = typeof itemDisabled === "undefined" ? disabled : itemDisabled;
       return jsx(Index$1, {
         value: checked,
         onChange: function onChange(changeVal) {
           change(itemVal, changeVal);
         },
         valueMap: valueMap,
-        disabled: disabled,
+        disabled: nDis,
         children: label
       }, itemVal);
     })

package/es/DialogForm/DrawerForm/index.js

@@ -1,6 +1,6 @@
 // welcome to hoo hoo hoo
-import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx } from 'react/jsx-runtime';
@@ -72,48 +72,56 @@ var Index = function Index(_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
+  var finish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
+      var result, close;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return run(values, subParams);
+          case 2:
+            result = _context.sent;
+            close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
+            if (!(close === false)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            cancel();
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function finish(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var footerOnOk = function footerOnOk() {
+    if (modalFormData) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      return;
+    }
+    finish({}, formParams);
+  };
   var defaultFooter = useFooterRender({
     dialogForm: dialogForm,
     footer: footer,
     confirmLoading: loading,
-    params: formParams
+    params: formParams,
+    onOk: footerOnOk
   });
-  var node = jsx(HForm, _objectSpread(_objectSpread({
+  var node = modalFormData && jsx(HForm, _objectSpread(_objectSpread({
     configData: modalFormData,
     initialValues: initValue,
     onValuesChange: onValuesChange
   }, props), {}, {
     form: currentForm,
     params: formParams,
-    onFinish: function () {
-      var _onFinish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
-        var result, close;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return run(values, subParams);
-            case 2:
-              result = _context.sent;
-              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
-              if (!(close === false)) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return");
-            case 6:
-              cancel();
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onFinish(_x, _x2) {
-        return _onFinish.apply(this, arguments);
-      }
-      return onFinish;
-    }(),
+    onFinish: finish,
     infoRequest: infoRequest,
     labelWidth: labelWidth
   }));

package/es/DialogForm/ModalForm.js

@@ -1,6 +1,6 @@
 // welcome to hoo hoo hoo
-import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx } from 'react/jsx-runtime';
@@ -62,39 +62,46 @@ var Index = function Index(_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
-  var node = jsx(HForm, _objectSpread(_objectSpread({
+  var finish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
+      var result, close;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return run(values, outParams);
+          case 2:
+            result = _context.sent;
+            close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
+            if (!(close === false)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            cancel();
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function finish(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var footerOnOk = function footerOnOk() {
+    if (modalFormData) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      return;
+    }
+    finish({}, formParams);
+  };
+  var node = modalFormData && jsx(HForm, _objectSpread(_objectSpread({
     configData: modalFormData,
     initialValues: initValue,
     onValuesChange: onValuesChange,
-    onFinish: function () {
-      var _onFinish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
-        var result, close;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return run(values, outParams);
-            case 2:
-              result = _context.sent;
-              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
-              if (!(close === false)) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return");
-            case 6:
-              cancel();
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onFinish(_x, _x2) {
-        return _onFinish.apply(this, arguments);
-      }
-      return onFinish;
-    }()
+    onFinish: finish
   }, props), {}, {
     params: formParams,
     form: currentForm,
@@ -104,7 +111,8 @@ var Index = function Index(_ref) {
     dialogForm: dialogForm,
     footer: footer,
     confirmLoading: loading,
-    params: formParams
+    params: formParams,
+    onOk: footerOnOk
   });
   return jsx(Modal, _objectSpread(_objectSpread({
     title: modalTitle,

package/es/DialogForm/hooks.d.ts

@@ -1,10 +1,10 @@
 import React from "react";
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
 export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear, }: ModifyPropsModal) => {
-    modalFormData: import("../Form/modal").HItemProps[];
+    modalFormData: import("../Form/modal").HItemProps[] | undefined;
     modalVisible: boolean | undefined;
     setModalVisible: React.Dispatch<React.SetStateAction<boolean | undefined>>;
-    setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
+    setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[] | undefined>>;
     initValue: Record<string, any> | undefined;
     setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
     formParams: any;
@@ -14,4 +14,8 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
 export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any, params: any]>;
-export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, }: Omit<DialogFormProps, "configData">) => any;
+interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
+    onOk: VoidFunction;
+}
+export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk }: FooterRenderParamsModal) => any;
+export {};

package/es/DialogForm/hooks.js

@@ -154,7 +154,8 @@ var useFooterRender = function useFooterRender(_ref4) {
   var footer = _ref4.footer,
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
-    params = _ref4.params;
+    params = _ref4.params,
+    onOk = _ref4.onOk;
   if (footer === null) {
     return null;
   }
@@ -165,9 +166,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     onCancel: function onCancel() {
       dialogForm === null || dialogForm === void 0 || dialogForm.hide();
     },
-    onOk: function onOk() {
-      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
-    },
+    onOk: onOk,
     confirmLoading: confirmLoading
   });
 };

package/es/DialogForm/modal.d.ts

@@ -4,7 +4,7 @@ import type { PromiseFnResult } from "../modal";
 import type React from "react";
 type RootProps = HFormProps & ModalProps;
 export interface ModifyPropsModal<P = any> {
-    configData: HItemProps[];
+    configData?: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
     dialogForm: HDialogFormInstance;
@@ -28,8 +28,9 @@ export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     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"> {
+export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer" | "configData"> {
     dialogForm?: HDialogFormInstance;
+    configData?: HFormProps["configData"];
     onFinish?: (values: T, params: P) => Promise<any>;
     onCancel?: VoidFunction;
     onOk?: (data: T, params: P) => boolean | void;

package/lib/CheckboxGroup/index.js

@@ -74,15 +74,17 @@ var Index = function Index(_ref) {
     wrap: wrap,
     children: checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (item) {
       var label = item.label,
-        itemVal = item.value;
+        itemVal = item.value,
+        itemDisabled = item.disabled;
       var checked = val[itemVal];
+      var nDis = typeof itemDisabled === "undefined" ? disabled : itemDisabled;
       return jsxRuntime.jsx(index$1.default, {
         value: checked,
         onChange: function onChange(changeVal) {
           change(itemVal, changeVal);
         },
         valueMap: valueMap,
-        disabled: disabled,
+        disabled: nDis,
         children: label
       }, itemVal);
     })

package/lib/DialogForm/DrawerForm/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
@@ -75,48 +75,56 @@ var Index = function Index(_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
+  var finish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
+      var result, close;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return run(values, subParams);
+          case 2:
+            result = _context.sent;
+            close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
+            if (!(close === false)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            cancel();
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function finish(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var footerOnOk = function footerOnOk() {
+    if (modalFormData) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      return;
+    }
+    finish({}, formParams);
+  };
   var defaultFooter = hooks.useFooterRender({
     dialogForm: dialogForm,
     footer: footer,
     confirmLoading: loading,
-    params: formParams
+    params: formParams,
+    onOk: footerOnOk
   });
-  var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+  var node = modalFormData && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
     configData: modalFormData,
     initialValues: initValue,
     onValuesChange: onValuesChange
   }, props), {}, {
     form: currentForm,
     params: formParams,
-    onFinish: function () {
-      var _onFinish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
-        var result, close;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return run(values, subParams);
-            case 2:
-              result = _context.sent;
-              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
-              if (!(close === false)) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return");
-            case 6:
-              cancel();
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onFinish(_x, _x2) {
-        return _onFinish.apply(this, arguments);
-      }
-      return onFinish;
-    }(),
+    onFinish: finish,
     infoRequest: infoRequest,
     labelWidth: labelWidth
   }));

package/lib/DialogForm/ModalForm.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
@@ -65,39 +65,46 @@ var Index = function Index(_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
-  var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+  var finish = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
+      var result, close;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return run(values, outParams);
+          case 2:
+            result = _context.sent;
+            close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
+            if (!(close === false)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            cancel();
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function finish(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var footerOnOk = function footerOnOk() {
+    if (modalFormData) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      return;
+    }
+    finish({}, formParams);
+  };
+  var node = modalFormData && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
     configData: modalFormData,
     initialValues: initValue,
     onValuesChange: onValuesChange,
-    onFinish: function () {
-      var _onFinish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
-        var result, close;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return run(values, outParams);
-            case 2:
-              result = _context.sent;
-              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
-              if (!(close === false)) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return");
-            case 6:
-              cancel();
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onFinish(_x, _x2) {
-        return _onFinish.apply(this, arguments);
-      }
-      return onFinish;
-    }()
+    onFinish: finish
   }, props), {}, {
     params: formParams,
     form: currentForm,
@@ -107,7 +114,8 @@ var Index = function Index(_ref) {
     dialogForm: dialogForm,
     footer: footer,
     confirmLoading: loading,
-    params: formParams
+    params: formParams,
+    onOk: footerOnOk
   });
   return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
     title: modalTitle,

package/lib/DialogForm/hooks.d.ts

@@ -1,10 +1,10 @@
 import React from "react";
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
 export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear, }: ModifyPropsModal) => {
-    modalFormData: import("../Form/modal").HItemProps[];
+    modalFormData: import("../Form/modal").HItemProps[] | undefined;
     modalVisible: boolean | undefined;
     setModalVisible: React.Dispatch<React.SetStateAction<boolean | undefined>>;
-    setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
+    setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[] | undefined>>;
     initValue: Record<string, any> | undefined;
     setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
     formParams: any;
@@ -14,4 +14,8 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
 export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any, params: any]>;
-export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, }: Omit<DialogFormProps, "configData">) => any;
+interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
+    onOk: VoidFunction;
+}
+export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk }: FooterRenderParamsModal) => any;
+export {};

package/lib/DialogForm/hooks.js

@@ -155,7 +155,8 @@ var useFooterRender = function useFooterRender(_ref4) {
   var footer = _ref4.footer,
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
-    params = _ref4.params;
+    params = _ref4.params,
+    onOk = _ref4.onOk;
   if (footer === null) {
     return null;
   }
@@ -166,9 +167,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     onCancel: function onCancel() {
       dialogForm === null || dialogForm === void 0 || dialogForm.hide();
     },
-    onOk: function onOk() {
-      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
-    },
+    onOk: onOk,
     confirmLoading: confirmLoading
   });
 };

package/lib/DialogForm/modal.d.ts

@@ -4,7 +4,7 @@ import type { PromiseFnResult } from "../modal";
 import type React from "react";
 type RootProps = HFormProps & ModalProps;
 export interface ModifyPropsModal<P = any> {
-    configData: HItemProps[];
+    configData?: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
     dialogForm: HDialogFormInstance;
@@ -28,8 +28,9 @@ export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     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"> {
+export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer" | "configData"> {
     dialogForm?: HDialogFormInstance;
+    configData?: HFormProps["configData"];
     onFinish?: (values: T, params: P) => Promise<any>;
     onCancel?: VoidFunction;
     onOk?: (data: T, params: P) => boolean | void;

package/package.json

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

package/src/components/CheckboxGroup/index.tsx

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

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

@@ -66,14 +66,29 @@ const Index: React.FC<DialogFormProps> = ({
     setModalVisible(false);
   };
   const { loading, run } = useSub({ request, onFinish });
-
+  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){
+      dialogForm?.submit();
+      return;
+    }
+    finish({},formParams);
+  }
   const defaultFooter = useFooterRender({
     dialogForm,
     footer,
     confirmLoading: loading,
     params: formParams,
+    onOk :footerOnOk
   });
-  const node = (
+  const node = modalFormData&&(
     <HForm
       configData={modalFormData}
       initialValues={initValue}
@@ -81,14 +96,7 @@ const Index: React.FC<DialogFormProps> = ({
       {...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();
-      }}
+      onFinish={finish}
       infoRequest={infoRequest}
       labelWidth={labelWidth}
     />

package/src/components/DialogForm/ModalForm.tsx

@@ -58,19 +58,27 @@ const Index: React.FC<DialogFormProps> = ({
     setModalVisible(false);
   };
   const { loading, run } = useSub({ request, onFinish });
-  const node = (
+  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&&(
     <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();
-      }}
+      onFinish={finish}
       {...props}
       params={formParams}
       form={currentForm}
@@ -82,6 +90,7 @@ const Index: React.FC<DialogFormProps> = ({
     footer,
     confirmLoading: loading,
     params: formParams,
+    onOk:footerOnOk
   });
   return (
     <Modal

package/src/components/DialogForm/hooks.tsx

@@ -119,13 +119,17 @@ export const useSub = ({ request, onFinish }: Partial<DialogFormProps>) => {
     { manual: true }
   );
 };
+interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData">{
+   onOk:VoidFunction;
+}
 
 export const useFooterRender = ({
   footer,
   confirmLoading,
   dialogForm,
   params,
-}: Omit<DialogFormProps, "configData">) => {
+  onOk
+}: FooterRenderParamsModal) => {
   if (footer === null) {
     return null;
   }
@@ -138,9 +142,7 @@ export const useFooterRender = ({
         onCancel={() => {
           dialogForm?.hide();
         }}
-        onOk={() => {
-          dialogForm?.submit();
-        }}
+        onOk={onOk}
         confirmLoading={confirmLoading}
       />
     )

package/src/components/DialogForm/modal.ts

@@ -6,7 +6,7 @@ import type React from "react";
 type RootProps = HFormProps & ModalProps;
 
 export interface ModifyPropsModal<P = any> {
-  configData: HItemProps[];
+  configData?: HItemProps[];
   visible?: boolean;
   initialValues?: Record<string, any>;
   dialogForm: HDialogFormInstance;
@@ -38,9 +38,10 @@ export type FooterRender = (
 export interface DialogFormProps<P = any, T = any>
   extends Omit<
     RootProps,
-    "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"
+    "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"|"configData"
   > {
   dialogForm?: HDialogFormInstance;
+  configData?:HFormProps["configData"];
   onFinish?: (values: T, params: P) => Promise<any>;
   onCancel?: VoidFunction;
   onOk?: (data: T, params: P) => boolean | void;

package/src/pages/Form/index.tsx

@@ -187,9 +187,6 @@ export default () => {
                            text:"你好"
                        }
                     },
-                    subProvider:()=>{
-                      console.log("subProvider")
-                    }
                 },
               },
             ]}

package/src/pages/ModalForm/index.tsx

@@ -212,6 +212,7 @@ export default () => {
           }}
           labelAlign={"left"}
           request={(values, params) => {
+              console.log(values,params)
             return Promise.resolve();
           }}
           dialogForm={modalForm}