@sheinx/hooks 3.2.0-rc.4 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/cjs/common/use-click-away/index.d.ts.map +1 -1
  2. package/cjs/common/use-click-away/index.js +4 -1
  3. package/cjs/common/use-transform/use-transform.d.ts.map +1 -1
  4. package/cjs/common/use-transform/use-transform.js +1 -0
  5. package/cjs/components/use-button/use-button.js +1 -1
  6. package/cjs/components/use-form/use-form-flow/use-form-datum.d.ts +1 -1
  7. package/cjs/components/use-form/use-form-flow/use-form-datum.d.ts.map +1 -1
  8. package/cjs/components/use-form/use-form-flow/use-form-datum.js +13 -1
  9. package/cjs/components/use-form/use-form.d.ts.map +1 -1
  10. package/cjs/components/use-form/use-form.js +10 -3
  11. package/cjs/components/use-menu/use-menu-item.d.ts +1 -0
  12. package/cjs/components/use-menu/use-menu-item.d.ts.map +1 -1
  13. package/cjs/components/use-menu/use-menu-item.js +44 -36
  14. package/cjs/components/use-menu/use-menu.d.ts.map +1 -1
  15. package/cjs/components/use-menu/use-menu.js +12 -2
  16. package/cjs/components/use-tree/use-tree.d.ts.map +1 -1
  17. package/cjs/components/use-tree/use-tree.js +20 -14
  18. package/cjs/components/use-tree/use-tree.type.d.ts +3 -1
  19. package/cjs/components/use-tree/use-tree.type.d.ts.map +1 -1
  20. package/cjs/components/use-upload/use-upload.d.ts.map +1 -1
  21. package/cjs/components/use-upload/use-upload.js +16 -18
  22. package/cjs/utils/rule/rule.type.d.ts +1 -1
  23. package/cjs/utils/rule/rule.type.d.ts.map +1 -1
  24. package/cjs/utils/validate/get-rule.d.ts.map +1 -1
  25. package/cjs/utils/validate/get-rule.js +2 -1
  26. package/esm/common/use-click-away/index.d.ts.map +1 -1
  27. package/esm/common/use-click-away/index.js +4 -1
  28. package/esm/common/use-transform/use-transform.d.ts.map +1 -1
  29. package/esm/common/use-transform/use-transform.js +1 -0
  30. package/esm/components/use-button/use-button.js +1 -1
  31. package/esm/components/use-form/use-form-flow/use-form-datum.d.ts +1 -1
  32. package/esm/components/use-form/use-form-flow/use-form-datum.d.ts.map +1 -1
  33. package/esm/components/use-form/use-form-flow/use-form-datum.js +13 -1
  34. package/esm/components/use-form/use-form.d.ts.map +1 -1
  35. package/esm/components/use-form/use-form.js +10 -3
  36. package/esm/components/use-menu/use-menu-item.d.ts +1 -0
  37. package/esm/components/use-menu/use-menu-item.d.ts.map +1 -1
  38. package/esm/components/use-menu/use-menu-item.js +44 -36
  39. package/esm/components/use-menu/use-menu.d.ts.map +1 -1
  40. package/esm/components/use-menu/use-menu.js +12 -2
  41. package/esm/components/use-tree/use-tree.d.ts.map +1 -1
  42. package/esm/components/use-tree/use-tree.js +20 -14
  43. package/esm/components/use-tree/use-tree.type.d.ts +3 -1
  44. package/esm/components/use-tree/use-tree.type.d.ts.map +1 -1
  45. package/esm/components/use-upload/use-upload.d.ts.map +1 -1
  46. package/esm/components/use-upload/use-upload.js +16 -18
  47. package/esm/utils/rule/rule.type.d.ts +1 -1
  48. package/esm/utils/rule/rule.type.d.ts.map +1 -1
  49. package/esm/utils/validate/get-rule.d.ts.map +1 -1
  50. package/esm/utils/validate/get-rule.js +2 -1
  51. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAI7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;AACnD,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,MAAM,EAAE;IAE5D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC/B,QAkCA;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAI7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;AACnD,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,MAAM,EAAE;IAE5D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC/B,QAqCA;AAED,eAAe,YAAY,CAAC"}
@@ -45,7 +45,10 @@ function useClickAway(params) {
45
45
  }
