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

package/lib/CheckboxGroup/hooks.js

@@ -12,18 +12,17 @@ var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js/array/is-array');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
 var React = require('react');
-var config = require('../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; }
 var changValProvider = function changValProvider(_ref) {
   var value = _ref.value,
     options = _ref.options,
-    _ref$valueCheckMap = _ref.valueCheckMap,
-    valueCheckMap = _ref$valueCheckMap === void 0 ? config.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;
+  var checked = valueMap.checked,
+    noChecked = valueMap.noChecked;
   options === null || options === void 0 ? void 0 : _forEachInstanceProperty(options).call(options, function (item) {
     var itemVal = item.value;
     if (newVal[itemVal] !== checked) {
@@ -34,8 +33,8 @@ var changValProvider = function changValProvider(_ref) {
 };
 var useValueProvider = function useValueProvider(_ref2) {
   var value = _ref2.value,
-    _ref2$valueCheckMap = _ref2.valueCheckMap,
-    valueCheckMap = _ref2$valueCheckMap === void 0 ? config.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,
@@ -46,7 +45,7 @@ var useValueProvider = function useValueProvider(_ref2) {
     setVal = _useState2[1];
   var oldValueCheckMap = React.useMemo(function () {
     return {
-      valueCheckMap: valueCheckMap
+      valueMap: valueMap
     };
   }, []);
   React.useEffect(function () {
@@ -54,14 +53,14 @@ var useValueProvider = function useValueProvider(_ref2) {
       return changValProvider({
         value: oldVal,
         options: options,
-        valueCheckMap: oldValueCheckMap.valueCheckMap
+        valueMap: oldValueCheckMap.valueMap
       });
     });
   }, [options]);
   React.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);
@@ -72,12 +71,12 @@ var useValueProvider = function useValueProvider(_ref2) {
         }
         newVal[key] = noChecked;
       });
-      oldValueCheckMap.valueCheckMap = valueCheckMap;
+      oldValueCheckMap.valueMap = valueMap;
       return newVal;
     });
-  }, [valueCheckMap]);
+  }, [valueMap]);
   React.useEffect(function () {
-    var checked = oldValueCheckMap.valueCheckMap.checked;
+    var checked = oldValueCheckMap.valueMap.checked;
     if (!value) {
       return;
     }
@@ -95,8 +94,8 @@ var useValueProvider = function useValueProvider(_ref2) {
   }, [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) {

package/lib/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/lib/CheckboxGroup/index.js

@@ -2,51 +2,95 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+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 _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 jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
-var useChangeOptions = require('../hooks/useChangeOptions.js');
 var hooks = require('./hooks.js');
 var index$1 = require('./CheckBox/index.js');
+var index = require('../hooks/index.js');
+var HFormConnect = require('../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 = _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) {
   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;
-  var checkOptions = useChangeOptions.useChangeOptions({
+    keyInValue = _ref$keyInValue === void 0 ? true : _ref$keyInValue,
+    addFormat = _ref.addFormat;
+  var _useMatchConfigProps = index.useMatchConfigProps({
+      fieldNames: fieldNames,
+      valueCheckMap: valueMap
+    }),
+    resultValueCheckMap = _useMatchConfigProps.valueCheckMap,
+    resultFieldNames = _useMatchConfigProps.fieldNames;
+  var checkOptions = index.useChangeOptions({
     options: options,
-    fieldNames: fieldNames
+    fieldNames: resultFieldNames
   });
   var _useValueProvider = hooks.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(antd.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$1.default, {
-      value: checked,
-      key: itemVal,
-      onChange: function onChange(changeVal) {
-        change(itemVal, changeVal);
+  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 keys = checkOptions === null || checkOptions === void 0 ? void 0 : _mapInstanceProperty(checkOptions).call(checkOptions, function (optItem) {
+          return optItem.value;
+        });
+        var resultObj = {};
+        keys === null || keys === void 0 ? void 0 : _forEachInstanceProperty(keys).call(keys, 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 jsxRuntime.jsx(antd.Space, {
+    children: 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 jsxRuntime.jsx(index$1.default, {
+        value: checked,
+        onChange: function onChange(changeVal) {
+          change(itemVal, changeVal);
+        },
+        valueMap: valueMap,
+        disabled: disabled,
+        children: label
+      }, itemVal);
+    })
+  });
+};
+var HCheckboxGroup = HFormConnect.default(Index);
 
-exports.default = index;
+exports.default = HCheckboxGroup;
 // powered by h

package/lib/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/lib/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/lib/DialogForm/DrawerForm/Footer.js

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

package/lib/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/lib/DialogForm/DrawerForm/Title.js

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+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 jsxRuntime.jsxs(antd.Row, {
+    justify: "space-between",
+    children: [jsxRuntime.jsx("div", {
+      children: title
+    }), closable && jsxRuntime.jsx(icons.CloseOutlined, {
+      onClick: onCancel
+    })]
+  });
+});
+
+exports.default = Title;
+// powered by h

package/lib/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/lib/DialogForm/DrawerForm/index.js

@@ -0,0 +1,141 @@
+'use strict';
+
+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 _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var jsxRuntime = require('react/jsx-runtime');
+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", "params", "onValuesChange"];
+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; }
+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 = hooks.useCurrentForm(dialogForm);
+  var _useModifyProps = hooks.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 = hooks.useSub({
+      request: request,
+      onFinish: onFinish
+    }),
+    loading = _useSub.loading,
+    run = _useSub.run;
+  var footerComponent = function footerComponent() {
+    if (footer === null) {
+      return null;
+    }
+    return footer || jsxRuntime.jsx(Footer.default, {
+      onCancel: cancel,
+      onOk: currentForm.submit,
+      confirmLoading: loading
+    });
+  };
+  return jsxRuntime.jsx(antd.Drawer, _objectSpread(_objectSpread({
+    visible: modalVisible,
+    title: jsxRuntime.jsx(Title.default, {
+      title: title,
+      closable: closable,
+      onCancel: cancel
+    })
+  }, props), {}, {
+    onClose: cancel,
+    closable: false,
+    destroyOnClose: true,
+    footer: footerComponent(),
+    children: jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+      configData: modalFormData,
+      initialValues: initValue,
+      onValuesChange: onValuesChange
+    }, props), {}, {
+      form: currentForm,
+      params: formParams,
+      onFinish: function () {
+        var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
+          var result, close;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return run(values, subParams);
+              case 2:
+                result = _context.sent;
+                close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
+                if (!(close === false)) {
+                  _context.next = 6;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 6:
+                cancel();
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function onFinish(_x, _x2) {
+          return _onFinish.apply(this, arguments);
+        }
+        return onFinish;
+      }(),
+      infoRequest: infoRequest,
+      labelWidth: labelWidth
+    }))
+  }));
+});
+
+exports.default = DrawerForm;
+// powered by h

