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

package/lib/DialogForm/DrawerForm/index.js

@@ -13,7 +13,7 @@ var index = require('../../Form/index.js');
 var Title = require('./Title.js');
 var Footer = require('./Footer.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params"];
 var DrawerForm = (function (_ref) {
   var visible = _ref.visible,
     title = _ref.title,
@@ -27,29 +27,32 @@ var DrawerForm = (function (_ref) {
     closable = _ref$closable === void 0 ? true : _ref$closable,
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
-    labelWidth = _ref.labelWidth;
-    _ref.onOk;
-    var onFinish = _ref.onFinish;
+    labelWidth = _ref.labelWidth,
+    onOk = _ref.onOk,
+    onFinish = _ref.onFinish;
     _ref.size;
     _ref.form;
     var footer = _ref.footer,
+    params = _ref.params,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var _useModifyProps = hooks.useModifyProps({
       configData: configData,
       visible: visible,
       initialValues: initialValues,
-      dialogForm: currentForm
+      dialogForm: currentForm,
+      params: params
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
-    onAfterClose = _useModifyProps.onAfterClose;
-  var cancel = function cancel(e) {
+    onAfterClose = _useModifyProps.onAfterClose,
+    formParams = _useModifyProps.formParams;
+  var cancel = function cancel() {
     onAfterClose();
     if (onCancel) {
-      return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
     setModalVisible(false);
   };
@@ -86,22 +89,32 @@ var DrawerForm = (function (_ref) {
     initialValues: initValue
   }, props, {
     form: currentForm,
+    params: formParams,
     onFinish: /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+      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);
+              return run(values, subParams);
             case 2:
-              setModalVisible(false);
-            case 3:
+              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 (_x) {
+      return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
     }(),

package/lib/DialogForm/ModalForm.d.ts

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

package/lib/DialogForm/ModalForm.js

@@ -11,7 +11,7 @@ var antd = require('antd');
 var index = require('../Form/index.js');
 var hooks = require('./hooks.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk"];
 var ModalForm = (function (_ref) {
   var visible = _ref.visible,
     title = _ref.title,
@@ -24,21 +24,25 @@ var ModalForm = (function (_ref) {
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     onFinish = _ref.onFinish,
+    params = _ref.params,
+    onOk = _ref.onOk,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var _useModifyProps = hooks.useModifyProps({
       configData: configData,
       visible: visible,
       initialValues: initialValues,
-      dialogForm: currentForm
+      dialogForm: currentForm,
+      params: params
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
-    initValue = _useModifyProps.initValue;
-  var cancel = function cancel(e) {
+    initValue = _useModifyProps.initValue,
+    formParams = _useModifyProps.formParams;
+  var cancel = function cancel() {
     if (onCancel) {
-      return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
     setModalVisible(false);
   };
@@ -64,25 +68,35 @@ var ModalForm = (function (_ref) {
     configData: modalFormData,
     initialValues: initValue,
     onFinish: /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
+        var result, close;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return run(values);
+              return run(values, params);
             case 2:
-              setModalVisible(false);
-            case 3:
+              result = _context.sent;
+              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, params);
+              if (!(close === false)) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return");
+            case 6:
+              cancel();
+            case 7:
             case "end":
               return _context.stop();
           }
         }, _callee);
       }));
-      return function (_x) {
+      return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
     }()
   }, props, {
+    params: formParams,
     form: currentForm,
     infoRequest: infoRequest
   })));

package/lib/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
@@ -8,7 +8,8 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
     initValue: Record<string, any> | undefined;
     setInitValue: import("react").Dispatch<import("react").SetStateAction<Record<string, any> | undefined>>;
     onAfterClose: () => void;
+    formParams: any;
 };
-export declare const useHDialogForm: () => HDialogFormInstance;
-export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance;
-export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any]>;
+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]>;

package/lib/DialogForm/hooks.js

@@ -24,7 +24,8 @@ var useModifyProps = function useModifyProps(_ref) {
     configData = _ref.configData,
     initialValues = _ref.initialValues,
     dialogForm = _ref.dialogForm,
-    afterClose = _ref.afterClose;
+    afterClose = _ref.afterClose,
+    params = _ref.params;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -37,11 +38,15 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     initValue = _useState6[0],
     setInitValue = _useState6[1];
+  var _useState7 = React.useState(params),
+    _useState8 = _slicedToArray(_useState7, 2),
+    formParams = _useState8[0],
+    setFormParams = _useState8[1];
   var onAfterClose = function onAfterClose() {
     _setTimeout(function () {
       dialogForm.resetFields();
       afterClose === null || afterClose === void 0 ? void 0 : afterClose();
-    }, 0);
+    }, 100);
   };
   React.useEffect(function () {
     setModalVisible(visible);
@@ -49,14 +54,21 @@ var useModifyProps = function useModifyProps(_ref) {
   React.useEffect(function () {
     setModalFormData(configData);
   }, [configData]);
+  React.useEffect(function () {
+    setFormParams(params);
+  }, [params]);
   React.useEffect(function () {
     dialogForm.show = function () {
-      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var changeConfigData = params.configData,
-        changeInitialValues = params.initialValues;
+      var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var changeConfigData = showParams.configData,
+        changeInitialValues = showParams.initialValues,
+        params = showParams.params;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
+      if (!!params) {
+        setFormParams(params);
+      }
       setInitValue(changeInitialValues);
       setModalVisible(true);
     };
@@ -72,7 +84,8 @@ var useModifyProps = function useModifyProps(_ref) {
     setModalFormData: setModalFormData,
     initValue: initValue,
     setInitValue: setInitValue,
-    onAfterClose: onAfterClose
+    onAfterClose: onAfterClose,
+    formParams: formParams
   };
 };
 var useHDialogForm = function useHDialogForm() {
@@ -92,7 +105,7 @@ var useSub = function useSub(_ref2) {
   var request = _ref2.request,
     onFinish = _ref2.onFinish;
   return ahooks.useRequest( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, params) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -100,20 +113,20 @@ var useSub = function useSub(_ref2) {
               _context.next = 2;
               break;
             }
-            return _context.abrupt("return", onFinish(values));
+            return _context.abrupt("return", onFinish(values, params));
           case 2:
             if (!request) {
               _context.next = 4;
               break;
             }
-            return _context.abrupt("return", request(values));
+            return _context.abrupt("return", request(values, params));
           case 4:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function (_x) {
+    return function (_x, _x2) {
       return _ref3.apply(this, arguments);
     };
   }(), {

package/lib/DialogForm/modal.d.ts

@@ -2,24 +2,30 @@ import type { ModalProps } from "antd";
 import type { HFormInstance, HItemProps, HFormProps } from "../Form/modal";
 import type { PromiseFnResult } from "../modal";
 type RootProps = HFormProps & ModalProps;
-export interface ModifyPropsModal {
+export interface ModifyPropsModal<P = any> {
     configData: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
     dialogForm: HDialogFormInstance;
     afterClose?: VoidFunction;
+    params?: P;
 }
-export interface ShowParamsModal {
+export interface ShowParamsModal<P = any, T = any> {
     configData?: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
+    infoRequest?: PromiseFnResult<P, T>;
+    params?: P;
 }
-export interface HDialogFormInstance extends HFormInstance {
-    show: (data?: ShowParamsModal) => void;
+export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
+    show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
 }
-export interface DialogFormProps extends Omit<RootProps, "onFinish"> {
+export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest"> {
     dialogForm?: HDialogFormInstance;
-    onFinish?: PromiseFnResult;
+    onFinish?: (values: T, params: P) => Promise<any>;
+    onCancel?: VoidFunction;
+    onOk?: (data: T, params: P) => boolean | undefined;
+    infoRequest?: (params: P) => Promise<T>;
 }
 export {};

package/lib/Form/hooks/index.d.ts

@@ -1,6 +1,8 @@
-import type { HFormProps } from "@/components/Form/modal";
-import type { HFormInstance } from "@/components/Form/modal";
+import type { HFormProps, HFormInstance } from "../modal";
 export declare const useCurrentForm: (form?: HFormInstance) => HFormInstance;
 type ParamsModal = Omit<HFormProps, "configData">;
-export declare const useSub: ({ request, onFinish, form }: ParamsModal) => import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
+export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, }: ParamsModal) => {
+    subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
+    infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<import("rc-field-form/lib/interface").Store, [reqParams?: any]>;
+};
 export {};

package/lib/Form/hooks/index.js

@@ -4,16 +4,26 @@ var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var ahooks = require('ahooks');
 var useHForm = require('./useHForm.js');
+var React = require('react');
 
 var useCurrentForm = function useCurrentForm(form) {
   var selfForm = useHForm.default();
   return form || selfForm;
 };
-var useSub = function useSub(_ref) {
-  var request = _ref.request,
-    onFinish = _ref.onFinish,
-    form = _ref.form;
-  return ahooks.useRequest( /*#__PURE__*/function () {
+var useInfoReq = function useInfoReq(_ref) {
+  var initialValues = _ref.initialValues,
+    infoRequest = _ref.infoRequest,
+    form = _ref.form,
+    params = _ref.params,
+    request = _ref.request,
+    onFinish = _ref.onFinish;
+  var reqData = React.useMemo(function () {
+    var saveParams = params || {};
+    return {
+      params: saveParams
+    };
+  }, [params]);
+  var subControl = ahooks.useRequest( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
       var subVal;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -25,9 +35,9 @@ var useSub = function useSub(_ref) {
               break;
             }
             _context.next = 4;
-            return request(subVal);
+            return request(subVal, reqData.params);
           case 4:
-            onFinish === null || onFinish === void 0 ? void 0 : onFinish(subVal);
+            onFinish === null || onFinish === void 0 ? void 0 : onFinish(subVal, reqData.params);
           case 5:
           case "end":
             return _context.stop();
@@ -40,8 +50,55 @@ var useSub = function useSub(_ref) {
   }(), {
     manual: true
   });
+  var infoControl = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var reqParams,
+      setValue,
+      _args2 = arguments;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
+          setValue = initialValues;
+          reqData.params = reqParams;
+          if (!(!initialValues && !infoRequest)) {
+            _context2.next = 5;
+            break;
+          }
+          return _context2.abrupt("return", {});
+        case 5:
+          if (!infoRequest) {
+            _context2.next = 9;
+            break;
+          }
+          _context2.next = 8;
+          return infoRequest(reqParams);
+        case 8:
+          setValue = _context2.sent;
+        case 9:
+          form === null || form === void 0 ? void 0 : form.setFieldsValue(setValue);
+          return _context2.abrupt("return", setValue || {});
+        case 11:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  var run = infoControl.run,
+    mutate = infoControl.mutate;
+  React.useEffect(function () {
+    if (form) {
+      form.reload = function (params) {
+        mutate(undefined);
+        return run(params);
+      };
+    }
+  }, []);
+  return {
+    subControl: subControl,
+    infoControl: infoControl
+  };
 };
 
 exports.useCurrentForm = useCurrentForm;
-exports.useSub = useSub;
+exports.useInfoReq = useInfoReq;
 // powered by h

package/lib/Form/hooks/useHForm.js

@@ -11,12 +11,12 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/defi
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
+var _Promise = require('@babel/runtime-corejs3/core-js/promise');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Reflect$deleteProperty = require('@babel/runtime-corejs3/core-js/reflect/delete-property');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/concat');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
-var _Promise = require('@babel/runtime-corejs3/core-js/promise');
 var React = require('react');
 var antd = require('antd');
 
@@ -44,6 +44,9 @@ var useHForm = (function () {
       };
     };
     return _objectSpread(_objectSpread({
+      reload: function reload(params) {
+        return _Promise.resolve(params);
+      },
       initValues: function initValues() {
         if (cacheValues) {
           var newValue = this.formatValues(cacheValues);

package/lib/Form/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/index.js

@@ -4,20 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var _extends = require('@babel/runtime-corejs3/helpers/extends');
-var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
-var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var antd = require('antd');
 var index$3 = require('./FormItem/index.js');
 var index = require('./hooks/index.js');
 var index$2 = require('./Context/index.js');
 var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
-var ahooks = require('ahooks');
 var InitSet = require('./InitSet.js');
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params"];
 var HForm = (function (_ref) {
   var configData = _ref.configData,
     labelWidth = _ref.labelWidth,
@@ -28,53 +25,31 @@ var HForm = (function (_ref) {
     _ref$valueType = _ref.valueType,
     valueType = _ref$valueType === void 0 ? "float" : _ref$valueType,
     initialValues = _ref.initialValues,
+    _ref$params = _ref.params,
+    params = _ref$params === void 0 ? {} : _ref$params,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
   var newConfigData = useInitConfigData.default({
     configData: configData,
     form: hForm
   });
-  var _useSub = index.useSub({
+  var _useInfoReq = index.useInfoReq({
+      initialValues: initialValues,
       request: request,
       onFinish: onFinish,
       valueType: valueType,
-      form: hForm
+      form: hForm,
+      infoRequest: infoRequest,
+      params: params
     }),
-    run = _useSub.run,
-    loading = _useSub.loading;
-  var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var setValue;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            setValue = initialValues;
-            if (!(!initialValues && !infoRequest)) {
-              _context.next = 3;
-              break;
-            }
-            return _context.abrupt("return", {});
-          case 3:
-            if (!infoRequest) {
-              _context.next = 7;
-              break;
-            }
-            _context.next = 6;
-            return infoRequest();
-          case 6:
-            setValue = _context.sent;
-          case 7:
-            hForm.setFieldsValue(setValue);
-            return _context.abrupt("return", setValue || {});
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))),
-    infoRun = _useRequest.run,
-    infoLoading = _useRequest.loading,
-    infoErr = _useRequest.error,
-    infoData = _useRequest.data;
+    subControl = _useInfoReq.subControl,
+    infoControl = _useInfoReq.infoControl;
+  var run = subControl.run,
+    loading = subControl.loading;
+  var infoRun = infoControl.run,
+    infoLoading = infoControl.loading,
+    infoErr = infoControl.error,
+    infoData = infoControl.data;
   React.useEffect(function () {
     return function () {
       hForm.removeDispatchListener();

package/lib/Form/modal.d.ts

@@ -33,13 +33,15 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
     placeholder?: string | string[];
     name?: string;
 }
-export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form"> {
+export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish"> {
     configData: HItemProps[];
     labelWidth?: number;
-    request?: PromiseFnResult<T, R>;
-    infoRequest?: () => Promise<T>;
+    request?: (values: T, params?: any) => Promise<R>;
+    infoRequest?: PromiseFnResult;
     valueType?: string;
     form?: HFormInstance;
+    params?: any;
+    onFinish?: (values: T, params?: any) => void;
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;
@@ -80,6 +82,7 @@ export interface HFormInstance extends FormInstance {
     outputValues: (values?: Record<string, any>) => Record<string, any>;
     addDispatchListener: AddDispatchListenerFn;
     removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
+    reload: PromiseFnResult;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/package.json

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

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

@@ -1,11 +1,16 @@
 import { Row, Space, Button } from "antd";
-import type { DialogFormProps } from "../modal";
+
+interface IProps{
+  onOk?:VoidFunction;
+  onCancel?:VoidFunction;
+  confirmLoading?:boolean;
+}
 
 export default ({
   onCancel,
   onOk,
   confirmLoading,
-}: Omit<DialogFormProps, "configData">) => {
+}: IProps) => {
   return (
     <Row justify={"end"}>
       <Space size={"middle"}>

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

@@ -21,6 +21,7 @@ export default ({
   size,
   form,
   footer,
+  params,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -30,16 +31,18 @@ export default ({
     setModalVisible,
     initValue,
     onAfterClose,
+    formParams
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
+    params
   });
-  const cancel = (e) => {
+  const cancel = () => {
     onAfterClose();
     if (onCancel) {
-      return onCancel?.(e);
+      return onCancel?.();
     }
     setModalVisible(false);
   };
@@ -73,9 +76,14 @@ export default ({
         initialValues={initValue}
         {...props}
         form={currentForm}
-        onFinish={async (values) => {
-          await run(values);
-          setModalVisible(false);
+        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}