46
46
  return function () {
47
47
  // @ts-ignore
48
- document.removeEventListener(event, handleClickAway);
48
+ document.removeEventListener(event, handleClickAway, {
49
+ // 解决 点击后立刻删除dom导致获取不到元素; contains(target) 为 false 的问题
50
+ capture: true
51
+ });
49
52
  };
50
53
  }, [effect]);
51
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"use-transform.d.ts","sourceRoot":"","sources":["use-transform.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,QAAA,MAAM,YAAY,aAAc,iBAAiB;;;;;;;;8BAwBd,MAAM;;;CAqFxC,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"use-transform.d.ts","sourceRoot":"","sources":["use-transform.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,QAAA,MAAM,YAAY,aAAc,iBAAiB;;;;;;;;8BAwBd,MAAM;;;CAsFxC,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -103,6 +103,7 @@ var useTransform = function useTransform(props) {
103
103
  if (!containerDimension || !targetDimension) return;
104
104
  if (targetDimension <= containerDimension) {
105
105
  setShouldScroll(false);
106
+ setDelta(0);
106
107
  } else {
107
108
  setShouldScroll(true);
108
109
  }
@@ -59,7 +59,7 @@ var useButton = function useButton() {
59
59
  return mergedEventHandlers;
60
60
  };
61
61
  return {
62
- disabled: disabled,
62
+ disabled: disabled || loading,
63
63
  getAnchorProps: getAnchorProps,
64
64
  getButtonProps: getButtonProps,
65
65
  getSpaceChildren: getSpaceChildren
@@ -1,7 +1,7 @@
1
1
  export interface FormDatum {
2
2
  set: (vals: {
3
3
  [name: string]: any;
4
- }) => void;
4
+ } | string, value?: any) => void;
5
5
  get: (name?: string) => any;
6
6
  }
7
7
  declare const useFormDatum: () => FormDatum | undefined;
@@ -1 +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"}
1
+ {"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"}
@@ -5,12 +5,24 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _useLatestObj = _interopRequireDefault(require("../../../common/use-latest-obj"));
8
+ var _usePersistFn = require("../../../common/use-persist-fn");
8
9
  var _formFuncContext = require("../form-func-context");
9
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
+ 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; }
12
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
13
+ 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); }
14
+ 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); }
10
15
  var useFormDatum = function useFormDatum() {
11
16
  var formFunc = (0, _formFuncContext.useFormFunc)();
17
+ var set = (0, _usePersistFn.usePersistFn)(function (vals, value) {
18
+ if (_typeof(vals) === 'object') {
19
+ formFunc === null || formFunc === void 0 || formFunc.setValue(vals);
20
+ } else {
21
+ formFunc === null || formFunc === void 0 || formFunc.setValue(_defineProperty({}, vals, value));
22
+ }
23
+ });
12
24
  var func = (0, _useLatestObj.default)({
13
- set: formFunc === null || formFunc === void 0 ? void 0 : formFunc.setValue,
25
+ set: set,
14
26
  get: formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue
15
27
  });
16
28
  var datum = formFunc ? func : undefined;
@@ -1 +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"}
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;;CAiU7F,CAAC;AAEF,eAAe,OAAO,CAAC"}
@@ -57,7 +57,7 @@ var useForm = function useForm(props) {
57
57
  removeArr: new Set(),
58
58
  names: new Set(),
59
59
  submitLock: false,
60
- value: props.value || emptyObj,
60
+ value: (0, _utils.deepClone)(props.value) || emptyObj,
61
61
  errors: {},
62
62
  serverErrors: {},
63
63
  lastValue: props.value || emptyObj,
@@ -384,6 +384,13 @@ var useForm = function useForm(props) {
384
384
  size: size
385
385
  };
386
386
  }, [labelWidth, labelAlign, labelVerticalAlign, keepErrorHeight, inline, disabled, size]);
