@hw-component/form 0.0.1-beta-v5 → 0.0.1-beta-v7

package/es/Upload/index.js

@@ -11,14 +11,16 @@ import _extends from '@babel/runtime-corejs3/helpers/extends';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import { Upload } from 'antd';
-import Btn from './Btn.js';
+import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
 import React, { useState, useImperativeHandle, useMemo } from 'react';
+import { useProps } from './hooks/propsMaker.js';
 import Preview from './Preview/index.js';
 import { useChange } from './hooks/change.js';
-import { useProps } from './hooks/propsMaker.js';
+import { Upload } from 'antd';
+import Btn from './Btn.js';
+import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref, ref) {
@@ -35,6 +37,7 @@ var Index = function Index(_ref, ref) {
     onPreview = _ref.onPreview,
     request = _ref.request,
     maxSize = _ref.maxSize,
+    addFormat = _ref.addFormat,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = useProps({
     request: request,
@@ -77,6 +80,37 @@ var Index = function Index(_ref, ref) {
   var maxNum = maxCount === 1 ? maxCount : Number.MAX_VALUE;
   var visible = previewModal.visible,
     previewFile = previewModal.file;
+  addFormat === null || addFormat === void 0 ? void 0 : addFormat({
+    "float": {
+      inputValue: function inputValue(item, initValue) {
+        var _item$name = item.name,
+          name = _item$name === void 0 ? "" : _item$name;
+        var initFileList = initValue[name] || [];
+        var fileList = _mapInstanceProperty(initFileList).call(initFileList, function (url, index) {
+          return {
+            name: url,
+            response: {
+              url: url
+            },
+            status: "done",
+            uid: "init-".concat(index),
+            thumbUrl: url
+          };
+        });
+        return _defineProperty({}, name, fileList);
+      },
+      outputValue: function outputValue(item, _outputValue) {
+        var _item$name2 = item.name,
+          valueName = _item$name2 === void 0 ? "" : _item$name2;
+        var _outputValue$valueNam = _outputValue[valueName],
+          itemVal = _outputValue$valueNam === void 0 ? [] : _outputValue$valueNam;
+        var urls = _mapInstanceProperty(itemVal).call(itemVal, function (fileItem) {
+          return fileItem.response.url;
+        });
+        return _defineProperty({}, valueName, urls);
+      }
+    }
+  });
   return /*#__PURE__*/React.createElement("div", {
     style: contentStyle
   }, /*#__PURE__*/React.createElement(Upload, _extends({
@@ -100,7 +134,7 @@ var Index = function Index(_ref, ref) {
     }
   }));
 };
-var HUpload = /*#__PURE__*/React.forwardRef(Index);
+var HUpload = HFormConnect( /*#__PURE__*/React.forwardRef(Index));
 
 export { HUpload as default };
 // powered by hdj

package/es/Upload/modal.d.ts

@@ -3,6 +3,7 @@ import type { UploadFile } from "antd/es/upload/interface";
 import type { BeforeUploadFileType, RcFile } from "rc-upload/lib/interface";
 import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
+import type { addFormatItemModal } from "@/components/Form/modal";
 export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     exFiles?: string[];
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
@@ -13,6 +14,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     value?: UploadFile[];
     maxRowNum?: number;
     maxSize?: number;
+    addFormat?: (config: Record<string, addFormatItemModal>) => void;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/es/index.d.ts

@@ -2,21 +2,23 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
-export { useHModalForm } from "./ModalForm/hooks";
+export { useHModalForm } from "./DiaLogForm/hooks";
 export declare const HSelect: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: import("./Select/modal").HSelectProps) => JSX.Element;
 export declare const HInput: ({ ...props }: import("antd").InputProps) => JSX.Element;
-export declare const HSelectInput: (props: import("./Form/modal").HFormItemProps) => import("react").ReactElement<import("./Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
-export declare const HUpload: import("react").ForwardRefExoticComponent<import("./Upload/modal").IUpLoadProps & import("react").RefAttributes<import("./Upload/modal").IUploadRefModal>>;
+export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<unknown>>;
+export declare const HUpload: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<unknown>>;
 export declare const HUrlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("./Upload/modal").IUrlUploadProps) => JSX.Element;
 export declare const HButtonInput: import("react").FC<import("./Input/modal").HButtonInputProps>;
 export declare const HCheckBox: import("react").FC<import("./CheckboxGroup/modal").HCheckboxProps>;
 export declare const HSwitch: import("react").FC<import("./Switch").HSwitchProps>;
-export declare const HCheckboxGroup: (props: import("./Form/modal").HFormItemProps) => import("react").ReactElement<import("./Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
+export declare const HCheckboxGroup: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<unknown>>;
 export declare const HDatePicker: ({ value, onChange, showTime, format, ...props }: import("./TDPicker/modal").HDatePickerProps) => JSX.Element;
-export declare const HRangePicker: (props: import("./Form/modal").HFormItemProps) => import("react").ReactElement<import("./Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
+export declare const HRangePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<unknown>>;
 export declare const HRadioGroup: ({ value, options, onChange, fieldNames: propsFieldNames, ...props }: import("./RadioGroup").HRadioGroupProps) => JSX.Element;
 export declare const HTimePicker: ({ value, format, onChange, ...props }: import("./TDPicker/modal").HTimePickerProps) => JSX.Element;
 export declare const HInputNumber: ({ style, ...props }: import("antd").InputNumberProps<string | number>) => JSX.Element;
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HFormConfigProvider: import("react").FC<import("./Form/modal").IFormConfigContextProps>;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, modalForm, initialValues, ...props }: import("./ModalForm/modal").ModalFormProps) => JSX.Element;
+export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, modalForm, initialValues, onFinish, ...props }: import("./DiaLogForm/modal").ModalFormProps) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, modalForm, closable, initialValues, labelWidth, onOk, onFinish, ...props }: import("./DiaLogForm/modal").ModalFormProps) => JSX.Element;

