@hw-component/form 0.0.4 → 0.0.5-beta-v2

package/es/CheckboxGroup/CheckBox/index.d.ts

@@ -1,7 +1,4 @@
-import type { CheckboxProps } from "antd/lib/checkbox/Checkbox";
 import React from "react";
-interface IProps extends CheckboxProps {
-    valueCheckMap?: ValueCheckMapModal;
-}
-declare const Index: React.FC<IProps>;
+import type { HCheckboxProps } from "@/components/CheckboxGroup/modal";
+declare const Index: React.FC<HCheckboxProps>;
 export default Index;

package/es/CheckboxGroup/CheckBox/index.js

@@ -1,14 +1,19 @@
-// welcome to ww-building-blocks-tmp
+// welcome to hoo hoo hoo
+import { jsx } from 'react/jsx-runtime';
 import { Checkbox } from 'antd';
-import React, { useMemo } from 'react';
-import { baseConfig } from '../../config.js';
+import { useMemo } from 'react';
+import { useMatchConfigProps } from '../../hooks/index.js';
 
 var Index = function Index(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     children = _ref.children,
-    _ref$valueCheckMap = _ref.valueCheckMap,
-    valueCheckMap = _ref$valueCheckMap === void 0 ? baseConfig.defaultValueCheckMap : _ref$valueCheckMap;
+    propsValueCheckMap = _ref.valueMap;
+  var _useMatchConfigProps = useMatchConfigProps({
+      valueCheckMap: propsValueCheckMap
+    }),
+    _useMatchConfigProps$ = _useMatchConfigProps.valueCheckMap,
+    valueCheckMap = _useMatchConfigProps$ === void 0 ? {} : _useMatchConfigProps$;
   var checkedVal = useMemo(function () {
     var checked = valueCheckMap.checked;
     if (value === checked) {
@@ -24,13 +29,14 @@ var Index = function Index(_ref) {
     if (!val) {
       subVal = noChecked;
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(subVal);
+    onChange === null || onChange === void 0 || onChange(subVal);
   };
-  return /*#__PURE__*/React.createElement(Checkbox, {
+  return jsx(Checkbox, {
     checked: checkedVal,
-    onChange: change
-  }, children);
+    onChange: change,
+    children: children
+  });
 };
 
 export { Index as default };
-// powered by ww
+// powered by hdj

package/es/CheckboxGroup/hooks.d.ts

@@ -1,5 +1,5 @@
 import type { HCheckboxProps } from "@/components/CheckboxGroup/modal";
-export declare const useValueProvider: ({ value, valueCheckMap, keyInValue, onChange, options, }: HCheckboxProps) => {
+export declare const useValueProvider: ({ value, valueMap, keyInValue, onChange, options, }: HCheckboxProps) => {
     val: Record<any, any>;
     change: (key: any, changeVal: any) => void;
 };

package/es/CheckboxGroup/hooks.js

@@ -1,29 +1,28 @@
-// welcome to ww-building-blocks-tmp
-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 _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
-import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
-import _Array$isArray from '@babel/runtime-corejs3/core-js/array/is-array';
-import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
+// welcome to hoo hoo hoo
+import 'core-js/modules/es6.symbol.js';
+import 'core-js/modules/es6.object.get-own-property-descriptor.js';
+import 'core-js/modules/es7.object.get-own-property-descriptors.js';
+import 'core-js/modules/es6.object.define-properties.js';
+import 'core-js/modules/es6.object.define-property.js';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import 'core-js/modules/es6.array.for-each.js';
+import 'core-js/modules/es6.object.keys.js';
+import 'core-js/modules/es6.array.is-array.js';
+import 'core-js/modules/es6.array.filter.js';
 import { useState, useMemo, useEffect } from 'react';
-import { baseConfig } from '../config.js';
 
-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 _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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var changValProvider = function changValProvider(_ref) {
   var value = _ref.value,
     options = _ref.options,
-    _ref$valueCheckMap = _ref.valueCheckMap,
-    valueCheckMap = _ref$valueCheckMap === void 0 ? baseConfig.defaultValueCheckMap : _ref$valueCheckMap;
+    _ref$valueMap = _ref.valueMap,
+    valueMap = _ref$valueMap === void 0 ? {} : _ref$valueMap;
   var newVal = _objectSpread({}, value);
-  var checked = valueCheckMap.checked,
-    noChecked = valueCheckMap.noChecked;
-  options === null || options === void 0 ? void 0 : _forEachInstanceProperty(options).call(options, function (item) {
+  var checked = valueMap.checked,
+    noChecked = valueMap.noChecked;
+  options === null || options === void 0 || options.forEach(function (item) {
     var itemVal = item.value;
     if (newVal[itemVal] !== checked) {
       newVal[itemVal] = noChecked;
@@ -33,8 +32,8 @@ var changValProvider = function changValProvider(_ref) {
 };
 var useValueProvider = function useValueProvider(_ref2) {
   var value = _ref2.value,
-    _ref2$valueCheckMap = _ref2.valueCheckMap,
-    valueCheckMap = _ref2$valueCheckMap === void 0 ? baseConfig.defaultValueCheckMap : _ref2$valueCheckMap,
+    _ref2$valueMap = _ref2.valueMap,
+    valueMap = _ref2$valueMap === void 0 ? {} : _ref2$valueMap,
     _ref2$keyInValue = _ref2.keyInValue,
     keyInValue = _ref2$keyInValue === void 0 ? true : _ref2$keyInValue,
     onChange = _ref2.onChange,
@@ -45,7 +44,7 @@ var useValueProvider = function useValueProvider(_ref2) {
     setVal = _useState2[1];
   var oldValueCheckMap = useMemo(function () {
     return {
-      valueCheckMap: valueCheckMap
+      valueMap: valueMap
     };
   }, []);
   useEffect(function () {
@@ -53,49 +52,48 @@ var useValueProvider = function useValueProvider(_ref2) {
       return changValProvider({
         value: oldVal,
         options: options,
-        valueCheckMap: oldValueCheckMap.valueCheckMap
+        valueMap: oldValueCheckMap.valueMap
       });
     });
   }, [options]);
   useEffect(function () {
-    var oldChecked = oldValueCheckMap.valueCheckMap.checked;
-    var checked = valueCheckMap.checked,
-      noChecked = valueCheckMap.noChecked;
+    var oldChecked = oldValueCheckMap.valueMap.checked;
+    var checked = valueMap.checked,
+      noChecked = valueMap.noChecked;
     setVal(function (oldVal) {
       var newVal = _objectSpread({}, oldVal);
-      var keys = _Object$keys(newVal);
-      _forEachInstanceProperty(keys).call(keys, function (key) {
+      var keys = Object.keys(newVal);
+      keys.forEach(function (key) {
         if (newVal[key] === oldChecked) {
           newVal[key] = checked;
           return;
         }
         newVal[key] = noChecked;
       });
-      oldValueCheckMap.valueCheckMap = valueCheckMap;
+      oldValueCheckMap.valueMap = valueMap;
       return newVal;
     });
-  }, [valueCheckMap]);
+  }, [valueMap]);
   useEffect(function () {
-    var checked = oldValueCheckMap.valueCheckMap.checked;
+    var checked = oldValueCheckMap.valueMap.checked;
     if (!value) {
       return;
     }
-    if (!_Array$isArray(value)) {
+    if (!Array.isArray(value)) {
       setVal(value);
       return;
     }
     setVal(function (oldVal) {
       var newVal = _objectSpread({}, oldVal);
-      _forEachInstanceProperty(value).call(value, function (itemVal) {
+      value.forEach(function (itemVal) {
         newVal[itemVal] = checked;
       });
       return newVal;
     });
   }, [value]);
   var change = function change(key, changeVal) {
-    var _context;
-    var checked = valueCheckMap.checked,
-      noChecked = valueCheckMap.noChecked;
+    var checked = valueMap.checked,
+      noChecked = valueMap.noChecked;
     var newVal = _objectSpread({}, val);
     newVal[key] = noChecked;
     if (changeVal === checked) {
@@ -109,7 +107,7 @@ var useValueProvider = function useValueProvider(_ref2) {
       onChange(newVal);
       return;
     }
-    var subVal = _filterInstanceProperty(_context = _Object$keys(newVal)).call(_context, function (valKey) {
+    var subVal = Object.keys(newVal).filter(function (valKey) {
       return newVal[valKey] === checked;
     });
     onChange(subVal);
@@ -121,4 +119,4 @@ var useValueProvider = function useValueProvider(_ref2) {
 };
 
 export { useValueProvider };
-// powered by ww
+// powered by hdj

package/es/CheckboxGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
-import type { HCheckboxProps } from "@/components/CheckboxGroup/modal";
-declare const _default: ({ options, fieldNames, onChange, valueCheckMap, value, disabled, keyInValue, }: HCheckboxProps) => JSX.Element;
+import React from "react";
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/es/CheckboxGroup/index.js

@@ -1,49 +1,94 @@
-// welcome to ww-building-blocks-tmp
-import React from 'react';
-import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
+// welcome to hoo hoo hoo
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import 'core-js/modules/es6.function.name.js';
+import 'core-js/modules/es6.array.map.js';
+import 'core-js/modules/es6.array.for-each.js';
+import 'core-js/modules/es6.object.keys.js';
+import 'core-js/modules/es6.symbol.js';
+import 'core-js/modules/es6.array.filter.js';
+import 'core-js/modules/es6.object.get-own-property-descriptor.js';
+import 'core-js/modules/es7.object.get-own-property-descriptors.js';
+import 'core-js/modules/es6.object.define-properties.js';
+import 'core-js/modules/es6.object.define-property.js';
+import { jsx } from 'react/jsx-runtime';
 import { Space } from 'antd';
-import { useChangeOptions } from '../hooks/useChangeOptions.js';
 import { useValueProvider } from './hooks.js';
-import Index from './CheckBox/index.js';
+import Index$1 from './CheckBox/index.js';
+import { useMatchConfigProps, useChangeOptions } from '../hooks/index.js';
+import HFormConnect from '../Form/HFormConnect.js';
 
-var index = (function (_ref) {
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var Index = function Index(_ref) {
   var options = _ref.options,
     fieldNames = _ref.fieldNames,
     onChange = _ref.onChange,
-    valueCheckMap = _ref.valueCheckMap,
+    valueMap = _ref.valueMap,
     value = _ref.value,
     disabled = _ref.disabled,
     _ref$keyInValue = _ref.keyInValue,
-    keyInValue = _ref$keyInValue === void 0 ? true : _ref$keyInValue;
+    keyInValue = _ref$keyInValue === void 0 ? true : _ref$keyInValue,
+    addFormat = _ref.addFormat;
+  var _useMatchConfigProps = useMatchConfigProps({
+      fieldNames: fieldNames,
+      valueCheckMap: valueMap
+    }),
+    resultValueCheckMap = _useMatchConfigProps.valueCheckMap,
+    resultFieldNames = _useMatchConfigProps.fieldNames;
   var checkOptions = useChangeOptions({
     options: options,
-    fieldNames: fieldNames
+    fieldNames: resultFieldNames
   });
   var _useValueProvider = useValueProvider({
       options: checkOptions,
       onChange: onChange,
-      valueCheckMap: valueCheckMap,
+      valueMap: resultValueCheckMap,
       keyInValue: keyInValue,
       value: value
     }),
     val = _useValueProvider.val,
     change = _useValueProvider.change;
-  console.log(val);
-  return /*#__PURE__*/React.createElement(Space, null, checkOptions === null || checkOptions === void 0 ? void 0 : _mapInstanceProperty(checkOptions).call(checkOptions, function (item) {
-    var label = item.label,
-      itemVal = item.value;
-    var checked = val[itemVal];
-    return /*#__PURE__*/React.createElement(Index, {
-      value: checked,
-      key: itemVal,
-      onChange: function onChange(changeVal) {
-        change(itemVal, changeVal);
+  addFormat === null || addFormat === void 0 || addFormat({
+    "float": {
+      inputValue: function inputValue(item, initValue) {
+        var _item$name = item.name,
+          name = _item$name === void 0 ? "" : _item$name;
+        var keys = checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (optItem) {
+          return optItem.value;
+        });
+        var resultObj = {};
+        keys === null || keys === void 0 || keys.forEach(function (key) {
+          resultObj[key] = initValue[key];
+        });
+        return _defineProperty({}, name, resultObj);
       },
-      valueCheckMap: valueCheckMap,
-      disabled: disabled
-    }, label);
-  }));
-});
+      outputValue: function outputValue(item, _outputValue) {
+        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);
+      }
+    }
+  });
+  return jsx(Space, {
+    children: checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (item) {
+      var label = item.label,
+        itemVal = item.value;
+      var checked = val[itemVal];
+      return jsx(Index$1, {
+        value: checked,
+        onChange: function onChange(changeVal) {
+          change(itemVal, changeVal);
+        },
+        valueMap: valueMap,
+        disabled: disabled,
+        children: label
+      }, itemVal);
+    })
+  });
+};
+var HCheckboxGroup = HFormConnect(Index);
 
-export { index as default };
-// powered by ww
+export { HCheckboxGroup as default };
+// powered by hdj

package/es/CheckboxGroup/modal.d.ts

@@ -0,0 +1,13 @@
+import type { CheckboxProps } from "antd/lib/checkbox/Checkbox";
+import type { SelectProps } from "antd";
+import type { addFormatItemModal } from "../Form/modal";
+import type { ValueCheckMapModal } from "../modal";
+export interface HCheckboxProps extends Omit<CheckboxProps, "value" | "onChange"> {
+    options?: Record<string, any>[];
+    fieldNames?: SelectProps["fieldNames"];
+    valueMap?: ValueCheckMapModal;
+    keyInValue?: boolean;
+    value?: Record<string, any> | any[];
+    onChange?: (value: Record<string, any> | any[]) => void;
+    addFormat?: (config: Record<string, addFormatItemModal>) => void;
+}

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

@@ -0,0 +1,7 @@
+interface IProps {
+    onOk?: VoidFunction;
+    onCancel?: VoidFunction;
+    confirmLoading?: boolean;
+}
+declare const _default: ({ onCancel, onOk, confirmLoading }: IProps) => JSX.Element;
+export default _default;

package/es/DialogForm/DrawerForm/Footer.js

@@ -0,0 +1,27 @@
+// welcome to hoo hoo hoo
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { Row, Space, Button } from 'antd';
+
+var Footer = (function (_ref) {
+  var onCancel = _ref.onCancel,
+    onOk = _ref.onOk,
+    confirmLoading = _ref.confirmLoading;
+  return jsx(Row, {
+    justify: "end",
+    children: jsxs(Space, {
+      size: "middle",
+      children: [jsx(Button, {
+        onClick: onCancel,
+        children: "\u5173\u95ED"
+      }), jsx(Button, {
+        type: "primary",
+        onClick: onOk,
+        loading: confirmLoading,
+        children: "\u786E\u5B9A"
+      })]
+    })
+  });
+});
+
+export { Footer as default };
+// powered by hdj

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

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

package/es/DialogForm/DrawerForm/Title.js

@@ -0,0 +1,21 @@
+// welcome to hoo hoo hoo
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { Row } from 'antd';
+import { CloseOutlined } from '@ant-design/icons';
+
+var Title = (function (_ref) {
+  var title = _ref.title,
+    closable = _ref.closable,
+    onCancel = _ref.onCancel;
+  return jsxs(Row, {
+    justify: "space-between",
+    children: [jsx("div", {
+      children: title
+    }), closable && jsx(CloseOutlined, {
+      onClick: onCancel
+    })]
+  });
+});
+
+export { Title as default };
+// powered by hdj

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

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

package/es/DialogForm/DrawerForm/index.js

@@ -0,0 +1,138 @@
+// welcome to hoo hoo hoo
+import 'core-js/modules/es6.object.keys.js';
+import 'core-js/modules/es6.symbol.js';
+import 'core-js/modules/es6.array.filter.js';
+import 'core-js/modules/es6.object.get-own-property-descriptor.js';
+import 'core-js/modules/es6.array.for-each.js';
+import 'core-js/modules/es7.object.get-own-property-descriptors.js';
+import 'core-js/modules/es6.object.define-properties.js';
+import 'core-js/modules/es6.object.define-property.js';
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import _regeneratorRuntime from '@babel/runtime/regenerator';
+import { jsx } from 'react/jsx-runtime';
+import { Drawer } from 'antd';
+import { useCurrentForm, useModifyProps, useSub } from '../hooks.js';
+import HForm from '../../Form/index.js';
+import Title from './Title.js';
+import Footer from './Footer.js';
+
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var DrawerForm = (function (_ref) {
+  var 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,
+    onOk = _ref.onOk,
+    onFinish = _ref.onFinish;
+    _ref.size;
+    _ref.form;
+    var footer = _ref.footer,
+    params = _ref.params,
+    onValuesChange = _ref.onValuesChange,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = useCurrentForm(dialogForm);
+  var _useModifyProps = useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues,
+      dialogForm: currentForm,
+      params: params
+    }),
+    modalVisible = _useModifyProps.modalVisible,
+    modalFormData = _useModifyProps.modalFormData,
+    setModalVisible = _useModifyProps.setModalVisible,
+    initValue = _useModifyProps.initValue,
+    onAfterClose = _useModifyProps.onAfterClose,
+    formParams = _useModifyProps.formParams;
+  var cancel = function cancel() {
+    onAfterClose();
+    if (onCancel) {
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+    }
+    setModalVisible(false);
+  };
+  var _useSub = useSub({
+      request: request,
+      onFinish: onFinish
+    }),
+    loading = _useSub.loading,
+    run = _useSub.run;
+  var footerComponent = function footerComponent() {
+    if (footer === null) {
+      return null;
+    }
+    return footer || jsx(Footer, {
+      onCancel: cancel,
+      onOk: currentForm.submit,
+      confirmLoading: loading
+    });
+  };
+  return jsx(Drawer, _objectSpread(_objectSpread({
+    visible: modalVisible,
+    title: jsx(Title, {
+      title: title,
+      closable: closable,
+      onCancel: cancel
+    })
+  }, props), {}, {
+    onClose: cancel,
+    closable: false,
+    destroyOnClose: true,
+    footer: footerComponent(),
+    children: 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;
+      }(),
+      infoRequest: infoRequest,
+      labelWidth: labelWidth
+    }))
+  }));
+});
+
+export { DrawerForm as default };
+// powered by hdj

package/es/DialogForm/ModalForm.d.ts

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