@sheinx/hooks 3.2.0-rc.4 → 3.2.0

package/esm/components/use-button/use-button.js

@@ -53,7 +53,7 @@ var useButton = function useButton() {
     return mergedEventHandlers;
   };
   return {
-    disabled: disabled,
+    disabled: disabled || loading,
     getAnchorProps: getAnchorProps,
     getButtonProps: getButtonProps,
     getSpaceChildren: getSpaceChildren

package/esm/components/use-form/use-form-flow/use-form-datum.d.ts

@@ -1,7 +1,7 @@
 export interface FormDatum {
     set: (vals: {
         [name: string]: any;
-    }) => void;
+    } | string, value?: any) => void;
     get: (name?: string) => any;
 }
 declare const useFormDatum: () => FormDatum | undefined;

package/esm/components/use-form/use-form-flow/use-form-datum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-datum.d.ts","sourceRoot":"","sources":["use-form-datum.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,CAAC,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7C,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;CAC7B;AACD,QAAA,MAAM,YAAY,6BAQjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"use-form-datum.d.ts","sourceRoot":"","sources":["use-form-datum.tsx"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,CAAC,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACnE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;CAC7B;AAED,QAAA,MAAM,YAAY,6BAgBjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/esm/components/use-form/use-form-flow/use-form-datum.js

@@ -1,9 +1,21 @@
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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); }
 import useLatestObj from "../../../common/use-latest-obj";
+import { usePersistFn } from "../../../common/use-persist-fn";
 import { useFormFunc } from "../form-func-context";
 var useFormDatum = function useFormDatum() {
   var formFunc = useFormFunc();
+  var set = usePersistFn(function (vals, value) {
+    if (_typeof(vals) === 'object') {
+      formFunc === null || formFunc === void 0 || formFunc.setValue(vals);
+    } else {
+      formFunc === null || formFunc === void 0 || formFunc.setValue(_defineProperty({}, vals, value));
+    }
+  });
   var func = useLatestObj({
-    set: formFunc === null || formFunc === void 0 ? void 0 : formFunc.setValue,
+    set: set,
     get: formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue
   });
   var datum = formFunc ? func : undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAe,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAsJ8B;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;aAAE;8BARzB,MAAM;oCA6CD,OAAO;;6BALb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCArEN,MAAM,GAAG,MAAM,EAAE,mBAAgB,QAAQ,IAAI,CAAC;;;;;;oBAmDnD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE;0BARzB,MAAM;gCA6CD,OAAO;;yBALb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCArEN,MAAM,GAAG,MAAM,EAAE,mBAAgB,QAAQ,IAAI,CAAC;;CAwT7F,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAe,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAsJ8B;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;aAAE;8BARzB,MAAM;oCA6CD,OAAO;;6BALb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCArEN,MAAM,GAAG,MAAM,EAAE,mBAAgB,QAAQ,IAAI,CAAC;;;;;;oBAmDnD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE;0BARzB,MAAM;gCA6CD,OAAO;;yBALb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCArEN,MAAM,GAAG,MAAM,EAAE,mBAAgB,QAAQ,IAAI,CAAC;;CAiU7F,CAAC;AAEF,eAAe,OAAO,CAAC"}

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

@@ -48,7 +48,7 @@ var useForm = function useForm(props) {
       removeArr: new Set(),
       names: new Set(),
       submitLock: false,
-      value: props.value || emptyObj,
+      value: deepClone(props.value) || emptyObj,
       errors: {},
       serverErrors: {},
       lastValue: props.value || emptyObj,
@@ -375,6 +375,13 @@ var useForm = function useForm(props) {
       size: size
     };
   }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size]);