package/es/index.js

@@ -3,8 +3,9 @@ import FormConfig from './Form/config.js';
 import Index from './PageHandler/index.js';
 export { default as HForm } from './Form/index.js';
 export { default as useHForm } from './Form/hooks/useHForm.js';
-export { useHModalForm } from './ModalForm/hooks.js';
-import ModalForm from './ModalForm/index.js';
+export { useHModalForm } from './DiaLogForm/hooks.js';
+import ModalForm from './DiaLogForm/ModalForm.js';
+import DrawerForm from './DiaLogForm/DrawerForm/index.js';
 
 var HSelect = FormConfig.select;
 var HInput = FormConfig.input;
@@ -22,7 +23,9 @@ var HTimePicker = FormConfig.timePicker;
 var HInputNumber = FormConfig.inputNumber;
 var HPageHandler = Index;
 var HFormConfigProvider = FormConfig.formConfigProvider;
+var HTextArea = FormConfig.textArea;
 var HModalForm = ModalForm;
+var HDrawerForm = DrawerForm;
 
-export { HButtonInput, HCheckBox, HCheckboxGroup, HDatePicker, HFormConfigProvider, HInput, HInputNumber, HModalForm, HPageHandler, HRadioGroup, HRangePicker, HSelect, HSelectInput, HSwitch, HTimePicker, HUpload, HUrlUpload };
+export { HButtonInput, HCheckBox, HCheckboxGroup, HDatePicker, HDrawerForm, HFormConfigProvider, HInput, HInputNumber, HModalForm, HPageHandler, HRadioGroup, HRangePicker, HSelect, HSelectInput, HSwitch, HTextArea, HTimePicker, HUpload, HUrlUpload };
 // powered by hdj

package/lib/CheckboxGroup/index.d.ts

@@ -1,3 +1,3 @@
 import React from "react";
-declare const _default: (props: import("../Form/modal").HFormItemProps) => React.ReactElement<import("../Form/modal").ConnectResultProps, string | React.JSXElementConstructor<any>>;
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/lib/DiaLogForm/DrawerForm/Footer.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ModalFormProps } from "@/components/DiaLogForm/modal";
+declare const _default: ({ onCancel, onOk, confirmLoading, }: Omit<ModalFormProps, "configData">) => JSX.Element;
+export default _default;

