@sheinx/hooks 3.7.0-beta.8 → 3.7.0

package/cjs/common/use-component-memo/index.d.ts

@@ -1,2 +1,2 @@
-export { default, default as useComponentMemo } from './use-memo';
+export { useComponentMemo } from './use-memo';
 //# sourceMappingURL=index.d.ts.map

package/cjs/common/use-component-memo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}

package/cjs/common/use-component-memo/index.js

@@ -4,17 +4,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _useMemo.default;
-  }
-});
 Object.defineProperty(exports, "useComponentMemo", {
   enumerable: true,
   get: function get() {
-    return _useMemo.default;
+    return _useMemo.useComponentMemo;
   }
 });
-var _useMemo = _interopRequireDefault(require("./use-memo"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _useMemo = require("./use-memo");

package/cjs/common/use-component-memo/use-memo.d.ts

@@ -1,2 +1,2 @@
-export default function useMemo<Value, Condition = any[]>(getValue: () => Value, condition: Condition, shouldUpdate?: (prev: Condition, next: Condition) => boolean): Value | undefined;
+export declare function useComponentMemo<Value, Condition = any[]>(getValue: () => Value, condition: Condition, shouldUpdate?: (prev: Condition, next: Condition) => boolean): Value | undefined;
 //# sourceMappingURL=use-memo.d.ts.map

package/cjs/common/use-component-memo/use-memo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-memo.d.ts","sourceRoot":"","sources":["use-memo.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,EAAE,EACtD,QAAQ,EAAE,MAAM,KAAK,EACrB,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,KAAK,OAAO,qBAc7D"}
+{"version":3,"file":"use-memo.d.ts","sourceRoot":"","sources":["use-memo.ts"],"names":[],"mappings":"AAQA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,EAAE,EACvD,QAAQ,EAAE,MAAM,KAAK,EACrB,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,KAAK,OAAO,qBAc7D"}

package/cjs/common/use-component-memo/use-memo.js

@@ -4,11 +4,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = useMemo;
+exports.useComponentMemo = useComponentMemo;
 var React = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function useMemo(getValue, condition, shouldUpdate) {
+function useComponentMemo(getValue, condition, shouldUpdate) {
   var cacheRef = React.useRef({});
   if (!shouldUpdate) return getValue();
   if (!('value' in cacheRef.current) || shouldUpdate(cacheRef.current.condition, condition)) {

package/cjs/common/use-filter/index.d.ts

@@ -1,2 +1,3 @@
 export { default, default as useFilter } from './use-filter';
+export { FilterContext } from './use-filter-context';
 //# sourceMappingURL=index.d.ts.map

package/cjs/common/use-filter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC"}

package/cjs/common/use-filter/index.js

@@ -4,6 +4,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "FilterContext", {
+  enumerable: true,
+  get: function get() {
+    return _useFilterContext.FilterContext;
+  }
+});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
@@ -17,4 +23,5 @@ Object.defineProperty(exports, "useFilter", {
   }
 });
 var _useFilter = _interopRequireDefault(require("./use-filter"));
+var _useFilterContext = require("./use-filter-context");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/cjs/common/use-filter/use-filter-context.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+export interface FilterContextProps {
+    filterText?: string;
+    highlight?: boolean;
+}
+export declare const FilterContext: React.Context<FilterContextProps>;
+//# sourceMappingURL=use-filter-context.d.ts.map

package/cjs/common/use-filter/use-filter-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-filter-context.d.ts","sourceRoot":"","sources":["use-filter-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAEzB,MAAM,WAAW,kBAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,mCAA8C,CAAC"}

package/cjs/common/use-filter/use-filter-context.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilterContext = void 0;
+var _react = _interopRequireDefault(require("react"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var FilterContext = exports.FilterContext = /*#__PURE__*/_react.default.createContext({});
+FilterContext.displayName = 'FilterContext';

package/cjs/common/use-filter/use-filter.d.ts

@@ -14,6 +14,7 @@ declare const useFilter: <DataItem>(props: UseFilterProps<DataItem>) => {
     filterFunc: ((d: DataItem) => boolean) | undefined;
     onCreate: ((text: string) => string | DataItem | undefined) | undefined;
     onFilter: ((text: string, from?: string) => void) | undefined;
+    FilterProvider: import("react").Provider<import("./use-filter-context").FilterContextProps>;
     onClearCreatedData: () => void;
 };
 export default useFilter;

package/cjs/common/use-filter/use-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-filter.d.ts","sourceRoot":"","sources":["use-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,QAAA,MAAM,SAAS;;;;;;;;;;kCAmBkD,OAAO;sBAiB1C,MAAM;sBAKN,MAAM,SAAQ,MAAM;;CAqGjD,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"use-filter.d.ts","sourceRoot":"","sources":["use-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,QAAA,MAAM,SAAS;;;;;;;;;;kCAmBkD,OAAO;sBAiB1C,MAAM;sBAKN,MAAM,SAAQ,MAAM;;;CAsGjD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/cjs/common/use-filter/use-filter.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _utils = require("../../utils");
+var _useFilterContext = require("./use-filter-context");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -157,6 +158,7 @@ var useFilter = function useFilter(props) {
     filterFunc: filterFunc,
     onCreate: onCreate ? handleCreate : undefined,
     onFilter: onFilter || onCreate ? handleFilter : undefined,
+    FilterProvider: _useFilterContext.FilterContext.Provider,
     // onResetFilter: handleResetData,
     onClearCreatedData: handleClearCreatedData
   };

package/cjs/common/use-position-style/check-element-size.d.ts

@@ -0,0 +1,10 @@
+export interface Size {
+    width?: number;
+    height?: number;
+}
+interface UseCheckElementSizeOptions {
+    enable?: boolean;
+}
+export declare const useCheckElementSize: (targetElementRef: React.RefObject<HTMLElement>, options?: UseCheckElementSizeOptions) => Size | null;
+export {};
+//# sourceMappingURL=check-element-size.d.ts.map

package/cjs/common/use-position-style/check-element-size.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-element-size.d.ts","sourceRoot":"","sources":["check-element-size.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,IAAI;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,0BAA0B;IAElC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,mBAAmB,qBACZ,MAAM,SAAS,CAAC,WAAW,CAAC,YACrC,0BAA0B,KAClC,IAAI,GAAG,IAmDT,CAAC"}

package/cjs/common/use-position-style/check-element-size.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCheckElementSize = void 0;
+var _react = require("react");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var useCheckElementSize = exports.useCheckElementSize = function useCheckElementSize(targetElementRef) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var enable = options.enable;
+  var _useState = (0, _react.useState)({
+      width: 0,
+      height: 0
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    size = _useState2[0],
+    setSize = _useState2[1];
+  var lastSize = (0, _react.useRef)({
+    width: 0,
+    height: 0
+  });
+  var checkSize = (0, _react.useCallback)(function () {
+    if (targetElementRef.current) {
+      var rect = targetElementRef.current.getBoundingClientRect();
+      var newSize = {
+        width: rect.width,
+        height: rect.height
+      };
+      if (newSize.width !== lastSize.current.width || newSize.height !== lastSize.current.height) {
+        setSize(newSize);
+        lastSize.current = newSize;
+      }
+    }
+  }, [targetElementRef]);
+  (0, _react.useEffect)(function () {
+    var _window;
+    if (!enable) return;
+    var element = targetElementRef.current;
+    if (!element) return;
+
+    // 初始检查
+    checkSize();
+    var resizeObserver = null;
+    if ((_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
+      resizeObserver = new ResizeObserver(checkSize);
+      resizeObserver.observe(element);
+    }
+
+    // 清理函数
+    return function () {
+      var _resizeObserver;
+      (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || _resizeObserver.disconnect();
+    };
+  }, [enable, targetElementRef, checkSize]);
+  if (!enable || !targetElementRef) {
+    return null;
+  }
+  return size;
+};

package/cjs/common/use-position-style/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AASnD,MAAM,MAAM,kBAAkB,GAC1B,aAAa,GACb,UAAU,GACV,cAAc,GACd,WAAW,GACX,MAAM,GACN,OAAO,CAAC;AACZ,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,cAAc,GACd,UAAU,GACV,WAAW,GACX,KAAK,GACL,QAAQ,CAAC;AAYb,KAAK,YAAY,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,OAAO,CAAC;AACpE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IAEd,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE1C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAEzC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3B;AAOD,eAAO,MAAM,gBAAgB,WAAY,mBAAmB;;CAqR3D,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAUnD,MAAM,MAAM,kBAAkB,GAC1B,aAAa,GACb,UAAU,GACV,cAAc,GACd,WAAW,GACX,MAAM,GACN,OAAO,CAAC;AACZ,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,cAAc,GACd,UAAU,GACV,WAAW,GACX,KAAK,GACL,QAAQ,CAAC;AAYb,KAAK,YAAY,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,OAAO,CAAC;AACpE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IAEd,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE1C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAEzC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3B;AAOD,eAAO,MAAM,gBAAgB,WAAY,mBAAmB;;CAwR3D,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/cjs/common/use-position-style/index.js

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _getPositionStyle = require("./get-position-style");
 var _checkPosition = require("./check-position");
 var _checkBorder = require("./check-border");
+var _checkElementSize = require("./check-element-size");
 var _shallowEqual = _interopRequireDefault(require("../../utils/shallow-equal"));
 var _usePersistFn = _interopRequireDefault(require("../use-persist-fn"));
 var _utils = require("../../utils");
@@ -76,6 +77,9 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
   var parentElBorderWidth = (0, _checkBorder.useCheckElementBorderWidth)(parentElRef, {
     direction: 'horizontal'
   });
+  var popupElSize = (0, _checkElementSize.useCheckElementSize)(popupElRef, {
+    enable: show
+  });
   var adjustPosition = function adjustPosition(position) {
     var winHeight = _utils.docSize.height;
     if (!verticalPosition.includes(position)) return position;
@@ -312,7 +316,7 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
     context.prevParentPosition = parentElNewPosition;
   });
-  (0, _react.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition]);
+  (0, _react.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
     style: style
   };

package/cjs/components/use-datepicker/index.d.ts

@@ -1,4 +1,4 @@
-export { default as useDatePickerFormat } from './use-datepicker-format';
+export { default as useDatePickerFormat, getFormatValueArr, convertValueToDateArr, getFormat, } from './use-datepicker-format';
 export { default as dateUtil } from './util';
 export { default as useDatePick } from './use-date';
 export { default as useYearPick } from './use-year';

package/cjs/components/use-datepicker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvE,YAAY,EACV,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,GACb,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,mBAAmB,EAC9B,iBAAiB,EACjB,qBAAqB,EACrB,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvE,YAAY,EACV,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,GACb,MAAM,8BAA8B,CAAC"}

package/cjs/components/use-datepicker/index.js

@@ -1,15 +1,34 @@
 "use strict";
 "use client";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "convertValueToDateArr", {
+  enumerable: true,
+  get: function get() {
+    return _useDatepickerFormat.convertValueToDateArr;
+  }
+});
 Object.defineProperty(exports, "dateUtil", {
   enumerable: true,
   get: function get() {
     return _util.default;
   }
 });
+Object.defineProperty(exports, "getFormat", {
+  enumerable: true,
+  get: function get() {
+    return _useDatepickerFormat.getFormat;
+  }
+});
+Object.defineProperty(exports, "getFormatValueArr", {
+  enumerable: true,
+  get: function get() {
+    return _useDatepickerFormat.getFormatValueArr;
+  }
+});
 Object.defineProperty(exports, "useDatePick", {
   enumerable: true,
   get: function get() {
@@ -52,7 +71,7 @@ Object.defineProperty(exports, "useYearPick", {
     return _useYear.default;
   }
 });
-var _useDatepickerFormat = _interopRequireDefault(require("./use-datepicker-format"));
+var _useDatepickerFormat = _interopRequireWildcard(require("./use-datepicker-format"));
 var _util = _interopRequireDefault(require("./util"));
 var _useDate = _interopRequireDefault(require("./use-date"));
 var _useYear = _interopRequireDefault(require("./use-year"));
@@ -60,4 +79,6 @@ var _useMonth = _interopRequireDefault(require("./use-month"));
 var _useQuarter = _interopRequireDefault(require("./use-quarter"));
 var _useTime = _interopRequireDefault(require("./use-time"));
 var _useDatepickerRange = _interopRequireDefault(require("./use-datepicker-range"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/cjs/components/use-datepicker/use-datepicker-format.d.ts

@@ -1,5 +1,22 @@
 import React from 'react';
 import type { DatePickerModeType, DatePickerValueType, UseDatePickerFormatProps } from './use-datepicker-format.type';
+export declare const convertValueToDateArr: (value: DatePickerValueType, format: string, options: {
+    timeZone?: string;
+    weekStartsOn?: number;
+}) => (Date | undefined)[];
+export declare const getFormat: (format: string | undefined, type: string) => string;
+interface FormatValueType {
+    dateArr: (Date | undefined)[];
+    format: string;
+    fmt?: string;
+    type: 'date' | 'datetime' | 'month' | 'time' | 'week' | 'year' | 'quarter';
+    clearWithUndefined?: boolean;
+    options: {
+        timeZone?: string;
+        weekStartsOn?: number;
+    };
+}
+export declare const getFormatValueArr: (opts: FormatValueType) => (string | undefined)[];
 declare const useDatePickerFormat: <Value extends DatePickerValueType>(props: UseDatePickerFormatProps<Value>) => {
     inputArr: (Date | undefined)[];
     resultArr: (string | undefined)[];

package/cjs/components/use-datepicker/use-datepicker-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAkEtC,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BA2Me,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCA5LrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA4N3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"use-datepicker-format.d.ts","sourceRoot":"","sources":["use-datepicker-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,8BAA8B,CAAC;AAKtC,eAAO,MAAM,qBAAqB,UACzB,mBAAmB,UAClB,MAAM,WACL;IACP,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,yBAOF,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,MAAM,GAAG,SAAS,QAAQ,MAAM,WAkBjE,CAAC;AA4BF,UAAU,eAAe;IACvB,OAAO,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC3E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,SAAU,eAAe,2BAOtD,CAAC;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;0BA6Me,gBAAgB;sCAiEJ,MAAM;iCA7BX,MAAM,SAAS,MAAM;yCA9LrD,OAAO,GAAG,KAAK,GAAG,SAAS,QAAQ,MAAM,UAAU,IAAI,KAAK,OAAO;uCAWvE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,QAC3B,MAAM;kBACG,MAAM,SAAS;mBAAS,GAAG;;+BA4CrC,IAAI,YAAY,OAAO,GAAG,KAAK,GAAG,SAAS,gBAAgB,MAAM;;CA8N3E,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/cjs/components/use-datepicker/use-datepicker-format.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.getFormatValueArr = exports.getFormat = exports.default = exports.convertValueToDateArr = void 0;
 var _react = require("react");
 var _util = _interopRequireDefault(require("./util"));
 var _shallowEqual = _interopRequireDefault(require("../../utils/shallow-equal"));
@@ -20,14 +20,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var convertValueToDateArr = function convertValueToDateArr(value, format, options) {
+var convertValueToDateArr = exports.convertValueToDateArr = function convertValueToDateArr(value, format, options) {
   var valueArr = Array.isArray(value) ? value : [value];
   return valueArr.map(function (item) {
     if (!item) return undefined;
     return _util.default.toDateWithFormat(item, format, undefined, options);
   });
 };
-var getFormat = function getFormat(format, type) {
+var getFormat = exports.getFormat = function getFormat(format, type) {
   if (typeof format === 'string') return format;
   switch (type) {
     case 'datetime':
@@ -70,6 +70,18 @@ var getDefaultMode = function getDefaultMode(type) {
   var mode = getTypeMode(type);
   return [mode, mode];
 };
+var getFormatValueArr = exports.getFormatValueArr = function getFormatValueArr(opts) {
+  var dateArr = opts.dateArr,
+    format = opts.format,
+    clearWithUndefined = opts.clearWithUndefined,
+    options = opts.options,
+    type = opts.type;
+  var fmt = getFormat(format, type);
+  return dateArr.map(function (item) {
+    if (!item) return clearWithUndefined ? undefined : '';
+    return _util.default.format(item, fmt, options);
+  });
+};
 var useDatePickerFormat = function useDatePickerFormat(props) {
   var value = props.value,
     onChange = props.onChange,

package/cjs/components/use-form/use-form-control/use-form-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAC;AA2BnF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAiJpC,CAAC,YAAY,GAAG,EAAE;;;;;EAwDrD"}
+{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAC;AA4BnF,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAiJpC,CAAC,YAAY,GAAG,EAAE;;;;;EA4DrD"}

package/cjs/components/use-form/use-form-control/use-form-control.js

@@ -17,6 +17,7 @@ var _shallowEqual = require("../../../utils/shallow-equal");
 var _usePersistFn = _interopRequireDefault(require("../../../common/use-persist-fn"));
 var _useLatestObj = _interopRequireDefault(require("../../../common/use-latest-obj"));
 var _warning = require("../../../utils/warning");
+var _cleanProps = require("../../../utils/clean-props");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -157,7 +158,7 @@ function useFormControl(props) {
         }
       };
       var fullRules = (controlFunc === null || controlFunc === void 0 ? void 0 : controlFunc.combineRules(name, rules || [])) || [];
-      return (0, _validate.validate)(v, formV, fullRules, validateProps).then(function (res) {
+      return (0, _validate.validate)(v, formV, fullRules, (0, _cleanProps.cleanProps)(validateProps)).then(function (res) {
         var err = res === true ? undefined : res;
         formFunc === null || formFunc === void 0 || formFunc.setError(name, err);
         onError === null || onError === void 0 || onError(err);
@@ -184,7 +185,7 @@ function useFormControl(props) {
         return e;
       });
     } else {
-      return (0, _validate.validate)(v, {}, rules || [], {}).then(function (res) {
+      return (0, _validate.validate)(v, {}, rules || [], (0, _cleanProps.cleanProps)(validateProps)).then(function (res) {
         var err = res === true ? undefined : res;
         setErrorState(err);
         onError === null || onError === void 0 || onError(err);
@@ -226,10 +227,14 @@ function useFormControl(props) {
       if ((0, _is.isArray)(name)) {
         var dv = (0, _is.isArray)(defaultValue) ? defaultValue : [];
         name.forEach(function (n, index) {
-          controlFunc.bind(n, dv[index], validateField, update);
+          var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(n);
+          var bindedValue = v === undefined ? dv[index] : v;
+          controlFunc.bind(n, context.mounted ? bindedValue : dv[index], validateField, update);
         });
       } else {
-        controlFunc.bind(name, defaultValue, validateField, update);
+        var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+        var bindedValue = v === undefined ? defaultValue : v;
+        controlFunc.bind(name, context.mounted ? bindedValue : defaultValue, validateField, update);
       }
       if (context.mounted) {
         _warning.devUseWarning.warn('Please avoid modifying the name property after the component has mounted, as this may result in unintended behavior or errors.');

package/cjs/components/use-form/use-form.d.ts

@@ -11,10 +11,10 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
                 [key: string]: any;
             }, option?: {
                 validate?: boolean;
-                names?: string[];
+                forceUpdate?: boolean;
             }) => void;
             getValue: (name?: string) => unknown;
-            submit: (withValidate?: boolean) => void;
+            submit: (withValidate?: boolean, callback?: () => void) => void;
             reset: () => void;
             setError: (name: string, e: Error | undefined) => void;
             getErrors: () => ObjectType<Error | undefined>;
@@ -31,10 +31,10 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
             [key: string]: any;
         }, option?: {
             validate?: boolean;
-            names?: string[];
+            forceUpdate?: boolean;
         }) => void;
         getValue: (name?: string) => unknown;
-        submit: (withValidate?: boolean) => void;
+        submit: (withValidate?: boolean, callback?: () => void) => void;
         reset: () => void;
         setError: (name: string, e: Error | undefined) => void;
         getErrors: () => ObjectType<Error | undefined>;

package/cjs/components/use-form/use-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBA+RC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;aAAE;8BApKd,MAAM;oCAuOD,OAAO;;6BAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAoQvB,MAAM,WAAW,gBAAgB;gCA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAzIpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE;0BApKd,MAAM;gCAuOD,OAAO;;yBAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAoQvB,MAAM,WAAW,gBAAgB;4BA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAzIpD,MAAM,0BAAyB,qBAAqB;;CA2a9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAgSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApKnB,MAAM;oCA+OD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA1MxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCA6QvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAjJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApKnB,MAAM;gCA+OD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA1MxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCA6QvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAjJpD,MAAM,0BAAyB,qBAAqB;;CAqb9D,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/cjs/components/use-form/use-form.js

@@ -47,7 +47,8 @@ var useForm = function useForm(props) {
     size = props.size,
     colon = props.colon,
     formName = props.name,
-    scrollParent = props.scrollParent;
+    scrollParent = props.scrollParent,
+    isControl = props.isControl;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
     forceSet: true
@@ -201,7 +202,7 @@ var useForm = function useForm(props) {
           if (errors.length > 0) {
             var errorFields = [];
             for (var _key in context.errors) {
-              if (context.errors[_key]) {
+              if (context.errors[_key] && context.names.has(_key)) {
                 var _context$errors$_key;
                 errorFields.push({
                   name: _key,
@@ -303,13 +304,16 @@ var useForm = function useForm(props) {
       var values = Object.keys(vals);
       // 针对 name 为数组模式，如 datepicker 的 name={['startTime', 'endTime']} 时，前者校验可能需要依赖后者，因此需要提前将后者数据整合至 draft 用于多字段整合校验
       values.forEach(function (key) {
-        (0, _utils.deepSet)(draft, key, vals[key], deepSetOptions);
+        // upload组件返回的可能是函数: (prev) => [...prev, file]
+        var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
+        (0, _utils.deepSet)(draft, key, valueOfKey, deepSetOptions);
       });
       values.forEach(function (key) {
         if (option.validate) {
           var _context$validateMap$;
           (_context$validateMap$ = context.validateMap[key]) === null || _context$validateMap$ === void 0 || _context$validateMap$.forEach(function (validate) {
-            validate(key, vals[key], (0, _immer.current)(draft));
+            var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
+            validate(key, valueOfKey, (0, _immer.current)(draft));
           });
         }
       });
@@ -320,7 +324,11 @@ var useForm = function useForm(props) {
     fullKeyPaths.forEach(function (key) {
       delete context.serverErrors[key];
     });
-    update(fullKeyPaths);
+    if (option.forceUpdate) {
+      update();
+    } else {
+      update(fullKeyPaths);
+    }
   });
   var updateDefaultValue = function updateDefaultValue() {
     if (!context.mounted) return;
@@ -365,6 +373,7 @@ var useForm = function useForm(props) {
   });
   var submit = (0, _usePersistFn.default)(function () {
     var withValidate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    var callback = arguments.length > 1 ? arguments[1] : undefined;
     if (disabled) return;
     if (context.submitLock) {
       return;
@@ -382,32 +391,29 @@ var useForm = function useForm(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (withValidate) {
-              _context.next = 3;
+              _context.next = 4;
               break;
             }
             (_props$onSubmit = props.onSubmit) === null || _props$onSubmit === void 0 || _props$onSubmit.call(props, (_context$value = context.value) !== null && _context$value !== void 0 ? _context$value : {});
+            callback === null || callback === void 0 || callback();
             return _context.abrupt("return");
-          case 3:
-            _context.next = 5;
+          case 4:
+            _context.next = 6;
             return validateFields(undefined, {
               ignoreBind: true
             }).catch(function (e) {
               return e;
             });
-          case 5:
+          case 6:
             result = _context.sent;
-            if (!(result === true)) {
-              _context.next = 11;
-              break;
+            if (result === true) {
+              (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
+              if (activeEl) activeEl.focus();
+            } else {
+              handleSubmitError(result);
             }
-            (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
-            if (activeEl) activeEl.focus();
-            _context.next = 13;
-            break;
-          case 11:
-            handleSubmitError(result);
-            return _context.abrupt("return");
-          case 13:
+            callback === null || callback === void 0 || callback();
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -491,10 +497,8 @@ var useForm = function useForm(props) {
         context.updateMap[n] = new Set();
       }
       context.updateMap[n].add(updateFn);
-      var shouldTriggerResetChange = context.removeArr.has(n);
       context.removeArr.delete(n);
-      var shouldTriggerDefaultChange = df !== undefined && (0, _utils.deepGet)(context.value, n) === undefined;
-      if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
+      if (df !== undefined && (0, _utils.deepGet)(context.value, n) === undefined) {
         if (!context.mounted) context.defaultValues[n] = df;
         onChange(function (v) {
           (0, _utils.deepSet)(v, n, df, deepSetOptions);
@@ -514,7 +518,6 @@ var useForm = function useForm(props) {
       }
       if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
         context.names.delete(n);
-        delete context.errors[n];
         delete context.defaultValues[n];
       }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
@@ -609,7 +612,10 @@ var useForm = function useForm(props) {
   React.useEffect(function () {
     context.removeLock = false;
     // 内部 onChange 改的 value, 不需要更新
-    if (props.value === context.value) return;
+    if (props.value === context.value) {
+      if (!isControl) update();
+      return;
+    }
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = (0, _utils.deepGet)(preValue || emptyObj, key);