@hw-component/form 0.0.1-bate → 0.0.1-beta-v2

package/es/ModalForm/index.js

@@ -0,0 +1,72 @@
+// welcome to hoo hoo hoo
+import React, { useEffect } from 'react';
+import _extends from '@babel/runtime-corejs3/helpers/extends';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import { Modal } from 'antd';
+import HForm from '../Form/index.js';
+import { useModifyProps, useCurrentForm } from './hooks.js';
+
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "modalForm", "initialValues"];
+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,
+    modalForm = _ref.modalForm,
+    _ref$initialValues = _ref.initialValues,
+    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useModifyProps = useModifyProps({
+      configData: configData,
+      visible: visible,
+      initialValues: initialValues
+    }),
+    modalVisible = _useModifyProps.modalVisible,
+    modalFormData = _useModifyProps.modalFormData,
+    setModalVisible = _useModifyProps.setModalVisible,
+    setModalFormData = _useModifyProps.setModalFormData,
+    initValue = _useModifyProps.initValue,
+    setInitValue = _useModifyProps.setInitValue;
+  var currentForm = useCurrentForm(modalForm);
+  useEffect(function () {
+    currentForm.show = function (_ref2) {
+      var changeConfigData = _ref2.configData,
+        changeInitialValues = _ref2.initialValues;
+      if (!!changeConfigData) {
+        setModalFormData(changeConfigData);
+      }
+      setInitValue(changeInitialValues);
+      setModalVisible(true);
+    };
+    currentForm.hide = function () {
+      setModalVisible(false);
+    };
+  }, []);
+  var cancel = function cancel(e) {
+    if (onCancel) {
+      return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
+    }
+    setModalVisible(false);
+  };
+  return /*#__PURE__*/React.createElement(Modal, _extends({
+    title: title,
+    visible: modalVisible,
+    onCancel: cancel,
+    afterClose: function afterClose() {
+      currentForm.resetFields();
+      _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
+    }
+  }, props), /*#__PURE__*/React.createElement(HForm, _extends({
+    configData: modalFormData,
+    initialValues: initValue
+  }, props, {
+    form: currentForm,
+    infoRequest: infoRequest
+  })));
+});
+
+export { ModalForm as default };
+// powered by hdj

package/es/ModalForm/modal.d.ts

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

package/es/Select/hooks/norHooks.d.ts