package/lib/DiaLogForm/DrawerForm/Footer.js

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var antd = require('antd');
+
+var Footer = (function (_ref) {
+  var onCancel = _ref.onCancel,
+    onOk = _ref.onOk,
+    confirmLoading = _ref.confirmLoading;
+  return /*#__PURE__*/React.createElement(antd.Row, {
+    justify: "end"
+  }, /*#__PURE__*/React.createElement(antd.Space, {
+    size: "middle"
+  }, /*#__PURE__*/React.createElement(antd.Button, {
+    onClick: onCancel
+  }, "\u5173\u95ED"), /*#__PURE__*/React.createElement(antd.Button, {
+    type: "primary",
+    onClick: onOk,
+    loading: confirmLoading
+  }, "\u786E\u5B9A")));
+});
+
+exports.default = Footer;
+// powered by h

package/lib/DiaLogForm/DrawerForm/Title.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ModalProps } from "antd";
+declare const _default: ({ title, closable, onCancel }: ModalProps) => JSX.Element;
+export default _default;

package/lib/DiaLogForm/DrawerForm/Title.js

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var antd = require('antd');
+var icons = require('@ant-design/icons');
+
+var Title = (function (_ref) {
+  var title = _ref.title,
+    closable = _ref.closable,
+    onCancel = _ref.onCancel;
+  return /*#__PURE__*/React.createElement(antd.Row, {
+    justify: "space-between"
+  }, /*#__PURE__*/React.createElement("div", null, title), closable && /*#__PURE__*/React.createElement(icons.CloseOutlined, {
+    onClick: onCancel
+  }));
+});
+
+exports.default = Title;
+// powered by h

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

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ModalFormProps } from "@/components/DiaLogForm/modal";
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, modalForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: ModalFormProps) => JSX.Element;
+export default _default;

package/lib/DiaLogForm/DrawerForm/index.js

@@ -0,0 +1,114 @@
+'use strict';
+
+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 _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var antd = require('antd');
+var hooks = require('../hooks.js');
+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", "modalForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer"];
+var DrawerForm = (function (_ref) {
+  var visible = _ref.visible,
+    title = _ref.title,
+    onCancel = _ref.onCancel,
+    configData = _ref.configData,
+    infoRequest = _ref.infoRequest,
+    request = _ref.request;
+    _ref.afterClose;
+    var modalForm = _ref.modalForm,
+    _ref$closable = _ref.closable,
+    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;
+    _ref.size;
+    _ref.form;
+    var footer = _ref.footer,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = hooks.useCurrentForm(modalForm);
+  var _useModifyProps = hooks.useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues,
+      modalForm: currentForm
+    }),
+    modalVisible = _useModifyProps.modalVisible,
+    modalFormData = _useModifyProps.modalFormData,
+    setModalVisible = _useModifyProps.setModalVisible,
+    initValue = _useModifyProps.initValue,
+    onAfterClose = _useModifyProps.onAfterClose;
+  var cancel = function cancel(e) {
+    onAfterClose();
+    if (onCancel) {
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
+    }
+    setModalVisible(false);
+  };
+  var _useSub = hooks.useSub({
+      request: request,
+      onFinish: onFinish
+    }),
+    loading = _useSub.loading,
+    run = _useSub.run;
+  var footerComponent = function footerComponent() {
+    if (footer === null) {
+      return null;
+    }
+    return footer || /*#__PURE__*/React.createElement(Footer.default, {
+      onCancel: cancel,
+      onOk: currentForm.submit,
+      confirmLoading: loading
+    });
+  };
+  return /*#__PURE__*/React.createElement(antd.Drawer, _extends({
+    visible: modalVisible,
+    title: /*#__PURE__*/React.createElement(Title.default, {
+      title: title,
+      closable: closable,
+      onCancel: cancel
+    })
+  }, props, {
+    onClose: cancel,
+    closable: false,
+    destroyOnClose: true,
+    footer: footerComponent()
+  }), /*#__PURE__*/React.createElement(index.default, _extends({
+    configData: modalFormData,
+    initialValues: initValue
+  }, props, {
+    form: currentForm,
+    onFinish: /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return run(values);
+            case 2:
+              setModalVisible(false);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }(),
+    infoRequest: infoRequest,
+    labelWidth: labelWidth
+  })));
+});
+
+exports.default = DrawerForm;
+// powered by h

