@sheinx/hooks 3.0.0-rc.1 → 3.0.0-rc.2

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.
@@ -21,7 +21,6 @@ require("core-js/modules/es.array.concat.js");
21
21
  require("core-js/modules/es.set.js");
22
22
  require("core-js/modules/es.array.splice.js");
23
23
  require("core-js/modules/es.array.from.js");
24
- require("core-js/modules/web.dom-collections.for-each.js");
25
24
  require("core-js/modules/es.object.values.js");
26
25
  var _utils = require("../../utils");
27
26
  var _react = _interopRequireWildcard(require("react"));
@@ -237,24 +236,21 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
237
236
  var getCheckedStatus = (0, _usePersistFn.default)(function (childrenKey) {
238
237
  if (valueArr.length === 0) return false;
239
238
  var dataMap = getDataMap(childrenKey);
240
- var valueMap = getValueMap();
241
239
  var formatValues = Array.from(dataMap, function (_ref) {
242
240
  var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
243
- value = _ref2[0],
241
+ _value = _ref2[0],
244
242
  data = _ref2[1];
245
- return [value, data];
243
+ return data;
246
244
  });
247
245
  var checkedNum = 0;
248
246
  var validateNum = 0;
249
- formatValues.forEach(function (_ref3) {
250
- var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
251
- value = _ref4[0],
252
- data = _ref4[1];
247
+ for (var i = 0; i < formatValues.length; i++) {
248
+ var data = formatValues[i];
253
249
  if (!disabledCheck(data)) {
254
250
  validateNum++;
255
- if (valueMap.get(value)) checkedNum++;
251
+ if (check(data)) checkedNum++;
256
252
  }
257
- });
253
+ }
258
254
  if (checkedNum === 0) return false;
259
255
  if (checkedNum === validateNum) return true;
260
256
  return 'indeterminate';
@@ -11,11 +11,11 @@ declare const useButton: (props?: BaseButtonProps) => {
11
11
  size?: "small" | "default" | "large" | undefined;
12
12
  space?: boolean | undefined;
13
13
  shape?: import("./use-button.type").ButtonShape | undefined;
14
+ buttonRef?: React.Ref<HTMLButtonElement> | undefined;
14
15
  } & TOther & {
15
16
  href: string | undefined;
16
17
  target: string | undefined;
17
18
  onClick: (event: React.MouseEvent<HTMLButtonElement> | React.MouseEvent<HTMLAnchorElement>) => void;
18
- onRef: React.Ref<HTMLAnchorElement | HTMLButtonElement> | undefined;
19
19
  };
20
20
  getButtonProps: <TOther_1 extends ObjectType<any> = ObjectType<any>>(externalProps?: TOther_1) => {
21
21
  mode?: import("./use-button.type").ButtonMode | undefined;
@@ -25,11 +25,10 @@ declare const useButton: (props?: BaseButtonProps) => {
25
25
  size?: "small" | "default" | "large" | undefined;
26
26
  space?: boolean | undefined;
27
27
  shape?: import("./use-button.type").ButtonShape | undefined;
28
+ buttonRef?: React.Ref<HTMLButtonElement> | undefined;
28
29
  } & TOther_1 & {
29
- ref: ((instance: HTMLButtonElement | null) => void) | null;
30
30
  disabled: boolean | undefined;
31
31
  htmlType: "reset" | "submit" | "button" | undefined;
32
- onRef: React.Ref<HTMLAnchorElement | HTMLButtonElement> | undefined;
33
32
  onClick: (event: React.MouseEvent<HTMLButtonElement> | React.MouseEvent<HTMLAnchorElement>) => void;
34
33
  };
35
34
  getSpaceChildren: (children: React.ReactNode, space?: boolean, className?: string) => React.ReactNode;
@@ -1 +1 @@
1
- {"version":3,"file":"use-button.d.ts","sourceRoot":"","sources":["use-button.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,QAAA,MAAM,SAAS,WAAW,eAAe;;;;;;;;;;;;;yBAmB7B,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;;;yBAAzE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;iCAQ/C,MAAM,SAAS,UAAU,OAAO,cAAc,MAAM;CAqDzF,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"use-button.d.ts","sourceRoot":"","sources":["use-button.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,QAAA,MAAM,SAAS,WAAW,eAAe;;;;;;;;;;;;;;yBAK7B,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;yBAAzE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;iCAQ/C,MAAM,SAAS,UAAU,OAAO,cAAc,MAAM;CAgDzF,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -3,24 +3,16 @@
3
3
  require("core-js/modules/es.array.filter.js");
4
4
  require("core-js/modules/web.dom-collections.for-each.js");
5
5
  require("core-js/modules/es.object.get-own-property-descriptors.js");
6
- require("core-js/modules/es.array.iterator.js");
7
- require("core-js/modules/es.weak-map.js");
8
- require("core-js/modules/web.dom-collections.iterator.js");
9
6
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
10
- var _typeof = require("@babel/runtime/helpers/typeof");
11
7
  Object.defineProperty(exports, "__esModule", {
12
8
  value: true
13
9
  });
14
10
  exports.default = void 0;
15
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
17
- var React = _interopRequireWildcard(require("react"));
18
- var _useForkRef = _interopRequireDefault(require("../../common/use-fork-ref"));
19
13
  var _utils = require("../../utils");
20
14
  var _element = require("../../utils/dom/element");
21
- var _excluded = ["htmlType", "href", "target", "buttonRef", "disabled", "loading", "onClick", "onRef"];
22
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
23
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
15
+ var _excluded = ["htmlType", "href", "target", "disabled", "loading", "onClick"];
24
16
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
25
17
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
26
18
  var useButton = function useButton() {
@@ -28,14 +20,10 @@ var useButton = function useButton() {
28
20
  var htmlType = props.htmlType,
29
21
  href = props.href,
30
22
  target = props.target,
31
- buttonRefPo = props.buttonRef,
32
23
  disabled = props.disabled,
33
24
  loading = props.loading,
34
25
  onClick = props.onClick,
35
- onRef = props.onRef,
36
26
  propsToForward = (0, _objectWithoutProperties2.default)(props, _excluded);
37
- var buttonRef = React.useRef(null);
38
- var handleButtonRef = (0, _useForkRef.default)(buttonRef, buttonRefPo);
39
27
  var handleClick = function handleClick(otherHandlers) {
40
28
  return function (event) {
41
29
  var _otherHandlers$onClic;
@@ -53,8 +41,7 @@ var useButton = function useButton() {
53
41
  var externalProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
54
42
  var externalEventHandlers = _objectSpread({}, (0, _utils.extractEventHandlers)(externalProps));
55
43
  var mergedEventHandlers = _objectSpread(_objectSpread(_objectSpread({}, propsToForward), externalProps), {}, {
56
- onClick: handleClick(externalEventHandlers),
57
- onRef: onRef
44
+ onClick: handleClick(externalEventHandlers)
58
45
  });
59
46
  return _objectSpread(_objectSpread({}, mergedEventHandlers), {}, {
60
47
  href: href,
@@ -67,12 +54,9 @@ var useButton = function useButton() {
67
54
  var mergedEventHandlers = _objectSpread(_objectSpread(_objectSpread({}, propsToForward), externalProps), {}, {
68
55
  disabled: disabled || loading,
69
56
  htmlType: htmlType,
70
- onRef: onRef,
71
57
  onClick: handleClick(externalEventHandlers)
72
58
  });
73
- return _objectSpread(_objectSpread({}, mergedEventHandlers), {}, {
74
- ref: handleButtonRef
75
- });
59
+ return mergedEventHandlers;
76
60
  };
77
61
  return {
78
62
  disabled: disabled,
@@ -81,10 +81,5 @@ export interface BaseButtonProps {
81
81
  * @cn 按钮点击回调
82
82
  */
83
83
  onClick?: React.MouseEventHandler;
84
- /**
85
- * @en Get button dom
86
- * @cn 获取按钮节点
87
- */
88
- onRef?: React.Ref<HTMLButtonElement | HTMLAnchorElement>;
89
84
  }
90
85
  //# sourceMappingURL=use-button.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-button.type.d.ts","sourceRoot":"","sources":["use-button.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,oBAAY,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AACxD,oBAAY,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AACvD,oBAAY,UAAU,GAClB,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,GACT,MAAM,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,CAAC;CAC1D"}
1
+ {"version":3,"file":"use-button.type.d.ts","sourceRoot":"","sources":["use-button.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,oBAAY,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AACxD,oBAAY,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AACvD,oBAAY,UAAU,GAClB,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,GACT,MAAM,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;CACnC"}
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAgM5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAiM5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -292,6 +292,8 @@ var useTableLayout = function useTableLayout(props) {
292
292
  } else {
293
293
  checkFloat();
294
294
  checkScroll();
295
+ // 拖拽列会导致 scrollWidth 变化
296
+ syncScrollWidth();
295
297
  }
296
298
  }, [colgroup]);
297
299
  return {
@@ -1,6 +1,6 @@
1
1
  import type { BaseTableProps } from './use-table.type';
2
2
  import { OptionalToRequired } from '../../common/type';
3
- export interface UseTableTreeProps extends Pick<OptionalToRequired<BaseTableProps<any>>, 'onTreeExpand' | 'treeCheckAll' | 'treeExpandKeys' | 'defaultTreeExpandKeys' | 'keygen'> {
3
+ export interface UseTableTreeProps extends Pick<OptionalToRequired<BaseTableProps<any>>, 'onTreeExpand' | 'treeExpandKeys' | 'defaultTreeExpandKeys' | 'keygen'> {
4
4
  treeColumnsName: string | undefined;
5
5
  data: any[];
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACxF;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA4DR,GAAG,SAAS,MAAM;iCA9ChB,GAAG,SAAS,MAAM;;CAsEhE,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAoCvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA2ChE,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -5,24 +5,52 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.useTableTree = exports.default = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
8
10
  require("core-js/modules/es.array.iterator.js");
9
11
  require("core-js/modules/es.set.js");
10
12
  require("core-js/modules/web.dom-collections.iterator.js");
11
- require("core-js/modules/es.array.from.js");
12
13
  require("core-js/modules/es.map.js");
13
14
  require("core-js/modules/web.dom-collections.for-each.js");
14
15
  require("core-js/modules/es.array.splice.js");
15
16
  require("core-js/modules/es.array.concat.js");
17
+ require("core-js/modules/es.array.from.js");
16
18
  require("core-js/modules/es.array.includes.js");
17
19
  require("core-js/modules/es.string.includes.js");
18
20
  require("core-js/modules/es.array.filter.js");
19
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
20
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
21
21
  var _react = require("react");
22
22
  var _usePersistFn = require("../../common/use-persist-fn");
23
23
  var _render = require("../../utils/render");
24
24
  var _is = require("../../utils/is");
25
25
  var _useLatestObj = require("../../common/use-latest-obj");
26
+ var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
27
+ var expandKeys = keys;
28
+ var expandSet = new Set(expandKeys);
29
+ var expandLevel = new Map();
30
+ if (expandSet.size === 0 || !treeColumnsName) {
31
+ return [data, expandLevel];
32
+ }
33
+ var newData = (0, _toConsumableArray2.default)(data || []);
34
+ var _loop = function _loop() {
35
+ if (expandSet.size === 0) return "break";
36
+ var item = newData[i];
37
+ var key = (0, _render.getKey)(keygen, item, i);
38
+ var parentLevel = expandLevel.get(key) || 0;
39
+ var children = (0, _is.isObject)(item) && item[treeColumnsName];
40
+ if (expandSet.has(key) && children) {
41
+ children.forEach(function (child) {
42
+ expandLevel.set((0, _render.getKey)(keygen, child), parentLevel + 1);
43
+ });
44
+ newData.splice.apply(newData, [i + 1, 0].concat((0, _toConsumableArray2.default)(children)));
45
+ expandSet.delete(key);
46
+ }
47
+ };
48
+ for (var i = 0; i < newData.length; i++) {
49
+ var _ret = _loop();
50
+ if (_ret === "break") break;
51
+ }
52
+ return [newData, expandLevel];
53
+ };
26
54
  var useTableTree = function useTableTree(props) {
27
55
  var _props$data$filter;
28
56
  var _useState = (0, _react.useState)(props.defaultTreeExpandKeys || []),
@@ -36,11 +64,8 @@ var useTableTree = function useTableTree(props) {
36
64
  (0, _react.useEffect)(function () {
37
65
  context.changedByExpand = false;
38
66
  }, [expandKeysState, props.treeExpandKeys]);
39
- var getExpandKeys = function getExpandKeys() {
40
- return props.treeExpandKeys === undefined ? expandKeysState : props.treeExpandKeys;
41
- };
67
+ var expandKeys = props.treeExpandKeys === undefined ? expandKeysState : props.treeExpandKeys;
42
68
  var handleTreeExpand = (0, _usePersistFn.usePersistFn)(function (data, index) {
43
- var expandKeys = getExpandKeys();
44
69
  var key = (0, _render.getKey)(props.keygen, data, index);
45
70
  var changeKeys = new Set(expandKeys);
46
71
  if (changeKeys.has(key)) {
@@ -56,37 +81,8 @@ var useTableTree = function useTableTree(props) {
56
81
  }
57
82
  context.changedByExpand = true;
58
83
  });
59
- var getExpandData = function getExpandData() {
60
- var expandKeys = getExpandKeys();
61
- var expandSet = new Set(expandKeys);
62
- var expandLevel = new Map();
63
- if (expandSet.size === 0 || !props.treeColumnsName) {
64
- return [props.data, expandLevel];
65
- }
66
- var newData = (0, _toConsumableArray2.default)(props.data || []);
67
- var _loop = function _loop() {
68
- if (expandSet.size === 0) return "break";
69
- var item = newData[i];
70
- var key = (0, _render.getKey)(props.keygen, item, i);
71
- var parentLevel = expandLevel.get(key) || 0;
72
- var children = (0, _is.isObject)(item) && item[props.treeColumnsName];
73
- if (expandSet.has(key) && children) {
74
- children.forEach(function (child) {
75
- expandLevel.set((0, _render.getKey)(props.keygen, child), parentLevel + 1);
76
- });
77
- newData.splice.apply(newData, [i + 1, 0].concat((0, _toConsumableArray2.default)(children)));
78
- expandSet.delete(key);
79
- }
80
- };
81
- for (var i = 0; i < newData.length; i++) {
82
- var _ret = _loop();
83
- if (_ret === "break") break;
84
- }
85
- return [newData, expandLevel];
86
- };
87
84
  var isTreeExpanded = (0, _usePersistFn.usePersistFn)(function (data, index) {
88
85
  if (!props.treeColumnsName) return false;
89
- var expandKeys = getExpandKeys();
90
86
  var key = (0, _render.getKey)(props.keygen, data, index);
91
87
  return expandKeys.includes(key);
92
88
  });
@@ -94,10 +90,12 @@ var useTableTree = function useTableTree(props) {
94
90
  isTreeExpanded: isTreeExpanded,
95
91
  handleTreeExpand: handleTreeExpand
96
92
  });
97
- var _getExpandData = getExpandData(),
98
- _getExpandData2 = (0, _slicedToArray2.default)(_getExpandData, 2),
99
- treeData = _getExpandData2[0],
100
- treeExpandLevel = _getExpandData2[1];
93
+ var _useMemo = (0, _react.useMemo)(function () {
94
+ return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
95
+ }, [props.data, expandKeys, props.treeColumnsName]),
96
+ _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
97
+ treeData = _useMemo2[0],
98
+ treeExpandLevel = _useMemo2[1];
101
99
  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
102
100
  var _item;
103
101
  return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
@@ -21,7 +21,6 @@ require("core-js/modules/es.array.concat.js");
21
21
  require("core-js/modules/es.set.js");
22
22
  require("core-js/modules/es.array.splice.js");
23
23
  require("core-js/modules/es.array.from.js");
24
- require("core-js/modules/web.dom-collections.for-each.js");
25
24
  require("core-js/modules/es.object.values.js");
26
25
  var _utils = require("../../utils");
27
26
  var _react = _interopRequireWildcard(require("react"));
@@ -237,24 +236,21 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
237
236
  var getCheckedStatus = (0, _usePersistFn.default)(function (childrenKey) {
238
237
  if (valueArr.length === 0) return false;
239
238
  var dataMap = getDataMap(childrenKey);
240
- var valueMap = getValueMap();
241
239
  var formatValues = Array.from(dataMap, function (_ref) {
242
240
  var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
243
- value = _ref2[0],
241
+ _value = _ref2[0],
244
242
  data = _ref2[1];
245
- return [value, data];
243
+ return data;
246
244
  });
247
245
  var checkedNum = 0;
248
246
  var validateNum = 0;
249
- formatValues.forEach(function (_ref3) {
250
- var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
251
- value = _ref4[0],
252
- data = _ref4[1];
247
+ for (var i = 0; i < formatValues.length; i++) {
248
+ var data = formatValues[i];
253
249
  if (!disabledCheck(data)) {
254
250
  validateNum++;
255
- if (valueMap.get(value)) checkedNum++;
251
+ if (check(data)) checkedNum++;
256
252
  }
257
- });
253
+ }
258
254
  if (checkedNum === 0) return false;
259
255
  if (checkedNum === validateNum) return true;
260
256
  return 'indeterminate';
@@ -11,11 +11,11 @@ declare const useButton: (props?: BaseButtonProps) => {
11
11
  size?: "small" | "default" | "large" | undefined;
12
12
  space?: boolean | undefined;
13
13
  shape?: import("./use-button.type").ButtonShape | undefined;
14
+ buttonRef?: React.Ref<HTMLButtonElement> | undefined;
14
15
  } & TOther & {
15
16
  href: string | undefined;
16
17
  target: string | undefined;
17
18
  onClick: (event: React.MouseEvent<HTMLButtonElement> | React.MouseEvent<HTMLAnchorElement>) => void;
18
- onRef: React.Ref<HTMLAnchorElement | HTMLButtonElement> | undefined;
19
19
  };
20
20
  getButtonProps: <TOther_1 extends ObjectType<any> = ObjectType<any>>(externalProps?: TOther_1) => {
21
21
  mode?: import("./use-button.type").ButtonMode | undefined;
@@ -25,11 +25,10 @@ declare const useButton: (props?: BaseButtonProps) => {
25
25
  size?: "small" | "default" | "large" | undefined;
26
26
  space?: boolean | undefined;
27
27
  shape?: import("./use-button.type").ButtonShape | undefined;
28
+ buttonRef?: React.Ref<HTMLButtonElement> | undefined;
28
29
  } & TOther_1 & {
29
- ref: ((instance: HTMLButtonElement | null) => void) | null;
30
30
  disabled: boolean | undefined;
31
31
  htmlType: "reset" | "submit" | "button" | undefined;
32
- onRef: React.Ref<HTMLAnchorElement | HTMLButtonElement> | undefined;
33
32
  onClick: (event: React.MouseEvent<HTMLButtonElement> | React.MouseEvent<HTMLAnchorElement>) => void;
34
33
  };
35
34
  getSpaceChildren: (children: React.ReactNode, space?: boolean, className?: string) => React.ReactNode;
@@ -1 +1 @@
1
- {"version":3,"file":"use-button.d.ts","sourceRoot":"","sources":["use-button.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,QAAA,MAAM,SAAS,WAAW,eAAe;;;;;;;;;;;;;yBAmB7B,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;;;yBAAzE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;iCAQ/C,MAAM,SAAS,UAAU,OAAO,cAAc,MAAM;CAqDzF,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"use-button.d.ts","sourceRoot":"","sources":["use-button.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,QAAA,MAAM,SAAS,WAAW,eAAe;;;;;;;;;;;;;;yBAK7B,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;yBAAzE,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC;;iCAQ/C,MAAM,SAAS,UAAU,OAAO,cAAc,MAAM;CAgDzF,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -3,24 +3,16 @@
3
3
  require("core-js/modules/es.array.filter.js");
4
4
  require("core-js/modules/web.dom-collections.for-each.js");
5
5
  require("core-js/modules/es.object.get-own-property-descriptors.js");
6
- require("core-js/modules/es.array.iterator.js");
7
- require("core-js/modules/es.weak-map.js");
8
- require("core-js/modules/web.dom-collections.iterator.js");
9
6
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
10
- var _typeof = require("@babel/runtime/helpers/typeof");
11
7
  Object.defineProperty(exports, "__esModule", {
12
8
  value: true
13
9
  });
14
10
  exports.default = void 0;
15
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
17
- var React = _interopRequireWildcard(require("react"));
18
- var _useForkRef = _interopRequireDefault(require("../../common/use-fork-ref"));
19
13
  var _utils = require("../../utils");
20
14
  var _element = require("../../utils/dom/element");
21
- var _excluded = ["htmlType", "href", "target", "buttonRef", "disabled", "loading", "onClick", "onRef"];
22
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
23
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
15
+ var _excluded = ["htmlType", "href", "target", "disabled", "loading", "onClick"];
24
16
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
25
17
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
26
18
  var useButton = function useButton() {
@@ -28,14 +20,10 @@ var useButton = function useButton() {
28
20
  var htmlType = props.htmlType,
29
21
  href = props.href,
30
22
  target = props.target,
31
- buttonRefPo = props.buttonRef,
32
23
  disabled = props.disabled,
33
24
  loading = props.loading,
34
25
  onClick = props.onClick,
35
- onRef = props.onRef,
36
26
  propsToForward = (0, _objectWithoutProperties2.default)(props, _excluded);
37
- var buttonRef = React.useRef(null);
38
- var handleButtonRef = (0, _useForkRef.default)(buttonRef, buttonRefPo);
39
27
  var handleClick = function handleClick(otherHandlers) {
40
28
  return function (event) {
41
29
  var _otherHandlers$onClic;
@@ -53,8 +41,7 @@ var useButton = function useButton() {
53
41
  var externalProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
54
42
  var externalEventHandlers = _objectSpread({}, (0, _utils.extractEventHandlers)(externalProps));
55
43
  var mergedEventHandlers = _objectSpread(_objectSpread(_objectSpread({}, propsToForward), externalProps), {}, {
56
- onClick: handleClick(externalEventHandlers),
57
- onRef: onRef
44
+ onClick: handleClick(externalEventHandlers)
58
45
  });
59
46
  return _objectSpread(_objectSpread({}, mergedEventHandlers), {}, {
60
47
  href: href,
@@ -67,12 +54,9 @@ var useButton = function useButton() {
67
54
  var mergedEventHandlers = _objectSpread(_objectSpread(_objectSpread({}, propsToForward), externalProps), {}, {
68
55
  disabled: disabled || loading,
69
56
  htmlType: htmlType,
70
- onRef: onRef,
71
57
  onClick: handleClick(externalEventHandlers)
72
58
  });
73
- return _objectSpread(_objectSpread({}, mergedEventHandlers), {}, {
74
- ref: handleButtonRef
75
- });
59
+ return mergedEventHandlers;
76
60
  };
77
61
  return {
78
62
  disabled: disabled,
@@ -81,10 +81,5 @@ export interface BaseButtonProps {
81
81
  * @cn 按钮点击回调
82
82
  */
83
83
  onClick?: React.MouseEventHandler;
84
- /**
85
- * @en Get button dom
86
- * @cn 获取按钮节点
87
- */
88
- onRef?: React.Ref<HTMLButtonElement | HTMLAnchorElement>;
89
84
  }
90
85
  //# sourceMappingURL=use-button.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-button.type.d.ts","sourceRoot":"","sources":["use-button.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,oBAAY,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AACxD,oBAAY,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AACvD,oBAAY,UAAU,GAClB,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,GACT,MAAM,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,CAAC;CAC1D"}
1
+ {"version":3,"file":"use-button.type.d.ts","sourceRoot":"","sources":["use-button.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,oBAAY,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AACxD,oBAAY,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AACvD,oBAAY,UAAU,GAClB,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,GACT,SAAS,GACT,MAAM,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;CACnC"}
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAgM5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CACzC;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA8CX,MAAM,UAAU,MAAM;;;;;;;;CAiM5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -292,6 +292,8 @@ var useTableLayout = function useTableLayout(props) {
292
292
  } else {
293
293
  checkFloat();
294
294
  checkScroll();
295
+ // 拖拽列会导致 scrollWidth 变化
296
+ syncScrollWidth();
295
297
  }
296
298
  }, [colgroup]);
297
299
  return {
@@ -1,6 +1,6 @@
1
1
  import type { BaseTableProps } from './use-table.type';
2
2
  import { OptionalToRequired } from '../../common/type';
3
- export interface UseTableTreeProps extends Pick<OptionalToRequired<BaseTableProps<any>>, 'onTreeExpand' | 'treeCheckAll' | 'treeExpandKeys' | 'defaultTreeExpandKeys' | 'keygen'> {
3
+ export interface UseTableTreeProps extends Pick<OptionalToRequired<BaseTableProps<any>>, 'onTreeExpand' | 'treeExpandKeys' | 'defaultTreeExpandKeys' | 'keygen'> {
4
4
  treeColumnsName: string | undefined;
5
5
  data: any[];
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACxF;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA4DR,GAAG,SAAS,MAAM;iCA9ChB,GAAG,SAAS,MAAM;;CAsEhE,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"use-table-tree.d.ts","sourceRoot":"","sources":["use-table-tree.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAoCvD,MAAM,WAAW,iBACf,SAAQ,IAAI,CACV,kBAAkB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EACvC,cAAc,GAAG,gBAAgB,GAAG,uBAAuB,GAAG,QAAQ,CACvE;IACD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED,eAAO,MAAM,YAAY,UAAW,iBAAiB;;;;;;+BA6BR,GAAG,SAAS,MAAM;iCAjBhB,GAAG,SAAS,MAAM;;CA2ChE,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -5,24 +5,52 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.useTableTree = exports.default = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
8
10
  require("core-js/modules/es.array.iterator.js");
9
11
  require("core-js/modules/es.set.js");
10
12
  require("core-js/modules/web.dom-collections.iterator.js");
11
- require("core-js/modules/es.array.from.js");
12
13
  require("core-js/modules/es.map.js");
13
14
  require("core-js/modules/web.dom-collections.for-each.js");
14
15
  require("core-js/modules/es.array.splice.js");
15
16
  require("core-js/modules/es.array.concat.js");
17
+ require("core-js/modules/es.array.from.js");
16
18
  require("core-js/modules/es.array.includes.js");
17
19
  require("core-js/modules/es.string.includes.js");
18
20
  require("core-js/modules/es.array.filter.js");
19
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
20
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
21
21
  var _react = require("react");
22
22
  var _usePersistFn = require("../../common/use-persist-fn");
23
23
  var _render = require("../../utils/render");
24
24
  var _is = require("../../utils/is");
25
25
  var _useLatestObj = require("../../common/use-latest-obj");
26
+ var getExpandData = function getExpandData(data, keys, keygen, treeColumnsName) {
27
+ var expandKeys = keys;
28
+ var expandSet = new Set(expandKeys);
29
+ var expandLevel = new Map();
30
+ if (expandSet.size === 0 || !treeColumnsName) {
31
+ return [data, expandLevel];
32
+ }
33
+ var newData = (0, _toConsumableArray2.default)(data || []);
34
+ var _loop = function _loop() {
35
+ if (expandSet.size === 0) return "break";
36
+ var item = newData[i];
37
+ var key = (0, _render.getKey)(keygen, item, i);
38
+ var parentLevel = expandLevel.get(key) || 0;
39
+ var children = (0, _is.isObject)(item) && item[treeColumnsName];
40
+ if (expandSet.has(key) && children) {
41
+ children.forEach(function (child) {
42
+ expandLevel.set((0, _render.getKey)(keygen, child), parentLevel + 1);
43
+ });
44
+ newData.splice.apply(newData, [i + 1, 0].concat((0, _toConsumableArray2.default)(children)));
45
+ expandSet.delete(key);
46
+ }
47
+ };
48
+ for (var i = 0; i < newData.length; i++) {
49
+ var _ret = _loop();
50
+ if (_ret === "break") break;
51
+ }
52
+ return [newData, expandLevel];
53
+ };
26
54
  var useTableTree = function useTableTree(props) {
27
55
  var _props$data$filter;
28
56
  var _useState = (0, _react.useState)(props.defaultTreeExpandKeys || []),
@@ -36,11 +64,8 @@ var useTableTree = function useTableTree(props) {
36
64
  (0, _react.useEffect)(function () {
37
65
  context.changedByExpand = false;
38
66
  }, [expandKeysState, props.treeExpandKeys]);
39
- var getExpandKeys = function getExpandKeys() {
40
- return props.treeExpandKeys === undefined ? expandKeysState : props.treeExpandKeys;
41
- };
67
+ var expandKeys = props.treeExpandKeys === undefined ? expandKeysState : props.treeExpandKeys;
42
68
  var handleTreeExpand = (0, _usePersistFn.usePersistFn)(function (data, index) {
43
- var expandKeys = getExpandKeys();
44
69
  var key = (0, _render.getKey)(props.keygen, data, index);
45
70
  var changeKeys = new Set(expandKeys);
46
71
  if (changeKeys.has(key)) {
@@ -56,37 +81,8 @@ var useTableTree = function useTableTree(props) {
56
81
  }
57
82
  context.changedByExpand = true;
58
83
  });
59
- var getExpandData = function getExpandData() {
60
- var expandKeys = getExpandKeys();
61
- var expandSet = new Set(expandKeys);
62
- var expandLevel = new Map();
63
- if (expandSet.size === 0 || !props.treeColumnsName) {
64
- return [props.data, expandLevel];
65
- }
66
- var newData = (0, _toConsumableArray2.default)(props.data || []);
67
- var _loop = function _loop() {
68
- if (expandSet.size === 0) return "break";
69
- var item = newData[i];
70
- var key = (0, _render.getKey)(props.keygen, item, i);
71
- var parentLevel = expandLevel.get(key) || 0;
72
- var children = (0, _is.isObject)(item) && item[props.treeColumnsName];
73
- if (expandSet.has(key) && children) {
74
- children.forEach(function (child) {
75
- expandLevel.set((0, _render.getKey)(props.keygen, child), parentLevel + 1);
76
- });
77
- newData.splice.apply(newData, [i + 1, 0].concat((0, _toConsumableArray2.default)(children)));
78
- expandSet.delete(key);
79
- }
80
- };
81
- for (var i = 0; i < newData.length; i++) {
82
- var _ret = _loop();
83
- if (_ret === "break") break;
84
- }
85
- return [newData, expandLevel];
86
- };
87
84
  var isTreeExpanded = (0, _usePersistFn.usePersistFn)(function (data, index) {
88
85
  if (!props.treeColumnsName) return false;
89
- var expandKeys = getExpandKeys();
90
86
  var key = (0, _render.getKey)(props.keygen, data, index);
91
87
  return expandKeys.includes(key);
92
88
  });
@@ -94,10 +90,12 @@ var useTableTree = function useTableTree(props) {
94
90
  isTreeExpanded: isTreeExpanded,
95
91
  handleTreeExpand: handleTreeExpand
96
92
  });
97
- var _getExpandData = getExpandData(),
98
- _getExpandData2 = (0, _slicedToArray2.default)(_getExpandData, 2),
99
- treeData = _getExpandData2[0],
100
- treeExpandLevel = _getExpandData2[1];
93
+ var _useMemo = (0, _react.useMemo)(function () {
94
+ return getExpandData(props.data, expandKeys, props.keygen, props.treeColumnsName);
95
+ }, [props.data, expandKeys, props.treeColumnsName]),
96
+ _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
97
+ treeData = _useMemo2[0],
98
+ treeExpandLevel = _useMemo2[1];
101
99
  var isEmptyTree = ((_props$data$filter = props.data.filter(function (item) {
102
100
  var _item;
103
101
  return (_item = item[props.treeColumnsName]) === null || _item === void 0 ? void 0 : _item.length;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/hooks",
3
- "version": "3.0.0-rc.1",
3
+ "version": "3.0.0-rc.2",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "ISC",