package/lib/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;

package/lib/DialogForm/ModalForm.js

@@ -0,0 +1,122 @@
+'use strict';
+
+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 _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var jsxRuntime = require('react/jsx-runtime');
+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", "params", "onOk", "onValuesChange"];
+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; }
+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,
+    params = _ref.params,
+    onOk = _ref.onOk,
+    onValuesChange = _ref.onValuesChange,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = hooks.useCurrentForm(dialogForm);
+  var _useModifyProps = hooks.useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues,
+      dialogForm: currentForm,
+      params: params,
+      title: title
+    }),
+    modalVisible = _useModifyProps.modalVisible,
+    modalFormData = _useModifyProps.modalFormData,
+    setModalVisible = _useModifyProps.setModalVisible,
+    initValue = _useModifyProps.initValue,
+    formParams = _useModifyProps.formParams,
+    modalTitle = _useModifyProps.title;
+  var cancel = function cancel() {
+    if (onCancel) {
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+    }
+    setModalVisible(false);
+  };
+  var _useSub = hooks.useSub({
+      request: request,
+      onFinish: onFinish
+    }),
+    loading = _useSub.loading,
+    run = _useSub.run;
+  return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
+    title: modalTitle,
+    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,
+    children: jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+      configData: modalFormData,
+      initialValues: initValue,
+      onValuesChange: onValuesChange,
+      onFinish: function () {
+        var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
+          var result, close;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return run(values, outParams);
+              case 2:
+                result = _context.sent;
+                close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
+                if (!(close === false)) {
+                  _context.next = 6;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 6:
+                cancel();
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function onFinish(_x, _x2) {
+          return _onFinish.apply(this, arguments);
+        }
+        return onFinish;
+      }()
+    }, props), {}, {
+      params: formParams,
+      form: currentForm,
+      infoRequest: infoRequest
+    }))
+  }));
+});
+
+exports.default = ModalForm;
+// powered by h

package/lib/DialogForm/hooks.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, }: 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;
+    formParams: any;
+    title: string | (string & import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) | (string & import("react").ReactNodeArray) | (string & import("react").ReactPortal) | undefined;
+};
+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]>;