package/lib/DiaLogForm/ModalForm.d.ts

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

package/lib/{ModalForm/index.js → DiaLogForm/ModalForm.js}

@@ -4,23 +4,26 @@ 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 _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var antd = require('antd');
 var index = require('../Form/index.js');
 var hooks = require('./hooks.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "modalForm", "initialValues"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "modalForm", "initialValues", "onFinish"];
 var ModalForm = (function (_ref) {
   var visible = _ref.visible,
     title = _ref.title,
     onCancel = _ref.onCancel,
     configData = _ref.configData,
-    infoRequest = _ref.infoRequest;
-    _ref.request;
-    var _afterClose = _ref.afterClose,
+    infoRequest = _ref.infoRequest,
+    request = _ref.request,
+    _afterClose = _ref.afterClose,
     modalForm = _ref.modalForm,
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    onFinish = _ref.onFinish,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(modalForm);
   var _useModifyProps = hooks.useModifyProps({
@@ -39,19 +42,46 @@ var ModalForm = (function (_ref) {
     }
     setModalVisible(false);
   };
+  var _useSub = hooks.useSub({
+      request: request,
+      onFinish: onFinish
+    }),
+    loading = _useSub.loading,
+    run = _useSub.run;
   return /*#__PURE__*/React.createElement(antd.Modal, _extends({
     title: title,
     visible: modalVisible,
     onCancel: cancel,
+    confirmLoading: loading,
     afterClose: function afterClose() {
       currentForm.resetFields();
       _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
     }
   }, props, {
+    onOk: currentForm.submit,
     destroyOnClose: true
   }), /*#__PURE__*/React.createElement(index.default, _extends({
     configData: modalFormData,
-    initialValues: initValue
+    initialValues: initValue,
+    onFinish: /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return run(values);
+            case 2:
+              setModalVisible(false);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }()
   }, props, {
     form: currentForm,
     infoRequest: infoRequest

package/lib/{ModalForm → DiaLogForm}/hooks.d.ts

@@ -1,12 +1,15 @@
 /// <reference types="react" />
-import type { HModalFormInstance, ModifyPropsModal } from "@/components/ModalForm/modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, modalForm, }: ModifyPropsModal) => {
+import type { HModalFormInstance, ModifyPropsModal } from "@/components/DiaLogForm/modal";
+import type { ModalFormProps } from "@/components/DiaLogForm/modal";
+export declare const useModifyProps: ({ visible, configData, initialValues, modalForm, afterClose, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
     setModalFormData: import("react").Dispatch<import("react").SetStateAction<import("../Form/modal").HItemProps[]>>;
     initValue: Record<string, any> | undefined;
     setInitValue: import("react").Dispatch<import("react").SetStateAction<Record<string, any> | undefined>>;
+    onAfterClose: () => void;
 };
 export declare const useHModalForm: () => HModalFormInstance;
 export declare const useCurrentForm: (hModalForm?: HModalFormInstance) => HModalFormInstance;
+export declare const useSub: ({ request, onFinish }: Partial<ModalFormProps>) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [values: any]>;

package/lib/{ModalForm → DiaLogForm}/hooks.js

@@ -1,5 +1,10 @@
 'use strict';
 
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var _setTimeout = require('@babel/runtime-corejs3/core-js/set-timeout');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
@@ -8,18 +13,18 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var React = require('react');
 var useHForm = require('../Form/hooks/useHForm.js');
+var ahooks = require('ahooks');
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useModifyProps = function useModifyProps(_ref) {
   var visible = _ref.visible,
     configData = _ref.configData,
     initialValues = _ref.initialValues,
-    modalForm = _ref.modalForm;
+    modalForm = _ref.modalForm,
+    afterClose = _ref.afterClose;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -32,6 +37,12 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     initValue = _useState6[0],
     setInitValue = _useState6[1];
+  var onAfterClose = function onAfterClose() {
+    _setTimeout(function () {
+      modalForm.resetFields();
+      afterClose === null || afterClose === void 0 ? void 0 : afterClose();
+    }, 0);
+  };
   React.useEffect(function () {
     setModalVisible(visible);
   }, [visible]);
@@ -50,15 +61,17 @@ var useModifyProps = function useModifyProps(_ref) {
     };
     modalForm.hide = function () {
       setModalVisible(false);
+      onAfterClose();
     };
-  }, []);
+  }, [afterClose]);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,
     setModalVisible: setModalVisible,
     setModalFormData: setModalFormData,
     initValue: initValue,
-    setInitValue: setInitValue
+    setInitValue: setInitValue,
+    onAfterClose: onAfterClose
   };
 };
 var useHModalForm = function useHModalForm() {
@@ -74,8 +87,41 @@ var useCurrentForm = function useCurrentForm(hModalForm) {
   var defaultHModalForm = useHModalForm();
   return hModalForm || defaultHModalForm;
 };
+var useSub = function useSub(_ref3) {
+  var request = _ref3.request,
+    onFinish = _ref3.onFinish;
+  return ahooks.useRequest( /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!onFinish) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", onFinish(values));
+          case 2:
+            if (!request) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", request(values));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }(), {
+    manual: true
+  });
+};
 
 exports.useCurrentForm = useCurrentForm;
 exports.useHModalForm = useHModalForm;
 exports.useModifyProps = useModifyProps;
+exports.useSub = useSub;
 // powered by h

package/lib/{ModalForm → DiaLogForm}/modal.d.ts

@@ -1,12 +1,14 @@
 import type { HFormProps } from "@/components/Form/modal";
 import type { ModalProps } from "antd";
 import type { HFormInstance, HItemProps } from "@/components/Form/modal";
+import type { PromiseFnResult } from "@/components/modal";
 type RootProps = HFormProps & ModalProps;
 export interface ModifyPropsModal {
     configData: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
     modalForm: HModalFormInstance;
+    afterClose?: VoidFunction;
 }
 export interface ShowParamsModal {
     configData?: HItemProps[];
@@ -17,7 +19,8 @@ export interface HModalFormInstance extends HFormInstance {
     show: (data: ShowParamsModal) => void;
     hide: VoidFunction;
 }
-export interface ModalFormProps extends RootProps {
+export interface ModalFormProps extends Omit<RootProps, "onFinish"> {
     modalForm?: HModalFormInstance;
+    onFinish?: PromiseFnResult;
 }
 export {};

package/lib/Form/HFormConnect.d.ts

@@ -1,6 +1,5 @@
 import type { HFormItemProps } from "@/components/Form/modal";
 import React from "react";
 import type { ConnectConfigModal } from "@/components/Form/modal";
-import type { ConnectResultProps } from "@/components/Form/modal";
-declare const _default: (Component: React.FunctionComponent | React.ComponentClass, config?: ConnectConfigModal) => (props: HFormItemProps) => React.ReactElement<ConnectResultProps, string | React.JSXElementConstructor<any>>;
+declare const _default: (component: React.FunctionComponent | React.ComponentClass | React.ForwardRefRenderFunction<any, any>, config?: ConnectConfigModal) => React.ForwardRefExoticComponent<HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/lib/Form/HFormConnect.js

@@ -2,20 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
-var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
-var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
-var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
-var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
-var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _extends = require('@babel/runtime-corejs3/helpers/extends');
 var index = require('./Context/index.js');
 var React = require('react');
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var formatMaker = function formatMaker(itemProps, formats) {
   if (!formats) {
     return formats;
@@ -31,11 +21,11 @@ var formatMaker = function formatMaker(itemProps, formats) {
     }
   };
 };
-var HFormConnect = (function (Component) {
+var HFormConnect = (function (component) {
   var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _config$format = config.format,
     format = _config$format === void 0 ? {} : _config$format;
-  return function (props) {
+  var Index = function Index(props, ref) {
     var _props$name = props.name,
       name = _props$name === void 0 ? "" : _props$name;
     var _useFormContext = index.useFormContext(),
@@ -54,11 +44,14 @@ var HFormConnect = (function (Component) {
         name: name
       }, fn);
     };
-    return /*#__PURE__*/React.createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
+    var Component = component;
+    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
       addFormat: addFormat,
-      addDispatchListener: addDispatchListener
+      addDispatchListener: addDispatchListener,
+      ref: ref
     }));
   };
+  return /*#__PURE__*/React.forwardRef(Index);
 });
 
 exports.default = HFormConnect;