387
+ var updateValue = function updateValue() {
388
+ if (props.value !== context.lastValue && props.value !== context.value) {
389
+ context.value = (0, _utils.deepClone)(props.value) || emptyObj;
390
+ context.lastValue = props.value;
391
+ }
392
+ };
393
+ updateValue();
387
394
  React.useEffect(function () {
388
395
  // 服务端错误更新
389
396
  if (!props.error) context.serverErrors = {};else {
@@ -400,8 +407,8 @@ var useForm = function useForm(props) {
400
407
  // 默认值更新
401
408
  React.useEffect(function () {
402
409
  context.removeLock = false;
403
- if (props.value === context.lastValue) return;
404
- context.value = (0, _utils.deepClone)(props.value) || emptyObj;
410
+ // 内部 onChange 改的 value, 不需要更新
411
+ if (props.value === context.value) return;
405
412
  if (initValidate && !context.resetTime) {
406
413
  var keys = Object.keys(context.validateMap).filter(function (key) {
407
414
  var oldValue = (0, _utils.deepGet)(context.lastValue || emptyObj, key);
@@ -11,6 +11,7 @@ declare const useMenuItem: (props: UseMenuItemProps) => {
11
11
  handleMouseEnter: (e: React.MouseEvent) => void;
12
12
  handleMouseLeave: () => void;
13
13
  handleExpandClick: (e: React.MouseEvent) => void;
14
+ isLeaf: boolean;
14
15
  };
15
16
  export default useMenuItem;
16
17
  //# sourceMappingURL=use-menu-item.d.ts.map
@@ -1 +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"}
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;;;;;;;;yBA8BD,gBAAgB;0BA8Df,gBAAgB;;2BAhCf,gBAAgB;;CAgF5D,CAAC;AAEF,eAAe,WAAW,CAAC"}
@@ -17,15 +17,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
17
  var useMenuItem = function useMenuItem(props) {
18
18
  var _useRef = (0, _react.useRef)({
19
19
  id: '',
20
- timer: null,
21
- isUp: false
20
+ timer: null
22
21
  }),
23
22
  context = _useRef.current;
24
23
  var _props$parentId = props.parentId,
25
24
  parentId = _props$parentId === void 0 ? '' : _props$parentId,
26
- dataItem = props.dataItem,
27
- _props$toggleDuration = props.toggleDuration,
28
- toggleDuration = _props$toggleDuration === void 0 ? 200 : _props$toggleDuration;
25
+ dataItem = props.dataItem;
26
+ var isLeaf = ((dataItem || {}).children || []).length === 0;
29
27
  if (!context.id) {
30
28
  context.id = "".concat(parentId, ",").concat((0, _uid.getUidStr)());
31
29
  }
@@ -40,6 +38,10 @@ var useMenuItem = function useMenuItem(props) {
40
38
  _useState4 = _slicedToArray(_useState3, 2),
41
39
  isInPath = _useState4[0],
42
40
  setInPath = _useState4[1];
41
+ var _useState5 = (0, _react.useState)(false),
42
+ _useState6 = _slicedToArray(_useState5, 2),
43
+ isUp = _useState6[0],
44
+ setIsUp = _useState6[1];
43
45
  var update = (0, _usePersistFn.default)(function (getStatus) {
44
46
  var status = getStatus(context.id, props.dataItem);
45
47
  if (isChecked !== status.isChecked) {
@@ -72,8 +74,11 @@ var useMenuItem = function useMenuItem(props) {
72
74
  props.onClick(dataItem);
73
75
  }
74
76
  }
75
- var isLeaf = ((dataItem || {}).children || []).length === 0;
76
- if (!isLeaf) e.nativeEvent.stopImmediatePropagation();
77
+ // 阻止冒泡
78
+ if (!isLeaf) {
79
+ e.stopPropagation();
80
+ e.nativeEvent.stopImmediatePropagation();
81
+ }
77
82
  });
78
83
  var handleExpandClick = (0, _usePersistFn.default)(function (e) {
79
84
  e.stopPropagation();
@@ -90,29 +95,29 @@ var useMenuItem = function useMenuItem(props) {
90
95
  }
91
96
  });
92
97
  var handleMouseLeave = (0, _usePersistFn.default)(function () {
93
- if (expandAble && props.mode !== 'inline') {
94
- if (context.timer) {
95
- clearTimeout(context.timer);
96
- context.timer = null;
97
- }
98
- context.timer = setTimeout(function () {
99
- props.onOpenChange(function (before) {
100
- var openKeySet = new Set(before);
101
- openKeySet.delete(props.keyResult);
102
- return Array.from(openKeySet);
103
- });
104
- }, toggleDuration);
105
- document.removeEventListener('click', handleMouseLeave);
106
- }
98
+ // if (expandAble && props.mode !== 'inline') {
99
+ // if (context.timer) {
100
+ // clearTimeout(context.timer);
101
+ // context.timer = null;
102
+ // }
103
+ // context.timer = setTimeout(() => {
104
+ // props.onOpenChange((before) => {
105
+ // const openKeySet = new Set(before);
106
+ // openKeySet.delete(props.keyResult);
107
+ // return Array.from(openKeySet);
108
+ // });
109
+ // }, toggleDuration);
110
+ // document.removeEventListener('click', handleMouseLeave);
111
+ // }
107
112
  });
108
113
  var handleMouseEnter = (0, _usePersistFn.default)(function (e) {
109
114
  if (expandAble && props.mode !== 'inline') {
110
115
  var _props$scrollRef;
111
- if (context.timer) {
112
- clearTimeout(context.timer);
113
- context.timer = null;
114
- }
115
- var isUp = false;
116
+ // if (context.timer) {
117
+ // clearTimeout(context.timer);
118
+ // context.timer = null;
119
+ // }
120
+ var up = false;
116
121
  if (props.mode === 'vertical-auto' && (_props$scrollRef = props.scrollRef) !== null && _props$scrollRef !== void 0 && _props$scrollRef.current) {
117
122
  var _props$scrollRef$curr;
118
123
  var target = e.currentTarget;
@@ -120,15 +125,17 @@ var useMenuItem = function useMenuItem(props) {
120
125
  var scrollRect = (_props$scrollRef$curr = props.scrollRef.current) === null || _props$scrollRef$curr === void 0 ? void 0 : _props$scrollRef$curr.getBoundingClientRect();
121
126
  var topLine = scrollRect === null || scrollRect === void 0 ? void 0 : scrollRect.top;
122
127
  var bottomLine = scrollRect === null || scrollRect === void 0 ? void 0 : scrollRect.bottom;
123
- isUp = rect.bottom - topLine > (bottomLine - topLine) / 2;
128
+ up = rect.bottom - topLine > (bottomLine - topLine) / 2;
124
129
  }
125
- context.isUp = isUp;
126
- props.onOpenChange(function (before) {
127
- var openKeySet = new Set(before);
128
- openKeySet.add(props.keyResult);
129
- return Array.from(openKeySet);
130
- });
131
- document.addEventListener('click', handleMouseLeave);
130
+ if (isUp !== up) {
131
+ setIsUp(up);
132
+ }
133
+ // props.onOpenChange((before) => {
134
+ // const openKeySet = new Set(before);
135
+ // openKeySet.add(props.keyResult);
136
+ // return Array.from(openKeySet);
137
+ // });
138
+ // document.addEventListener('click', handleMouseLeave);
132
139
  }
133
140
  });
134
141
  (0, _react.useEffect)(function () {
@@ -144,11 +151,12 @@ var useMenuItem = function useMenuItem(props) {
144
151
  isOpen: gopenKeySet.has(props.keyResult),
145
152
  isDisabled: isDisabled,
146
153
  expandAble: expandAble,
147
- isUp: context.isUp,
154
+ isUp: isUp,
148
155
  handleItemClick: handleItemClick,
149
156
  handleMouseEnter: handleMouseEnter,
150
157
  handleMouseLeave: handleMouseLeave,
151
- handleExpandClick: handleExpandClick
158
+ handleExpandClick: handleExpandClick,
159
+ isLeaf: isLeaf
152
160
  };
153
161
  };
154
162
  var _default = exports.default = useMenuItem;
@@ -1 +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"}
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;;gCAyBgB,YAAY,EAAE,KAAK,YAAY,EAAE;qBAkD3D,MAAM,cAAc,UAAU;uBAK5B,MAAM;yBAtES,MAAM;CAqFhD,CAAC;AAEF,eAAe,OAAO,CAAC"}
@@ -13,7 +13,8 @@ var useMenu = function useMenu(props) {
13
13
  var _useRef = (0, _react.useRef)({
14
14
  updateMap: new Map(),
15
15
  activeId: '',
16
- cachedOpenKeys: props.openKeys || []
16
+ cachedOpenKeys: props.openKeys || [],
17
+ updateTimer: 0
17
18
  }),
18
19
  context = _useRef.current;
19
20
  var render = (0, _useRender.default)();
@@ -68,14 +69,23 @@ var useMenu = function useMenu(props) {
68
69
  updateItem(getStatus);
69
70
  });
70
71
  });
72
+ var updateWithThreshold = (0, _usePersistFn.default)(function () {
73
+ if (context.updateTimer) clearTimeout(context.updateTimer);
74
+ context.updateTimer = window.setTimeout(function () {
75
+ update();
76
+ // 需要更新两次 否则 inPath 状态错误
77
+ update();
78
+ }, 50);
79
+ });
71
80
  var bindUpdate = function bindUpdate(id, updateItem) {
72
81
  context.updateMap.set(id, updateItem);
82
+ updateWithThreshold();
73
83
  };
74
84
  var unbindUpdate = function unbindUpdate(id) {
75
85
  context.updateMap.delete(id);
76
86
  };
77
87
  (0, _react.useEffect)(function () {
78
- update();
88
+ updateWithThreshold();
79
89
  });
80
90
  return {
81
91
  openKeys: value,
@@ -1 +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"}
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;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"}
@@ -16,6 +16,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
16
16
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
17
17
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
18
18
  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; }
19
+ function toArray(value) {
20
+ if (!value) return [];
21
+ if (!Array.isArray(value)) return [value];
22
+ return value;
23
+ }
19
24
  var MODE = exports.MODE = {
20
25
  /**
21
26
  * 返回全选数据,包含父节点和子节点
@@ -75,7 +80,6 @@ var useTree = function useTree(props) {
75
80
  valueMap: new Map(),
76
81
  updateMap: new Map(),
77
82
  unmatchedValueMap: new Map(),
78
- disabled: false,
79
83
  value: undefined,
80
84
  data: [],
81
85
  cachedValue: [],
@@ -165,14 +169,14 @@ var useTree = function useTree(props) {
165
169
  var getPath = function getPath(id) {
166
170
  return context.pathMap.get(id);
167
171
  };
168
- var getDisabled = function getDisabled() {
172
+ var getDisabled = (0, _usePersistFn.usePersistFn)(function () {
169
173
  if ((0, _is.isFunc)(disabledProps)) {
170
174
  return disabledProps;
171
175
  }
172
176
  return function () {
173
- return !!disabledProps;
177
+ return false;
174
178
  };
175
- };
179
+ });
176
180
  var getChecked = function getChecked(id) {
177
181
  var value = get(id);
178
182
  var checked = value === 1;
@@ -227,8 +231,8 @@ var useTree = function useTree(props) {
227
231
  // 制作 data mapping
228
232
  context.dataMap.set(id, item);
229
233
  var _isDisabled = !!disabled;
230
- if (_isDisabled === false && (0, _is.isFunc)(context.disabled)) {
231
- _isDisabled = context.disabled(item);
234
+ if (_isDisabled === false) {
235
+ _isDisabled = getDisabled()(item);
232
236
  }
233
237
  var indexPath = [].concat(_toConsumableArray(index), [i]);
234
238
  ids.push(id);
@@ -303,16 +307,19 @@ var useTree = function useTree(props) {
303
307
  return checked;
304
308
  };
305
309
  var setValue = function setValue(value) {
306
- context.value = value;
307
- if (value && value !== context.cachedValue) {
310
+ context.value = toArray(value);
311
+ if (value !== context.cachedValue) {
308
312
  initValue();
309
313
  }
310
314
  setUnmatedValue();
311
315
  };
312
316
  var isDisabled = function isDisabled(id) {
313
- var node = context.pathMap.get(id);
314
- if (node) return node.isDisabled;
315
- return false;
317
+ if ((0, _is.isFunc)(disabledProps)) {
318
+ var node = context.pathMap.get(id);
319
+ if (node) return node.isDisabled;
320
+ return false;
321
+ }
322
+ return !!disabledProps;
316
323
  };
317
324
  var checkStatusStack = function checkStatusStack(stack, defaultStatus) {
318
325
  if (!stack || stack.length <= 0) return defaultStatus;
@@ -332,10 +339,9 @@ var useTree = function useTree(props) {
332
339
  context.dataMap = new Map();
333
340
  context.valueMap = new Map();
334
341
  context.unmatchedValueMap = new Map();
335
- context.disabled = getDisabled();
336
- context.data = data;
342
+ context.data = toArray(data);
337
343
  if (!data) return;
338
- initData(data, []);
344
+ initData(context.data, []);
339
345
  initValue();
340
346
  setValue(prevValue);
341
347
  };
@@ -9,7 +9,6 @@ export interface TreeContext<DataItem> {
9
9
  unmatchedValueMap: Map<any, any>;
10
10
  updateMap: Map<KeygenResult, UpdateFunc>;
11
11
  forceUpdateMap: Map<KeygenResult, () => void>;
12
- disabled: boolean | ((item: DataItem) => boolean);
13
12
  value?: KeygenResult[];
14
13
  cachedValue: KeygenResult[];
15
14
  data?: DataItem[];
@@ -103,6 +102,9 @@ export interface BaseTreeProps<DataItem> {
103
102
  * @private 保持数据缓存
104
103
  */
105
104
  keepCache?: boolean;
105
+ /**
106
+ * @private 内部数据处理
107
+ */
106
108
  datum?: TreeDatum<DataItem>;
107
109
  }
108
110
  export interface TreeDatum<DataItem> {
@@ -1 +1 @@
1
- {"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}
@@ -1 +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"}
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;;;;;;0BAuL+B,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BjD,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -172,10 +172,9 @@ var useUpload = function useUpload(props) {
172
172
  });
173
173
  });
174
174
  };
175
- var getCurrent = (0, _usePersistFn.default)(function () {
176
- return {
177
- filesState: filesState
178
- };
175
+ var latestState = (0, _useLatestObj.default)({
176
+ filesState: filesState,
177
+ value: value
179
178
  });
180
179
  var uploadFile = function uploadFile(id, file, data) {
181
180
  var request = props.request || _xhr.default;
@@ -196,8 +195,7 @@ var useUpload = function useUpload(props) {
196
195
  throttle = false;
197
196
  }, 16);
198
197
  var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
199
- var _getCurrent = getCurrent(),
200
- filesState = _getCurrent.filesState;
198
+ var filesState = latestState.filesState;
201
199
  var newFiles = _objectSpread({}, filesState);
202
200
  if (!newFiles[id]) return;
203
201
  newFiles[id].process = percent;
@@ -234,7 +232,7 @@ var useUpload = function useUpload(props) {
234
232
  });
235
233
  });
236
234
  // add value
237
- var values = (0, _immer.produce)(value, function (draft) {
235
+ var values = (0, _immer.produce)(latestState.value, function (draft) {
238
236
  draft.push(result);
239
237
  });
240
238
  props.onChange(values);
@@ -287,7 +285,7 @@ var useUpload = function useUpload(props) {
287
285
  reader.readAsDataURL(blob);
288
286
  });
289
287
  };
290
- var addFiles = /*#__PURE__*/function () {
288
+ var addFiles = (0, _usePersistFn.default)( /*#__PURE__*/function () {
291
289
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(files) {
292
290
  var fileList, newFiles, resetLength, list, _loop, _ret, i;
293
291
  return _regeneratorRuntime().wrap(function _callee2$(_context3) {
@@ -426,11 +424,11 @@ var useUpload = function useUpload(props) {
426
424
  }
427
425
  }, _callee2);
428
426
  }));
429
- return function addFiles(_x3) {
427
+ return function (_x3) {
430
428
  return _ref2.apply(this, arguments);
431
429
  };
432
- }();
433
- var removeFile = function removeFile(id) {
430
+ }());
431
+ var removeFile = (0, _usePersistFn.default)(function (id) {
434
432
  var beforeCancel = props.beforeCancel,
435
433
  onErrorRemove = props.onErrorRemove;
436
434
  var file = filesState[id];
@@ -448,8 +446,8 @@ var useUpload = function useUpload(props) {
448
446
  onErrorRemove(file.xhr, file.blob, file);
449
447
  }
450
448
  }
451
- };
452
- var removeValue = function removeValue(index) {
449
+ });
450
+ var removeValue = (0, _usePersistFn.default)(function (index) {
453
451
  if (props.disabled) return;
454
452
  var recoverAble = props.recoverAble,
455
453
  beforeRemove = props.beforeRemove;
@@ -461,15 +459,15 @@ var useUpload = function useUpload(props) {
461
459
  newRecycle.push(value[index]);
462
460
  }
463
461
  setRecycleValues(newRecycle);
464
- var newValue = (0, _immer.produce)(props.value, function (draft) {
462
+ var newValue = (0, _immer.produce)(latestState.value, function (draft) {
465
463
  draft.splice(index, 1);
466
464
  });
467
465
  props.onChange(newValue);
468
466
  }).catch(function () {});
469
- };
470
- var recoverValue = function recoverValue(index) {
467
+ });
468
+ var recoverValue = (0, _usePersistFn.default)(function (index) {
471
469
  if (props.disabled) return;
472
- props.onChange((0, _immer.produce)(props.value, function (draft) {
470
+ props.onChange((0, _immer.produce)(latestState.value, function (draft) {
473
471
  draft.push(recycleValues[index]);
474
472
  }));
475
473
  setRecycleValues(function (pre) {
@@ -477,7 +475,7 @@ var useUpload = function useUpload(props) {
477
475
  newRecycle.splice(index, 1);
478
476
  return newRecycle;
479
477
  });
480
- };
478
+ });
481
479
  var func = (0, _useLatestObj.default)({
482
480
  addFiles: addFiles,
483
481
  removeFile: removeFile,
@@ -105,7 +105,7 @@ export interface RuleFuncResult {
105
105
  export type RuleResult = {
106
106
  [key: string]: RuleFuncResult;
107
107
  } | RuleCommonResult;
108
- export type RuleResultValue = ValueOf<RuleResult>;
108
+ export type RuleResultValue = RuleFuncResult | ValueOf<RuleCommonResult>;
109
109
  export type FormItemObjectRule = Type & RegExpParams & Range & Min & Max & Required & {
110
110
  func?: ValidFunc;
111
111
  args?: any;
@@ -1 +1 @@
1
- {"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,OAAO,CAAC,UAAU,CAAC,CAAC;AAGlD,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"}
1
+ {"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}
@@ -1 +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"}
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;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"}
@@ -8,6 +8,7 @@ var _nullable = _interopRequireDefault(require("./nullable"));
8
8
  var _is = require("../is");
9
9
  var _type = _interopRequireDefault(require("./type"));
10
10
  var _error = require("./error");
11
+ var _string = require("../string");
11
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
13
  function getRule(rule, props) {
13
14
  var po = props;
@@ -30,7 +31,7 @@ function getRule(rule, props) {
30
31
  max: max,
31
32
  args: args
32
33
  });
33
- po.message = typeof message === 'function' ? message(po) : message;
34
+ po.message = typeof message === 'function' ? message(po) : (0, _string.substitute)(message, po);
34
35
  var cb = function cb() {};
35
36
  if (func) {
36
37
  cb = function cb(value, formData, callback) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAI7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;AACnD,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,MAAM,EAAE;IAE5D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC/B,QAkCA;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAI7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;AACnD,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,MAAM,EAAE;IAE5D,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC/B,QAqCA;AAED,eAAe,YAAY,CAAC"}
@@ -37,7 +37,10 @@ export function useClickAway(params) {
37
37
  }
38
38
  return function () {
39
39
  // @ts-ignore
40
- document.removeEventListener(event, handleClickAway);
40
+ document.removeEventListener(event, handleClickAway, {
41
+ // 解决 点击后立刻删除dom导致获取不到元素; contains(target) 为 false 的问题
42
+ capture: true
43
+ });
41
44
  };
42
45
  }, [effect]);
43
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"use-transform.d.ts","sourceRoot":"","sources":["use-transform.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,QAAA,MAAM,YAAY,aAAc,iBAAiB;;;;;;;;8BAwBd,MAAM;;;CAqFxC,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"use-transform.d.ts","sourceRoot":"","sources":["use-transform.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,QAAA,MAAM,YAAY,aAAc,iBAAiB;;;;;;;;8BAwBd,MAAM;;;CAsFxC,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -97,6 +97,7 @@ var useTransform = function useTransform(props) {
97
97
  if (!containerDimension || !targetDimension) return;
98
98
  if (targetDimension <= containerDimension) {
99
99
  setShouldScroll(false);
100
+ setDelta(0);
100
101
  } else {
101
102
  setShouldScroll(true);
102
103
  }