+  var updateValue = function updateValue() {
+    if (props.value !== context.lastValue && props.value !== context.value) {
+      context.value = deepClone(props.value) || emptyObj;
+      context.lastValue = props.value;
+    }
+  };
+  updateValue();
   React.useEffect(function () {
     // 服务端错误更新
     if (!props.error) context.serverErrors = {};else {
@@ -391,8 +398,8 @@ var useForm = function useForm(props) {
   // 默认值更新
   React.useEffect(function () {
     context.removeLock = false;
-    if (props.value === context.lastValue) return;
-    context.value = deepClone(props.value) || emptyObj;
+    // 内部 onChange 改的 value, 不需要更新
+    if (props.value === context.value) return;
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = deepGet(context.lastValue || emptyObj, key);

package/esm/components/use-menu/use-menu-item.d.ts

@@ -11,6 +11,7 @@ declare const useMenuItem: (props: UseMenuItemProps) => {
     handleMouseEnter: (e: React.MouseEvent) => void;
     handleMouseLeave: () => void;
     handleExpandClick: (e: React.MouseEvent) => void;
+    isLeaf: boolean;
 };
 export default useMenuItem;
 //# sourceMappingURL=use-menu-item.d.ts.map

package/esm/components/use-menu/use-menu-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-menu-item.d.ts","sourceRoot":"","sources":["use-menu-item.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,iBAAiB,CAAC;AAEpE,QAAA,MAAM,WAAW,UAAW,gBAAgB;;;;;;;;yBA4BD,gBAAgB;0BA2Df,gBAAgB;;2BAhCf,gBAAgB;CA6E5D,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"use-menu-item.d.ts","sourceRoot":"","sources":["use-menu-item.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,iBAAiB,CAAC;AAEpE,QAAA,MAAM,WAAW,UAAW,gBAAgB;;;;;;;;yBA8BD,gBAAgB;0BA8Df,gBAAgB;;2BAhCf,gBAAgB;;CAgF5D,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/esm/components/use-menu/use-menu-item.js

@@ -10,15 +10,13 @@ import { getUidStr } from "../../utils/uid";
 var useMenuItem = function useMenuItem(props) {
   var _useRef = useRef({
       id: '',
-      timer: null,
-      isUp: false
+      timer: null
     }),
     context = _useRef.current;
   var _props$parentId = props.parentId,
     parentId = _props$parentId === void 0 ? '' : _props$parentId,
-    dataItem = props.dataItem,
-    _props$toggleDuration = props.toggleDuration,
-    toggleDuration = _props$toggleDuration === void 0 ? 200 : _props$toggleDuration;
+    dataItem = props.dataItem;
+  var isLeaf = ((dataItem || {}).children || []).length === 0;
   if (!context.id) {
     context.id = "".concat(parentId, ",").concat(getUidStr());
   }
@@ -33,6 +31,10 @@ var useMenuItem = function useMenuItem(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isInPath = _useState4[0],
     setInPath = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isUp = _useState6[0],
+    setIsUp = _useState6[1];
   var update = usePersistFn(function (getStatus) {
     var status = getStatus(context.id, props.dataItem);
     if (isChecked !== status.isChecked) {
@@ -65,8 +67,11 @@ var useMenuItem = function useMenuItem(props) {
         props.onClick(dataItem);
       }
     }
-    var isLeaf = ((dataItem || {}).children || []).length === 0;
-    if (!isLeaf) e.nativeEvent.stopImmediatePropagation();
+    // 阻止冒泡
+    if (!isLeaf) {
+      e.stopPropagation();
+      e.nativeEvent.stopImmediatePropagation();
+    }
   });
   var handleExpandClick = usePersistFn(function (e) {
     e.stopPropagation();
@@ -83,29 +88,29 @@ var useMenuItem = function useMenuItem(props) {
     }
   });
   var handleMouseLeave = usePersistFn(function () {
-    if (expandAble && props.mode !== 'inline') {
-      if (context.timer) {
-        clearTimeout(context.timer);
-        context.timer = null;
-      }
-      context.timer = setTimeout(function () {
-        props.onOpenChange(function (before) {
-          var openKeySet = new Set(before);
-          openKeySet.delete(props.keyResult);
-          return Array.from(openKeySet);
-        });
-      }, toggleDuration);
-      document.removeEventListener('click', handleMouseLeave);
-    }
+    // if (expandAble && props.mode !== 'inline') {
+    // if (context.timer) {
+    //   clearTimeout(context.timer);
+    //   context.timer = null;
+    // }
+    // context.timer = setTimeout(() => {
+    //   props.onOpenChange((before) => {
+    //     const openKeySet = new Set(before);
+    //     openKeySet.delete(props.keyResult);
+    //     return Array.from(openKeySet);
+    //   });
+    // }, toggleDuration);
+    // document.removeEventListener('click', handleMouseLeave);
+    // }
   });
   var handleMouseEnter = usePersistFn(function (e) {
     if (expandAble && props.mode !== 'inline') {
       var _props$scrollRef;
-      if (context.timer) {
-        clearTimeout(context.timer);
-        context.timer = null;
-      }
-      var isUp = false;
+      // if (context.timer) {
+      //   clearTimeout(context.timer);
+      //   context.timer = null;
+      // }
+      var up = false;
       if (props.mode === 'vertical-auto' && (_props$scrollRef = props.scrollRef) !== null && _props$scrollRef !== void 0 && _props$scrollRef.current) {
         var _props$scrollRef$curr;
         var target = e.currentTarget;
@@ -113,15 +118,17 @@ var useMenuItem = function useMenuItem(props) {
         var scrollRect = (_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.getBoundingClientRect();
         var topLine = scrollRect === null || scrollRect === void 0 ? void 0 : scrollRect.top;
         var bottomLine = scrollRect === null || scrollRect === void 0 ? void 0 : scrollRect.bottom;
-        isUp = rect.bottom - topLine > (bottomLine - topLine) / 2;
+        up = rect.bottom - topLine > (bottomLine - topLine) / 2;
       }
-      context.isUp = isUp;
-      props.onOpenChange(function (before) {
-        var openKeySet = new Set(before);
-        openKeySet.add(props.keyResult);
-        return Array.from(openKeySet);
-      });
-      document.addEventListener('click', handleMouseLeave);
+      if (isUp !== up) {
+        setIsUp(up);
+      }
+      // props.onOpenChange((before) => {
+      //   const openKeySet = new Set(before);
+      //   openKeySet.add(props.keyResult);
+      //   return Array.from(openKeySet);
+      // });
+      // document.addEventListener('click', handleMouseLeave);
     }
   });
   useEffect(function () {
@@ -137,11 +144,12 @@ var useMenuItem = function useMenuItem(props) {
     isOpen: gopenKeySet.has(props.keyResult),
     isDisabled: isDisabled,
     expandAble: expandAble,
-    isUp: context.isUp,
+    isUp: isUp,
     handleItemClick: handleItemClick,
     handleMouseEnter: handleMouseEnter,
     handleMouseLeave: handleMouseLeave,
-    handleExpandClick: handleExpandClick
+    handleExpandClick: handleExpandClick,
+    isLeaf: isLeaf
   };
 };
 export default useMenuItem;

package/esm/components/use-menu/use-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-menu.d.ts","sourceRoot":"","sources":["use-menu.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,QAAA,MAAM,OAAO,UAAW,YAAY;;gCAwBgB,YAAY,EAAE,KAAK,YAAY,EAAE;qBAyC3D,MAAM,cAAc,UAAU;uBAI5B,MAAM;yBA5DS,MAAM;CA0EhD,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-menu.d.ts","sourceRoot":"","sources":["use-menu.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,QAAA,MAAM,OAAO,UAAW,YAAY;;gCAyBgB,YAAY,EAAE,KAAK,YAAY,EAAE;qBAkD3D,MAAM,cAAc,UAAU;uBAK5B,MAAM;yBAtES,MAAM;CAqFhD,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/components/use-menu/use-menu.js

@@ -6,7 +6,8 @@ var useMenu = function useMenu(props) {
   var _useRef = useRef({
       updateMap: new Map(),
       activeId: '',
-      cachedOpenKeys: props.openKeys || []
+      cachedOpenKeys: props.openKeys || [],
+      updateTimer: 0
     }),
     context = _useRef.current;
   var render = useRender();
@@ -61,14 +62,23 @@ var useMenu = function useMenu(props) {
       updateItem(getStatus);
     });
   });
+  var updateWithThreshold = usePersistFn(function () {
+    if (context.updateTimer) clearTimeout(context.updateTimer);
+    context.updateTimer = window.setTimeout(function () {
+      update();
+      // 需要更新两次 否则 inPath 状态错误
+      update();
+    }, 50);
+  });
   var bindUpdate = function bindUpdate(id, updateItem) {
     context.updateMap.set(id, updateItem);
+    updateWithThreshold();
   };
   var unbindUpdate = function unbindUpdate(id) {
     context.updateMap.delete(id);
   };
   useEffect(function () {
-    update();
+    updateWithThreshold();
   });
   return {
     openKeys: value,

package/esm/components/use-tree/use-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;CA6aZ,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-tree.d.ts","sourceRoot":"","sources":["use-tree.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAKb,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AASjD,eAAO,MAAM,IAAI;IACf;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CAEJ,CAAC;AAEF,QAAA,MAAM,OAAO;;;;CA6aZ,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/components/use-tree/use-tree.js

@@ -9,6 +9,11 @@ import useLatestObj from "../../common/use-latest-obj";
 import { useInputAble } from "../../common/use-input-able";
 import { usePersistFn } from "../../common/use-persist-fn";
 import { isFunc, isString, isNumber, isArray, isUnMatchedData } from "../../utils/is";
+function toArray(value) {
+  if (!value) return [];
+  if (!Array.isArray(value)) return [value];
+  return value;
+}
 export var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -68,7 +73,6 @@ var useTree = function useTree(props) {
       valueMap: new Map(),
       updateMap: new Map(),
       unmatchedValueMap: new Map(),
-      disabled: false,
       value: undefined,
       data: [],
       cachedValue: [],
@@ -158,14 +162,14 @@ var useTree = function useTree(props) {
   var getPath = function getPath(id) {
     return context.pathMap.get(id);
   };
-  var getDisabled = function getDisabled() {
+  var getDisabled = usePersistFn(function () {
     if (isFunc(disabledProps)) {
       return disabledProps;
     }
     return function () {
-      return !!disabledProps;
+      return false;
     };
-  };
+  });
   var getChecked = function getChecked(id) {
     var value = get(id);
     var checked = value === 1;
@@ -220,8 +224,8 @@ var useTree = function useTree(props) {
       // 制作 data mapping
       context.dataMap.set(id, item);
       var _isDisabled = !!disabled;
-      if (_isDisabled === false && isFunc(context.disabled)) {
-        _isDisabled = context.disabled(item);
+      if (_isDisabled === false) {
+        _isDisabled = getDisabled()(item);
       }
       var indexPath = [].concat(_toConsumableArray(index), [i]);
       ids.push(id);
@@ -296,16 +300,19 @@ var useTree = function useTree(props) {
     return checked;
   };
   var setValue = function setValue(value) {
-    context.value = value;
-    if (value && value !== context.cachedValue) {
+    context.value = toArray(value);
+    if (value !== context.cachedValue) {
       initValue();
     }
     setUnmatedValue();
   };
   var isDisabled = function isDisabled(id) {
-    var node = context.pathMap.get(id);
-    if (node) return node.isDisabled;
-    return false;
+    if (isFunc(disabledProps)) {
+      var node = context.pathMap.get(id);
+      if (node) return node.isDisabled;
+      return false;
+    }
+    return !!disabledProps;
   };
   var checkStatusStack = function checkStatusStack(stack, defaultStatus) {
     if (!stack || stack.length <= 0) return defaultStatus;
@@ -325,10 +332,9 @@ var useTree = function useTree(props) {
     context.dataMap = new Map();
     context.valueMap = new Map();
     context.unmatchedValueMap = new Map();
-    context.disabled = getDisabled();
-    context.data = data;
+    context.data = toArray(data);
     if (!data) return;
-    initData(data, []);
+    initData(context.data, []);
     initValue();
     setValue(prevValue);
   };

package/esm/components/use-tree/use-tree.type.d.ts

@@ -9,7 +9,6 @@ export interface TreeContext<DataItem> {
     unmatchedValueMap: Map<any, any>;
     updateMap: Map<KeygenResult, UpdateFunc>;
     forceUpdateMap: Map<KeygenResult, () => void>;
-    disabled: boolean | ((item: DataItem) => boolean);
     value?: KeygenResult[];
     cachedValue: KeygenResult[];
     data?: DataItem[];
@@ -103,6 +102,9 @@ export interface BaseTreeProps<DataItem> {
      * @private 保持数据缓存
      */
     keepCache?: boolean;
+    /**
+     * @private 内部数据处理
+     */
     datum?: TreeDatum<DataItem>;
 }
 export interface TreeDatum<DataItem> {

package/esm/components/use-tree/use-tree.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}

package/esm/components/use-upload/use-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAyLkB,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BpC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAuL+B,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BjD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/esm/components/use-upload/use-upload.js

@@ -165,10 +165,9 @@ var useUpload = function useUpload(props) {
       });
     });
   };
-  var getCurrent = usePersistFn(function () {
-    return {
-      filesState: filesState
-    };
+  var latestState = useLatestObj({
+    filesState: filesState,
+    value: value
   });
   var uploadFile = function uploadFile(id, file, data) {
     var request = props.request || xhrUpload;
@@ -189,8 +188,7 @@ var useUpload = function useUpload(props) {
           throttle = false;
         }, 16);
         var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
-        var _getCurrent = getCurrent(),
-          filesState = _getCurrent.filesState;
+        var filesState = latestState.filesState;
         var newFiles = _objectSpread({}, filesState);
         if (!newFiles[id]) return;
         newFiles[id].process = percent;
@@ -227,7 +225,7 @@ var useUpload = function useUpload(props) {
             });
           });
           // add value
-          var values = produce(value, function (draft) {
+          var values = produce(latestState.value, function (draft) {
             draft.push(result);
           });
           props.onChange(values);
@@ -280,7 +278,7 @@ var useUpload = function useUpload(props) {
       reader.readAsDataURL(blob);
     });
   };
-  var addFiles = /*#__PURE__*/function () {
+  var addFiles = usePersistFn( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(files) {
       var fileList, newFiles, resetLength, list, _loop, _ret, i;
       return _regeneratorRuntime().wrap(function _callee2$(_context3) {
@@ -419,11 +417,11 @@ var useUpload = function useUpload(props) {
         }
       }, _callee2);
     }));
-    return function addFiles(_x3) {
+    return function (_x3) {
       return _ref2.apply(this, arguments);
     };
-  }();
-  var removeFile = function removeFile(id) {
+  }());
+  var removeFile = usePersistFn(function (id) {
     var beforeCancel = props.beforeCancel,
       onErrorRemove = props.onErrorRemove;
     var file = filesState[id];
@@ -441,8 +439,8 @@ var useUpload = function useUpload(props) {
         onErrorRemove(file.xhr, file.blob, file);
       }
     }
-  };
-  var removeValue = function removeValue(index) {
+  });
+  var removeValue = usePersistFn(function (index) {
     if (props.disabled) return;
     var recoverAble = props.recoverAble,
       beforeRemove = props.beforeRemove;
@@ -454,15 +452,15 @@ var useUpload = function useUpload(props) {
         newRecycle.push(value[index]);
       }
       setRecycleValues(newRecycle);
-      var newValue = produce(props.value, function (draft) {
+      var newValue = produce(latestState.value, function (draft) {
         draft.splice(index, 1);
       });
       props.onChange(newValue);
     }).catch(function () {});
-  };
-  var recoverValue = function recoverValue(index) {
+  });
+  var recoverValue = usePersistFn(function (index) {
     if (props.disabled) return;
-    props.onChange(produce(props.value, function (draft) {
+    props.onChange(produce(latestState.value, function (draft) {
       draft.push(recycleValues[index]);
     }));
     setRecycleValues(function (pre) {
@@ -470,7 +468,7 @@ var useUpload = function useUpload(props) {
       newRecycle.splice(index, 1);
       return newRecycle;
     });
-  };
+  });
   var func = useLatestObj({
     addFiles: addFiles,
     removeFile: removeFile,

package/esm/utils/rule/rule.type.d.ts

@@ -105,7 +105,7 @@ export interface RuleFuncResult {
 export type RuleResult = {
     [key: string]: RuleFuncResult;
 } | RuleCommonResult;
-export type RuleResultValue = ValueOf<RuleResult>;
+export type RuleResultValue = RuleFuncResult | ValueOf<RuleCommonResult>;
 export type FormItemObjectRule = Type & RegExpParams & Range & Min & Max & Required & {
     func?: ValidFunc;
     args?: any;

package/esm/utils/rule/rule.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpC,MAAM,WAAW,SAAS,CAAC,CAAC,GAAG,GAAG;IAChC,CACE,KAAK,EAAE,CAAC,GAAG,SAAS,EACpB,SAAS,EAAE,UAAU,EACrB,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,EAClC,KAAK,EAAE,GAAG,GACT,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACxB;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AACpG,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC;AAE7D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,GAAG;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,GAAG;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,KAAM,SAAQ,GAAG,EAAE,GAAG;CAAG;AAE1C,MAAM,WAAW,IAAI;IACnB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAGD,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC;IAE7D;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,GAAG,CAAC,CAAC;IAEpE;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,GAAG,CAAC,CAAC;IAEpE;;;OAGG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,KAAK,CAAC,CAAC;IAEnF;;;OAGG;IACH,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,YAAY,CAAC,CAAC;IAEtF;;;OAGG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAExD;;;OAGG;IACH,MAAM,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAEvD;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,IAAI,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAErD;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,IAAI,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC;CACtD;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,SAAS,CAAC;QAAC,OAAO,CAAC,EAAE,WAAW,CAAA;KAAE,CAAC;IACnE,gBAAgB,EAAE,IAAI,CAAC;CACxB;AAGD,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,GAAG,gBAAgB,CAAC;AAG9E,MAAM,MAAM,eAAe,GAAG,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAGzE,MAAM,MAAM,kBAAkB,GAAG,IAAI,GACnC,YAAY,GACZ,KAAK,GACL,GAAG,GACH,GAAG,GACH,QAAQ,GAAG;IACT,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAC;AAEJ,MAAM,MAAM,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,GAAG,GAAG,IAAI,KAAK,CAChE,eAAe,GACf,kBAAkB,GAClB,CAAC,CACC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,KAAK,IAAI,EAC3C,KAAK,CAAC,EAAE,KAAK,KACV,IAAI,CAAC,CACb,CAAC;AAGF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,YAAY,CAAC;IAEtB,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,CAAC,QAAQ,EAAE,MAAM,GACb;QACE,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB,GACD,SAAS,GACT,SAAS,CAAC;CACf;AAGD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,gBAAgB,EAAE,IAAI,CAAA;CAAE,CAAC"}

package/esm/utils/validate/get-rule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-rule.d.ts","sourceRoot":"","sources":["get-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM/C,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,KAAK,EACnC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,UAAU,GAChB,SAAS,CAAC,KAAK,CAAC,CAuGlB"}
+{"version":3,"file":"get-rule.d.ts","sourceRoot":"","sources":["get-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,KAAK,EACnC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,UAAU,GAChB,SAAS,CAAC,KAAK,CAAC,CAuGlB"}

package/esm/utils/validate/get-rule.js

@@ -2,6 +2,7 @@ import nullable from "./nullable";
 import { isEmpty } from "../is";
 import typeOf from "./type";
 import { FormError } from "./error";
+import { substitute } from "../string";
 export default function getRule(rule, props) {
   var po = props;
   var rulePo = rule;
@@ -23,7 +24,7 @@ export default function getRule(rule, props) {
     max: max,
     args: args
   });
-  po.message = typeof message === 'function' ? message(po) : message;
+  po.message = typeof message === 'function' ? message(po) : substitute(message, po);
   var cb = function cb() {};
   if (func) {
     cb = function cb(value, formData, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.2.0-rc.4",
+  "version": "3.2.0",
   "description": "",
   "keywords": [],
   "license": "MIT",