@hw-component/form 0.0.2-bate → 0.0.2-beta-v1

package/es/Upload/hooks/customRequest.js

@@ -1,14 +1,90 @@
 // welcome to hoo hoo hoo
+import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
+import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js/object/get-own-property-symbols';
+import _Object$getOwnPropertyDescriptor from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptor';
+import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptors';
+import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/define-properties';
+import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
-import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
+import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { useMemo, useEffect } from 'react';
+import { message } from 'antd';
 
-var useCustomRequest = function useCustomRequest(_ref) {
-  var value = _ref.value,
-    request = _ref.request,
-    onChange = _ref.onChange;
+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 _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+var subReq = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+    var request, file, _yield$request, url;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          request = _ref.request, file = _ref.file;
+          if (request) {
+            _context.next = 3;
+            break;
+          }
+          return _context.abrupt("return", {
+            url: "",
+            status: "done"
+          });
+        case 3:
+          _context.prev = 3;
+          _context.next = 6;
+          return request(file);
+        case 6:
+          _yield$request = _context.sent;
+          url = _yield$request.url;
+          return _context.abrupt("return", {
+            url: url,
+            status: "done"
+          });
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](3);
+          message.error(_context.t0.message);
+          return _context.abrupt("return", {
+            url: "",
+            status: "error"
+          });
+        case 15:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[3, 11]]);
+  }));
+  return function subReq(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var fileListProvider = function fileListProvider(changeFile, files) {
+  var status = changeFile.status,
+    url = changeFile.url,
+    uid = changeFile.uid;
+  if (status === "error") {
+    return files === null || files === void 0 ? void 0 : _filterInstanceProperty(files).call(files, function (item) {
+      return item.uid !== uid;
+    });
+  }
+  return files === null || files === void 0 ? void 0 : _mapInstanceProperty(files).call(files, function (item) {
+    var resultUrl = url || item.thumbUrl;
+    if (item.uid === uid) {
+      item.status = status;
+      item.response = {
+        url: resultUrl
+      };
+      return item;
+    }
+    return item;
+  });
+};
+var useCustomRequest = function useCustomRequest(_ref3) {
+  var value = _ref3.value,
+    request = _ref3.request,
+    onChange = _ref3.onChange;
   var valObj = useMemo(function () {
     return {
       value: value
@@ -18,44 +94,31 @@ var useCustomRequest = function useCustomRequest(_ref) {
     valObj.value = value;
   }, [value]);
   var sendFile = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file) {
-      var _valObj$value;
-      var uid, url, result, fileList;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(file) {
+      var uid, result, fileList;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             uid = file.uid;
-            url = "";
-            if (!request) {
-              _context.next = 7;
-              break;
-            }
-            _context.next = 5;
-            return request(file);
-          case 5:
-            result = _context.sent;
-            url = result.url;
-          case 7:
-            fileList = valObj === null || valObj === void 0 ? void 0 : (_valObj$value = valObj.value) === null || _valObj$value === void 0 ? void 0 : _mapInstanceProperty(_valObj$value).call(_valObj$value, function (item) {
-              var resultUrl = url || item.thumbUrl;
-              if (item.uid === uid) {
-                item.status = "done";
-                item.response = {
-                  url: resultUrl
-                };
-                return item;
-              }
-              return item;
+            _context2.next = 3;
+            return subReq({
+              request: request,
+              file: file
             });
+          case 3:
+            result = _context2.sent;
+            fileList = fileListProvider(_objectSpread(_objectSpread({}, result), {}, {
+              uid: uid
+            }), valObj.value);
             onChange === null || onChange === void 0 ? void 0 : onChange(fileList || []);
-          case 9:
+          case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function sendFile(_x) {
-      return _ref2.apply(this, arguments);
+    return function sendFile(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
   return function (fileList) {

package/es/Upload/index.d.ts

@@ -1,4 +1,3 @@
 import React from "react";
-import type { IUpLoadProps, IUploadRefModal } from "./modal";
-declare const _default: React.ForwardRefExoticComponent<IUpLoadProps & React.RefAttributes<IUploadRefModal>>;
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

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/config.js

@@ -10,12 +10,12 @@ var baseConfig = {
     value: "value"
   },
   valueCheckMap: {
-    checked: true,
-    noChecked: false
+    checked: 1,
+    noChecked: 0
   },
   valueSwitchMap: {
-    open: true,
-    close: false
+    open: 1,
+    close: 0
   },
   valueRangePickerValueMap: {
     start: function start(name) {

package/es/index.css

@@ -10,7 +10,7 @@
 .ant-hw-form-item-colon:after {
   position: relative;
   top: -0.5px;
-  margin: 0 8px 0 2px;
+  margin: 0 0 0 2px;
   content: ":";
 }
 .ant-hw-form-item-required:before {

package/es/index.d.ts

@@ -2,19 +2,23 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
+export { useHDialogForm } 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: ({ selectProps, value, onChange, valueName, ...props }: import("./Input/modal").HSelectInputProps) => JSX.Element;
-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<any>>;
+export declare const HUpload: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 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<any>>;
 export declare const HDatePicker: ({ value, onChange, showTime, format, ...props }: import("./TDPicker/modal").HDatePickerProps) => JSX.Element;
-export declare const HRangePicker: ({ value, onChange, showTime, format, valueMap, ranges, name, ...props }: import("./TDPicker/modal").HRangePickerProps) => JSX.Element;
+export declare const HRangePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 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 HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;

package/es/index.js

@@ -3,6 +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 { useHDialogForm } 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;
@@ -20,6 +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, 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/CheckboxGroup/index.js

@@ -53,7 +53,8 @@ var Index = function Index(_ref) {
   addFormat === null || addFormat === void 0 ? void 0 : addFormat({
     "float": {
       inputValue: function inputValue(item, initValue) {
-        var name = item.name;
+        var _item$name = item.name,
+          name = _item$name === void 0 ? "" : _item$name;
         var keys = checkOptions === null || checkOptions === void 0 ? void 0 : _mapInstanceProperty(checkOptions).call(checkOptions, function (optItem) {
           return optItem.value;
         });
@@ -64,7 +65,8 @@ var Index = function Index(_ref) {
         return _defineProperty({}, name, resultObj);
       },
       outputValue: function outputValue(item, _outputValue) {
-        var name = item.name;
+        var _item$name2 = item.name,
+          name = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$name = _outputValue[name],
           itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
         return _objectSpread({}, itemVal);

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

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { DialogFormProps } from "../modal";
+declare const _default: ({ onCancel, onOk, confirmLoading, }: Omit<DialogFormProps, "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 { DialogFormProps } from "../modal";
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: DialogFormProps) => 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", "dialogForm", "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 dialogForm = _ref.dialogForm,
+    _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(dialogForm);
+  var _useModifyProps = hooks.useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues,
+      dialogForm: 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 { DialogFormProps } from "./modal";
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, ...props }: DialogFormProps) => JSX.Element;
+export default _default;

package/lib/DialogForm/ModalForm.js

@@ -0,0 +1,92 @@
+'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 index = require('../Form/index.js');
+var hooks = require('./hooks.js');
+
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish"];
+var ModalForm = (function (_ref) {
+  var visible = _ref.visible,
+    title = _ref.title,
+    onCancel = _ref.onCancel,
+    configData = _ref.configData,
+    infoRequest = _ref.infoRequest,
+    request = _ref.request,
+    _afterClose = _ref.afterClose,
+    dialogForm = _ref.dialogForm,
+    _ref$initialValues = _ref.initialValues,
+    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    onFinish = _ref.onFinish,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = hooks.useCurrentForm(dialogForm);
+  var _useModifyProps = hooks.useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues,
+      dialogForm: currentForm
+    }),
+    modalVisible = _useModifyProps.modalVisible,
+    modalFormData = _useModifyProps.modalFormData,
+    setModalVisible = _useModifyProps.setModalVisible,
+    initValue = _useModifyProps.initValue;
+  var cancel = function cancel(e) {
+    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;
+  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,
+    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
+  })));
+});
+
+exports.default = ModalForm;
+// powered by h