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

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

@@ -2,18 +2,5 @@ import type { HFormProps } from "@/components/Form/modal";
 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 declare const useSub: ({ request, onFinish, form }: ParamsModal) => import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
 export {};

package/lib/Form/hooks/index.js

@@ -1,9 +1,9 @@
-"use strict";
+'use strict';
 
-var _asyncToGenerator = require("@babel/runtime-corejs3/helpers/asyncToGenerator");
-var _regeneratorRuntime = require("@babel/runtime-corejs3/regenerator");
-var ahooks = require("ahooks");
-var useHForm = require("./useHForm.js");
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var ahooks = require('ahooks');
+var useHForm = require('./useHForm.js');
 
 var useCurrentForm = function useCurrentForm(form) {
   var selfForm = useHForm.default();
@@ -13,84 +13,35 @@ var useSub = function useSub(_ref) {
   var request = _ref.request,
     onFinish = _ref.onFinish,
     form = _ref.form;
-  return ahooks.useRequest(
-    /*#__PURE__*/ (function () {
-      var _ref2 = _asyncToGenerator(
-        /*#__PURE__*/ _regeneratorRuntime.mark(function _callee(value) {
-          var subVal;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1)
-              switch ((_context.prev = _context.next)) {
-                case 0:
-                  subVal =
-                    form === null || form === void 0
-                      ? void 0
-                      : form.outputValues(value);
-                  if (!request) {
-                    _context.next = 4;
-                    break;
-                  }
-                  _context.next = 4;
-                  return request(subVal);
-                case 4:
-                  onFinish === null || onFinish === void 0
-                    ? void 0
-                    : onFinish(subVal);
-                case 5:
-                case "end":
-                  return _context.stop();
-              }
-          }, _callee);
-        })
-      );
-      return function (_x) {
-        return _ref2.apply(this, arguments);
-      };
-    })(),
-    {
-      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,
-  };
+  return ahooks.useRequest( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
+      var subVal;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            subVal = form === null || form === void 0 ? void 0 : form.outputValues(value);
+            if (!request) {
+              _context.next = 4;
+              break;
+            }
+            _context.next = 4;
+            return request(subVal);
+          case 4:
+            onFinish === null || onFinish === void 0 ? void 0 : onFinish(subVal);
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), {
+    manual: true
+  });
 };
 
 exports.useCurrentForm = useCurrentForm;
-exports.useInit = useInit;
 exports.useSub = useSub;
 // powered by h

package/lib/Form/hooks/useHForm.js

@@ -1,252 +1,171 @@
-"use strict";
+'use strict';
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, '__esModule', { value: true });
 
-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 _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");
+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 _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 _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 () {
+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 _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),
     form = _Form$useForm2[0];
   return React.useMemo(function () {
     var formatSourceData = {};
     var dispatchSourceData = {};
+    var cacheValues = {};
     var norAddItemDispatch = function norAddItemDispatch(name, fn) {
       if (!name) {
         return {
           keysFn: {},
-          defaultFn: [fn],
+          defaultFn: [fn]
         };
       }
       return {
         keysFn: _defineProperty({}, name, fn),
-        defaultFn: [],
+        defaultFn: []
       };
     };
-    return _objectSpread(
-      _objectSpread(
-        {
-          addFormat: function addFormat(name, format) {
-            if (!format) {
-              return;
-            }
-            var inputValue = format.inputValue,
-              outputValue = format.outputValue;
-            formatSourceData[name] = {
-              inputValue: inputValue,
-              outputValue: outputValue,
-            };
-          },
-          formatValues: function formatValues() {
-            var value =
-              arguments.length > 0 && arguments[0] !== undefined
-                ? arguments[0]
-                : {};
-            var formatKey =
-              arguments.length > 1 && arguments[1] !== undefined
-                ? arguments[1]
-                : "inputValue";
-            var valKeys = _Object$keys(value).length;
-            if (!valKeys) {
-              return {};
-            }
-            var newValue = _objectSpread({}, value);
-            var keys = _Object$keys(formatSourceData);
-            _forEachInstanceProperty(keys).call(keys, function (key) {
-              var _formatSourceData$key;
-              var format =
-                (_formatSourceData$key = formatSourceData[key]) === null ||
-                _formatSourceData$key === void 0
-                  ? void 0
-                  : _formatSourceData$key[formatKey];
-              if (!format) {
-                return;
-              }
-              var resultValue = format(value);
-              _Reflect$deleteProperty(newValue, key);
-              newValue = _objectSpread(
-                _objectSpread({}, newValue),
-                resultValue
-              );
-            });
-            return newValue;
-          },
-          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;
-            }
-            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(action, fn) {
-            var key = action.key,
-              name = action.name;
-            var items = dispatchSourceData[key];
-            if (!items) {
-              dispatchSourceData[key] = norAddItemDispatch(name, fn);
-              return;
-            }
-            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(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);
+    return _objectSpread(_objectSpread({
+      initValues: function initValues() {
+        if (cacheValues) {
+          var newValue = this.formatValues(cacheValues);
           form.setFieldsValue(newValue);
-        },
-        validateFields: function validateFields(nameList) {
-          var _this = this;
-          return new _Promise(function (resolve) {
-            form.validateFields(nameList).then(function (value) {
-              var result = _this.formatValues(value, "outputValue");
-              return resolve(result);
-            });
+        }
+      },
+      addFormat: function addFormat(name, format) {
+        if (!format) {
+          return;
+        }
+        var inputValue = format.inputValue,
+          outputValue = format.outputValue;
+        formatSourceData[name] = {
+          inputValue: inputValue,
+          outputValue: outputValue
+        };
+      },
+      formatValues: function formatValues() {
+        var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
+        var valKeys = _Object$keys(value).length;
+        if (!valKeys) {
+          return {};
+        }
+        var newValue = _objectSpread({}, value);
+        var keys = _Object$keys(formatSourceData);
+        _forEachInstanceProperty(keys).call(keys, function (key) {
+          var _formatSourceData$key;
+          var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
+          if (!format) {
+            return;
+          }
+          var resultValue = format(value);
+          _Reflect$deleteProperty(newValue, key);
+          newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
+        });
+        return newValue;
+      },
+      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;
+        }
+        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(action, fn) {
+        var key = action.key,
+          name = action.name;
+        var items = dispatchSourceData[key];
+        if (!items) {
+          dispatchSourceData[key] = norAddItemDispatch(name, fn);
+          return;
+        }
+        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(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);
+      },
+      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) {
+        var _this = this;
+        return new _Promise(function (resolve) {
+          form.validateFields(nameList).then(function (value) {
+            var result = _this.formatValues(value, "outputValue");
+            return resolve(result);
           });
-        },
+        });
       }
-    );
+    });
   }, []);
-};
+});
 
 exports.default = useHForm;
 // powered by h

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

@@ -1,7 +1,4 @@
 import type { FormItemWithRender, HFormProps } from "@/components/Form/modal";
 type InitConfigModal = Required<Pick<HFormProps, "configData" | "form">>;
-declare const _default: ({
-  configData,
-  form,
-}: InitConfigModal) => FormItemWithRender[];
+declare const _default: ({ configData, form }: InitConfigModal) => FormItemWithRender[];
 export default _default;