@@ -1,6 +1,6 @@
 import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
 export declare const useOptionReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, }: PartialHSelectProps) => {
-    run: (params?: any, type?: any) => Promise<any>;
+    run: (params?: any, type?: any) => Promise<OptionType[] | undefined>;
     loading: boolean;
     error: Error | undefined;
     data: OptionType[] | undefined;

package/es/TDPicker/RangePicker.js

@@ -1,5 +1,4 @@
 // 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 _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
 import _Object$getOwnPropertyDescriptor from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptor';
@@ -11,6 +10,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import _Object$values from '@babel/runtime-corejs3/core-js/object/values';
+import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
 import { DatePicker } from 'antd';
 import { useGetTimeKey, useRangeValueProvider, useRangePickerTimeVal } from './hooks.js';
@@ -67,15 +67,20 @@ var HRangePicker = function HRangePicker(_ref) {
     "float": {
       inputValue: function inputValue(item, initValue) {
         var _context;
-        var valueName = item.name;
+        var _item$name = item.name,
+          valueName = _item$name === void 0 ? "" : _item$name;
         var resultObj = {};
         _forEachInstanceProperty(_context = _Object$values(dateMapKeys)).call(_context, function (key) {
-          resultObj[key] = initValue[key];
+          if (initValue[key]) {
+            resultObj[key] = initValue[key];
+          }
         });
-        return _defineProperty({}, valueName, resultObj);
+        var hasKeys = _Object$keys(resultObj).length !== 0;
+        return _defineProperty({}, valueName, hasKeys ? resultObj : null);
       },
       outputValue: function outputValue(item, _outputValue) {
-        var valueName = item.name;
+        var _item$name2 = item.name,
+          valueName = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$valueNam = _outputValue[valueName],
           itemVal = _outputValue$valueNam === void 0 ? {} : _outputValue$valueNam;
         return _objectSpread({}, itemVal);

package/es/TextArea/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { TextAreaProps } from "antd/es/input";
 declare const _default: ({ autoSize, ...props }: TextAreaProps) => JSX.Element;
 export default _default;

package/es/index.d.ts

@@ -2,9 +2,10 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
+export { useHModalForm } from "./ModalForm/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 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 HUrlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("./Upload/modal").IUrlUploadProps) => JSX.Element;
 export declare const HButtonInput: import("react").FC<import("./Input/modal").HButtonInputProps>;
@@ -12,9 +13,10 @@ export declare const HCheckBox: import("react").FC<import("./CheckboxGroup/modal
 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 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: (props: import("./Form/modal").HFormItemProps) => import("react").ReactElement<import("./Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<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 HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, modalForm, initialValues, ...props }: import("./ModalForm/modal").ModalFormProps) => JSX.Element;

package/es/index.js

@@ -3,6 +3,8 @@ 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';
 
 var HSelect = FormConfig.select;
 var HInput = FormConfig.input;
@@ -20,6 +22,7 @@ var HTimePicker = FormConfig.timePicker;
 var HInputNumber = FormConfig.inputNumber;
 var HPageHandler = Index;
 var HFormConfigProvider = FormConfig.formConfigProvider;
+var HModalForm = ModalForm;
 
-export { HButtonInput, HCheckBox, HCheckboxGroup, HDatePicker, HFormConfigProvider, HInput, HInputNumber, HPageHandler, HRadioGroup, HRangePicker, HSelect, HSelectInput, HSwitch, HTimePicker, HUpload, HUrlUpload };
+export { HButtonInput, HCheckBox, HCheckboxGroup, HDatePicker, HFormConfigProvider, HInput, HInputNumber, HModalForm, HPageHandler, HRadioGroup, HRangePicker, HSelect, HSelectInput, HSwitch, HTimePicker, HUpload, HUrlUpload };
 // powered by hdj

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/Form/HFormConnect.js

@@ -36,7 +36,8 @@ var HFormConnect = (function (Component) {
   var _config$format = config.format,
     format = _config$format === void 0 ? {} : _config$format;
   return function (props) {
-    var name = props.name;
+    var _props$name = props.name,
+      name = _props$name === void 0 ? "" : _props$name;
     var _useFormContext = index.useFormContext(),
       form = _useFormContext.form,
       _useFormContext$value = _useFormContext.valueType,
@@ -47,8 +48,15 @@ var HFormConnect = (function (Component) {
     var addFormat = function addFormat(aFormat) {
       form === null || form === void 0 ? void 0 : form.addFormat(name, formatMaker(props, aFormat[valueType]));
     };
+    var addDispatchListener = function addDispatchListener(key, fn) {
+      form === null || form === void 0 ? void 0 : form.addDispatchListener({
+        key: key,
+        name: name
+      }, fn);
+    };
     return /*#__PURE__*/React.createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
-      addFormat: addFormat
+      addFormat: addFormat,
+      addDispatchListener: addDispatchListener
     }));
   };
 });

package/lib/Form/InitSet.d.ts

@@ -1,6 +1,3 @@
 /// <reference types="react" />
-interface InitSetProps {
-    initValues?: Record<string, any>;
-}
-declare const _default: ({ initValues }: InitSetProps) => JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/lib/Form/InitSet.js

@@ -5,12 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var index = require('./Context/index.js');
 
-var InitSet = (function (_ref) {
-  var initValues = _ref.initValues;
+var InitSet = (function () {
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form;
   React.useEffect(function () {
-    form.initValues(initValues);
+    form.initValues();
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 });

package/lib/Form/config.d.ts

@@ -6,7 +6,7 @@ export declare const placeholderConfig: {
 declare const _default: {
     select: ({ 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;
     inputNumber: ({ style, ...props }: import("antd").InputNumberProps<string | number>) => JSX.Element;
-    selectInput: ({ selectProps, value, onChange, valueName, ...props }: import("../Input/modal").HSelectInputProps) => JSX.Element;
+    selectInput: (props: import("./modal").HFormItemProps) => import("react").ReactElement<import("./modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
     buttonInput: import("react").FC<import("../Input/modal").HButtonInputProps>;
     checkboxGroup: (props: import("./modal").HFormItemProps) => import("react").ReactElement<import("./modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
     checkBox: import("react").FC<import("../CheckboxGroup/modal").HCheckboxProps>;
@@ -14,7 +14,7 @@ declare const _default: {
     switch: import("react").FC<import("../Switch").HSwitchProps>;
     datePicker: ({ value, onChange, showTime, format, ...props }: import("../TDPicker/modal").HDatePickerProps) => JSX.Element;
     rangePicker: {
-        Component: ({ value, onChange, showTime, format, valueMap, ranges, name, ...props }: import("../TDPicker/modal").HRangePickerProps) => JSX.Element;
+        Component: (props: import("./modal").HFormItemProps) => import("react").ReactElement<import("./modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
         requiredErrMsg: ({ label }: import("./modal").HItemProps) => string;
     };

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

@@ -3,10 +3,4 @@ import type { HFormInstance } from "@/components/Form/modal";
 export declare const useCurrentForm: (form?: HFormInstance) => HFormInstance;
 type ParamsModal = Omit<HFormProps, "configData">;
 export declare const useSub: ({ request, onFinish, form }: ParamsModal) => import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
-export declare const useInit: ({ infoRequest, initialValues }: ParamsModal) => {
-    infoRun: () => Promise<any>;
-    infoLoading: boolean;
-    infoErr: Error | undefined;
-    infoData: any;
-};
 export {};

package/lib/Form/hooks/index.js

@@ -41,40 +41,7 @@ var useSub = function useSub(_ref) {
     manual: true
   });
 };
-var useInit = function useInit(_ref3) {
-  var infoRequest = _ref3.infoRequest,
-    _ref3$initialValues = _ref3.initialValues,
-    initialValues = _ref3$initialValues === void 0 ? {} : _ref3$initialValues;
-  var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!infoRequest) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return", infoRequest());
-          case 2:
-            return _context2.abrupt("return", initialValues);
-          case 3:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }))),
-    infoRun = _useRequest.run,
-    infoLoading = _useRequest.loading,
-    infoErr = _useRequest.error,
-    infoData = _useRequest.data;
-  return {
-    infoRun: infoRun,
-    infoLoading: infoLoading,
-    infoErr: infoErr,
-    infoData: infoData
-  };
-};
 
 exports.useCurrentForm = useCurrentForm;
-exports.useInit = useInit;
 exports.useSub = useSub;
 // powered by h

package/lib/Form/hooks/useHForm.js

@@ -8,17 +8,20 @@ var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/o
 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 _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Reflect$deleteProperty = require('@babel/runtime-corejs3/core-js/reflect/delete-property');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/concat');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _Promise = require('@babel/runtime-corejs3/core-js/promise');
 var React = require('react');
 var antd = require('antd');
 
 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 _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useHForm = (function () {
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -26,7 +29,26 @@ var useHForm = (function () {
   return React.useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
+    var cacheValues = {};
+    var norAddItemDispatch = function norAddItemDispatch(name, fn) {
+      if (!name) {
+        return {
+          keysFn: {},
+          defaultFn: [fn]
+        };
+      }
+      return {
+        keysFn: _defineProperty({}, name, fn),
+        defaultFn: []
+      };
+    };
     return _objectSpread(_objectSpread({
+      initValues: function initValues() {
+        if (cacheValues) {
+          var newValue = this.formatValues(cacheValues);
+          form.setFieldsValue(newValue);
+        }
+      },
       addFormat: function addFormat(name, format) {
         if (!format) {
           return;
@@ -59,42 +81,77 @@ var useHForm = (function () {
         });
         return newValue;
       },
-      dispatch: function dispatch(key) {
+      dispatch: function dispatch(action) {
+        var _context2, _context3, _context4;
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
+        var key = action.key,
+          name = action.name;
         var items = dispatchSourceData[key];
         if (!items) {
           return;
         }
-        _forEachInstanceProperty(items).call(items, function (fn) {
-          fn();
+        var keysFn = items.keysFn,
+          defaultFn = items.defaultFn;
+        if (name) {
+          var _keysFn$name, _context;
+          return (_keysFn$name = keysFn[name]) === null || _keysFn$name === void 0 ? void 0 : _keysFn$name.call.apply(_keysFn$name, _concatInstanceProperty(_context = [keysFn]).call(_context, args));
+        }
+        var fnArrays = _mapInstanceProperty(_context2 = _Object$keys(keysFn)).call(_context2, function (itemKey) {
+          return keysFn[itemKey];
+        });
+        _forEachInstanceProperty(_context3 = _concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(fnArrays), _toConsumableArray(defaultFn))).call(_context3, function (fn) {
+          fn.apply(void 0, args);
         });
       },
-      addDispatchListener: function addDispatchListener(key, fn) {
+      addDispatchListener: function addDispatchListener(action, fn) {
+        var key = action.key,
+          name = action.name;
         var items = dispatchSourceData[key];
         if (!items) {
-          dispatchSourceData[key] = [fn];
+          dispatchSourceData[key] = norAddItemDispatch(name, fn);
           return;
         }
-        items.push(fn);
-        dispatchSourceData[key] = items;
+        var keysFn = items.keysFn,
+          defaultFn = items.defaultFn;
+        if (name) {
+          keysFn[name] = fn;
+        } else {
+          defaultFn.push(fn);
+        }
+        dispatchSourceData[key] = {
+          keysFn: keysFn,
+          defaultFn: defaultFn
+        };
       },
-      removeDispatchListener: function removeDispatchListener(key) {
-        if (!key) {
+      removeDispatchListener: function removeDispatchListener(action) {
+        if (!action) {
           dispatchSourceData = {};
           return;
         }
+        var key = action.key,
+          name = action.name;
+        var items = dispatchSourceData[key];
+        if (!items) {
+          return;
+        }
+        if (name) {
+          var keysFn = items.keysFn;
+          _Reflect$deleteProperty(keysFn, name);
+          items.keysFn = keysFn;
+          dispatchSourceData[key] = items;
+          return;
+        }
         _Reflect$deleteProperty(dispatchSourceData, key);
       },
-      initValues: function initValues() {
-        var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        var newValue = this.formatValues(value);
-        form.setFieldsValue(newValue);
-      },
       outputValues: function outputValues(value) {
         return this.formatValues(value, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
         var newValue = this.formatValues(values);
+        cacheValues = values;
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {

package/lib/Form/index.js

@@ -4,18 +4,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var _extends = require('@babel/runtime-corejs3/helpers/extends');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var antd = require('antd');
-var index$4 = require('./FormItem/index.js');
-var index$1 = require('./hooks/index.js');
-var index$3 = require('./Context/index.js');
-var index$2 = require('../PageHandler/index.js');
+var index$3 = require('./FormItem/index.js');
+var index = require('./hooks/index.js');
+var index$2 = require('./Context/index.js');
+var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
+var ahooks = require('ahooks');
 var InitSet = require('./InitSet.js');
 
 var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues"];
-var index = (function (_ref) {
+var HForm = (function (_ref) {
   var configData = _ref.configData,
     labelWidth = _ref.labelWidth,
     form = _ref.form,
@@ -26,12 +29,12 @@ var index = (function (_ref) {
     valueType = _ref$valueType === void 0 ? "float" : _ref$valueType,
     initialValues = _ref.initialValues,
     props = _objectWithoutProperties(_ref, _excluded);
-  var hForm = index$1.useCurrentForm(form);
+  var hForm = index.useCurrentForm(form);
   var newConfigData = useInitConfigData.default({
     configData: configData,
     form: hForm
   });
-  var _useSub = index$1.useSub({
+  var _useSub = index.useSub({
       request: request,
       onFinish: onFinish,
       valueType: valueType,
@@ -39,20 +42,50 @@ var index = (function (_ref) {
     }),
     run = _useSub.run,
     loading = _useSub.loading;
-  var _useInit = index$1.useInit({
-      infoRequest: infoRequest,
-      initialValues: initialValues
-    }),
-    infoRun = _useInit.infoRun,
-    infoLoading = _useInit.infoLoading,
-    infoErr = _useInit.infoErr,
-    infoData = _useInit.infoData;
-  return /*#__PURE__*/React.createElement(index$2.default, {
+  var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var setValue;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setValue = initialValues;
+            if (!(!initialValues && !infoRequest)) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return", {});
+          case 3:
+            if (!infoRequest) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 6;
+            return infoRequest();
+          case 6:
+            setValue = _context.sent;
+          case 7:
+            hForm.setFieldsValue(setValue);
+            return _context.abrupt("return", setValue);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))),
+    infoRun = _useRequest.run,
+    infoLoading = _useRequest.loading,
+    infoErr = _useRequest.error,
+    infoData = _useRequest.data;
+  React.useEffect(function () {
+    return function () {
+      hForm.removeDispatchListener();
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement(index$1.default, {
     loading: infoLoading,
     error: infoErr,
     data: infoData,
     reload: infoRun
-  }, /*#__PURE__*/React.createElement(index$3.FormContext.Provider, {
+  }, /*#__PURE__*/React.createElement(index$2.FormContext.Provider, {
     value: {
       loading: loading,
       form: hForm,
@@ -63,14 +96,12 @@ var index = (function (_ref) {
     onFinish: run
   }, props), _mapInstanceProperty(newConfigData).call(newConfigData, function (itemData, index) {
     var itemLabelWidth = itemData.labelWidth;
-    return /*#__PURE__*/React.createElement(index$4.default, _extends({}, itemData, {
+    return /*#__PURE__*/React.createElement(index$3.default, _extends({}, itemData, {
       key: index,
       labelWidth: itemLabelWidth || labelWidth
     }));
-  })), /*#__PURE__*/React.createElement(InitSet.default, {
-    initValues: infoData
-  })));
+  }), /*#__PURE__*/React.createElement(InitSet.default, null))));
 });
 
-exports.default = index;
+exports.default = HForm;
 // powered by h