@sheinx/hooks 3.6.0-beta.3 → 3.6.0-beta.5
Sign up to get free protection for your applications and to get access to all the features.
- package/cjs/common/use-filter/use-filter.d.ts.map +1 -1
- package/cjs/common/use-position-style/check-border.d.ts +6 -0
- package/cjs/common/use-position-style/check-border.d.ts.map +1 -0
- package/cjs/common/use-position-style/check-border.js +35 -0
- package/cjs/common/use-position-style/get-position-style.d.ts +1 -0
- package/cjs/common/use-position-style/get-position-style.d.ts.map +1 -1
- package/cjs/common/use-position-style/get-position-style.js +14 -8
- package/cjs/common/use-position-style/index.d.ts +1 -0
- package/cjs/common/use-position-style/index.d.ts.map +1 -1
- package/cjs/common/use-position-style/index.js +15 -5
- package/cjs/components/use-cascader/use-cascader.d.ts.map +1 -1
- package/cjs/components/use-cascader/use-cascader.type.d.ts +2 -1
- package/cjs/components/use-cascader/use-cascader.type.d.ts.map +1 -1
- package/cjs/components/use-form/use-form-control/use-form-control.d.ts.map +1 -1
- package/cjs/components/use-form/use-form-control/use-form-control.js +3 -2
- package/cjs/components/use-form/use-form.d.ts.map +1 -1
- package/cjs/components/use-form/use-form.js +5 -4
- package/cjs/components/use-form/use-form.type.d.ts +2 -2
- package/cjs/components/use-form/use-form.type.d.ts.map +1 -1
- package/cjs/components/use-input/use-input-format.d.ts.map +1 -1
- package/cjs/components/use-input/use-input-format.js +12 -4
- package/cjs/components/use-table/use-table-tree.d.ts +13 -0
- package/cjs/components/use-table/use-table-tree.d.ts.map +1 -1
- package/cjs/components/use-table/use-table-tree.js +68 -1
- package/cjs/components/use-table/use-table-virtual.js +3 -3
- package/cjs/components/use-tree/index.d.ts +3 -2
- package/cjs/components/use-tree/index.d.ts.map +1 -1
- package/cjs/components/use-tree/index.js +18 -2
- package/cjs/components/use-tree/use-tree-node.d.ts.map +1 -1
- package/cjs/components/use-tree/use-tree-node.js +1 -5
- package/cjs/components/use-tree/use-tree-node.type.d.ts +18 -0
- package/cjs/components/use-tree/use-tree-node.type.d.ts.map +1 -1
- package/cjs/components/use-tree/use-tree-virtual-node.d.ts +13 -0
- package/cjs/components/use-tree/use-tree-virtual-node.d.ts.map +1 -0
- package/cjs/components/use-tree/use-tree-virtual-node.js +92 -0
- package/cjs/components/use-tree/use-tree.d.ts.map +1 -1
- package/cjs/components/use-tree/use-tree.js +179 -7
- package/cjs/components/use-tree/use-tree.type.d.ts +31 -1
- package/cjs/components/use-tree/use-tree.type.d.ts.map +1 -1
- package/cjs/utils/is.d.ts +2 -0
- package/cjs/utils/is.d.ts.map +1 -1
- package/cjs/utils/is.js +5 -2
- package/cjs/utils/object.d.ts.map +1 -1
- package/cjs/utils/object.js +6 -1
- package/cjs/utils/warning.js +5 -5
- package/esm/common/use-filter/use-filter.d.ts.map +1 -1
- package/esm/common/use-position-style/check-border.d.ts +6 -0
- package/esm/common/use-position-style/check-border.d.ts.map +1 -0
- package/esm/common/use-position-style/check-border.js +29 -0
- package/esm/common/use-position-style/get-position-style.d.ts +1 -0
- package/esm/common/use-position-style/get-position-style.d.ts.map +1 -1
- package/esm/common/use-position-style/get-position-style.js +14 -8
- package/esm/common/use-position-style/index.d.ts +1 -0
- package/esm/common/use-position-style/index.d.ts.map +1 -1
- package/esm/common/use-position-style/index.js +15 -5
- package/esm/components/use-cascader/use-cascader.d.ts.map +1 -1
- package/esm/components/use-cascader/use-cascader.type.d.ts +2 -1
- package/esm/components/use-cascader/use-cascader.type.d.ts.map +1 -1
- package/esm/components/use-form/use-form-control/use-form-control.d.ts.map +1 -1
- package/esm/components/use-form/use-form-control/use-form-control.js +3 -2
- package/esm/components/use-form/use-form.d.ts.map +1 -1
- package/esm/components/use-form/use-form.js +5 -4
- package/esm/components/use-form/use-form.type.d.ts +2 -2
- package/esm/components/use-form/use-form.type.d.ts.map +1 -1
- package/esm/components/use-input/use-input-format.d.ts.map +1 -1
- package/esm/components/use-input/use-input-format.js +12 -4
- package/esm/components/use-table/use-table-tree.d.ts +13 -0
- package/esm/components/use-table/use-table-tree.d.ts.map +1 -1
- package/esm/components/use-table/use-table-tree.js +67 -0
- package/esm/components/use-table/use-table-virtual.js +3 -3
- package/esm/components/use-tree/index.d.ts +3 -2
- package/esm/components/use-tree/index.d.ts.map +1 -1
- package/esm/components/use-tree/index.js +3 -2
- package/esm/components/use-tree/use-tree-node.d.ts.map +1 -1
- package/esm/components/use-tree/use-tree-node.js +1 -5
- package/esm/components/use-tree/use-tree-node.type.d.ts +18 -0
- package/esm/components/use-tree/use-tree-node.type.d.ts.map +1 -1
- package/esm/components/use-tree/use-tree-virtual-node.d.ts +13 -0
- package/esm/components/use-tree/use-tree-virtual-node.d.ts.map +1 -0
- package/esm/components/use-tree/use-tree-virtual-node.js +85 -0
- package/esm/components/use-tree/use-tree.d.ts.map +1 -1
- package/esm/components/use-tree/use-tree.js +181 -9
- package/esm/components/use-tree/use-tree.type.d.ts +31 -1
- package/esm/components/use-tree/use-tree.type.d.ts.map +1 -1
- package/esm/utils/is.d.ts +2 -0
- package/esm/utils/is.d.ts.map +1 -1
- package/esm/utils/is.js +4 -1
- package/esm/utils/object.d.ts.map +1 -1
- package/esm/utils/object.js +6 -1
- package/esm/utils/warning.js +5 -5
- package/package.json +1 -1
package/cjs/utils/warning.js
CHANGED
@@ -15,29 +15,29 @@ var shouldShowMessage = function shouldShowMessage(message) {
|
|
15
15
|
var deprecated = function deprecated(prop, newProp, component, extraMessage) {
|
16
16
|
if (process.env.NODE_ENV !== 'production') {
|
17
17
|
var msg = "[shineout] '".concat(prop, "' in ").concat(component, " component is deprecated, please use '").concat(newProp, "' instead. ").concat(extraMessage);
|
18
|
-
shouldShowMessage(msg)
|
18
|
+
if (shouldShowMessage(msg)) console.error(msg);
|
19
19
|
}
|
20
20
|
};
|
21
21
|
var breakingChange = function breakingChange(message) {
|
22
22
|
if (process.env.NODE_ENV !== 'production') {
|
23
23
|
var msg = "[shineout] ".concat(message);
|
24
|
-
shouldShowMessage(msg)
|
24
|
+
if (shouldShowMessage(msg)) console.error(msg);
|
25
25
|
}
|
26
26
|
};
|
27
27
|
var devWarn = function devWarn(message) {
|
28
28
|
if (process.env.NODE_ENV !== 'production') {
|
29
|
-
shouldShowMessage(message)
|
29
|
+
if (shouldShowMessage(message)) console.warn("[shineout] ".concat(message));
|
30
30
|
}
|
31
31
|
};
|
32
32
|
var conflictWarning = function conflictWarning(component, prop1, prop2) {
|
33
33
|
if (process.env.NODE_ENV !== 'production') {
|
34
34
|
var msg = "[shineout] ".concat(prop1, " and ").concat(prop2, " cannot be used at the same time in ").concat(component, ".");
|
35
|
-
shouldShowMessage(msg)
|
35
|
+
if (shouldShowMessage(msg)) console.warn(msg);
|
36
36
|
}
|
37
37
|
};
|
38
38
|
var error = function error(message) {
|
39
39
|
var msg = new Error("[shineout] ".concat(message));
|
40
|
-
shouldShowMessage(msg.message)
|
40
|
+
if (shouldShowMessage(msg.message)) console.error(msg);
|
41
41
|
};
|
42
42
|
var devUseWarning = exports.devUseWarning = {
|
43
43
|
error: error,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-filter.d.ts","sourceRoot":"","sources":["use-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,QAAA,MAAM,SAAS;;;;;;;;;;kCAmBkD,OAAO;sBAiB1C,MAAM;sBAKN,MAAM,SAAQ,MAAM;;
|
1
|
+
{"version":3,"file":"use-filter.d.ts","sourceRoot":"","sources":["use-filter.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,QAAA,MAAM,SAAS;;;;;;;;;;kCAmBkD,OAAO;sBAiB1C,MAAM;sBAKN,MAAM,SAAQ,MAAM;;CAqGjD,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
@@ -0,0 +1,6 @@
|
|
1
|
+
interface UseCheckElementBorderWidthOptions {
|
2
|
+
direction?: 'horizontal' | 'vertical';
|
3
|
+
}
|
4
|
+
export declare const useCheckElementBorderWidth: (elementRef: React.RefObject<HTMLElement>, options?: UseCheckElementBorderWidthOptions) => number;
|
5
|
+
export {};
|
6
|
+
//# sourceMappingURL=check-border.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"check-border.d.ts","sourceRoot":"","sources":["check-border.ts"],"names":[],"mappings":"AAEA,UAAU,iCAAiC;IAGzC,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;CACvC;AAGD,eAAO,MAAM,0BAA0B,eACzB,MAAM,SAAS,CAAC,WAAW,CAAC,YAC/B,iCAAiC,KACzC,MAqBF,CAAC"}
|
@@ -0,0 +1,29 @@
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
2
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
3
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
4
|
+
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; }
|
5
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
7
|
+
import { useCallback, useEffect, useState } from 'react';
|
8
|
+
export var useCheckElementBorderWidth = function useCheckElementBorderWidth(elementRef) {
|
9
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
10
|
+
var _useState = useState(0),
|
11
|
+
_useState2 = _slicedToArray(_useState, 2),
|
12
|
+
borderWidth = _useState2[0],
|
13
|
+
setBorderWidth = _useState2[1];
|
14
|
+
|
15
|
+
// 获取指定方向上的border宽度之和
|
16
|
+
var getBorderWidth = useCallback(function () {
|
17
|
+
if (elementRef.current) {
|
18
|
+
var _options$direction = options.direction,
|
19
|
+
direction = _options$direction === void 0 ? 'horizontal' : _options$direction;
|
20
|
+
var style = window.getComputedStyle(elementRef.current);
|
21
|
+
var _borderWidth = direction === 'horizontal' ? parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) : parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
|
22
|
+
setBorderWidth(_borderWidth);
|
23
|
+
}
|
24
|
+
}, [elementRef]);
|
25
|
+
useEffect(function () {
|
26
|
+
getBorderWidth();
|
27
|
+
}, [getBorderWidth]);
|
28
|
+
return borderWidth;
|
29
|
+
};
|
@@ -3,5 +3,6 @@ export declare const getPositionStyle: (position: string, config?: {
|
|
3
3
|
popupGap?: number | undefined;
|
4
4
|
zIndex?: number | undefined;
|
5
5
|
fixedWidth?: boolean | "min" | undefined;
|
6
|
+
parentBorderWidth?: number | undefined;
|
6
7
|
} | undefined) => React.CSSProperties;
|
7
8
|
//# sourceMappingURL=get-position-style.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-position-style.d.ts","sourceRoot":"","sources":["get-position-style.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"get-position-style.d.ts","sourceRoot":"","sources":["get-position-style.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,eAAO,MAAM,gBAAgB,aACjB,MAAM;;;;;qCA+CjB,CAAC"}
|
@@ -22,6 +22,9 @@ export var getPositionStyle = function getPositionStyle(position, config) {
|
|
22
22
|
if (config !== null && config !== void 0 && config.fixedWidth) {
|
23
23
|
var key = config.fixedWidth === 'min' ? 'minWidth' : 'width';
|
24
24
|
newStyle[key] = '100%';
|
25
|
+
if (config.parentBorderWidth) {
|
26
|
+
newStyle[key] = "calc(100% + ".concat(config.parentBorderWidth, "px)");
|
27
|
+
}
|
25
28
|
}
|
26
29
|
if (position === 'drop-down') {
|
27
30
|
newStyle.top = mainMargin;
|
@@ -33,19 +36,22 @@ export var getPositionStyle = function getPositionStyle(position, config) {
|
|
33
36
|
var positionArr = (position || '').split('-');
|
34
37
|
if (positionArr.length === 2) {
|
35
38
|
var _positionArr = _slicedToArray(positionArr, 2),
|
36
|
-
|
37
|
-
|
38
|
-
newStyle[ReverseDir[
|
39
|
-
newStyle[
|
39
|
+
vDirection = _positionArr[0],
|
40
|
+
hDirection = _positionArr[1];
|
41
|
+
newStyle[ReverseDir[vDirection]] = mainMargin;
|
42
|
+
newStyle[hDirection] = 0;
|
43
|
+
if (config !== null && config !== void 0 && config.parentBorderWidth) {
|
44
|
+
newStyle[hDirection] = -config.parentBorderWidth / 2;
|
45
|
+
}
|
40
46
|
} else {
|
41
47
|
var _positionArr2 = _slicedToArray(positionArr, 1),
|
42
|
-
|
43
|
-
newStyle[ReverseDir[
|
44
|
-
if (
|
48
|
+
_vDirection = _positionArr2[0];
|
49
|
+
newStyle[ReverseDir[_vDirection]] = mainMargin;
|
50
|
+
if (_vDirection === 'left' || _vDirection === 'right') {
|
45
51
|
newStyle.top = halfMargin;
|
46
52
|
newStyle.transform = 'translateY(-50%)';
|
47
53
|
}
|
48
|
-
if (
|
54
|
+
if (_vDirection === 'top' || _vDirection === 'bottom') {
|
49
55
|
newStyle.left = halfMargin;
|
50
56
|
newStyle.transform = 'translateX(-50%)';
|
51
57
|
}
|
@@ -15,6 +15,7 @@ export interface PositionStyleConfig {
|
|
15
15
|
fixedWidth?: boolean | 'min';
|
16
16
|
updateKey?: number | string;
|
17
17
|
adjust?: boolean;
|
18
|
+
offset?: [number, number];
|
18
19
|
}
|
19
20
|
export declare const usePositionStyle: (config: PositionStyleConfig) => {
|
20
21
|
style: React.CSSProperties;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AASnD,MAAM,MAAM,kBAAkB,GAC1B,aAAa,GACb,UAAU,GACV,cAAc,GACd,WAAW,GACX,MAAM,GACN,OAAO,CAAC;AACZ,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,cAAc,GACd,UAAU,GACV,WAAW,GACX,KAAK,GACL,QAAQ,CAAC;AAYb,KAAK,YAAY,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,OAAO,CAAC;AACpE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IAEd,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE1C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAEzC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3B;AAOD,eAAO,MAAM,gBAAgB,WAAY,mBAAmB;;;CAiT3D,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
@@ -8,6 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
8
8
|
import React, { useEffect, useState } from 'react';
|
9
9
|
import { getPositionStyle } from "./get-position-style";
|
10
10
|
import { useCheckElementPosition } from "./check-position";
|
11
|
+
import { useCheckElementBorderWidth } from "./check-border";
|
11
12
|
import shallowEqual from "../../utils/shallow-equal";
|
12
13
|
import usePersistFn from "../use-persist-fn";
|
13
14
|
import { getCurrentCSSZoom } from "../../utils";
|
@@ -34,7 +35,8 @@ export var usePositionStyle = function usePositionStyle(config) {
|
|
34
35
|
popupElRef = _ref.popupElRef,
|
35
36
|
scrollElRef = _ref.scrollElRef,
|
36
37
|
updateKey = _ref.updateKey,
|
37
|
-
adjust = _ref.adjust
|
38
|
+
adjust = _ref.adjust,
|
39
|
+
offset = _ref.offset;
|
38
40
|
// 初次渲染无样式的时候, 隐藏展示
|
39
41
|
var _useState = useState(hideStyle),
|
40
42
|
_useState2 = _slicedToArray(_useState, 2),
|
@@ -65,6 +67,9 @@ export var usePositionStyle = function usePositionStyle(config) {
|
|
65
67
|
scrollContainer: scrollElRef === null || scrollElRef === void 0 ? void 0 : scrollElRef.current,
|
66
68
|
enable: show && adjust
|
67
69
|
});
|
70
|
+
var parentElBorderWidth = useCheckElementBorderWidth(parentElRef, {
|
71
|
+
direction: 'horizontal'
|
72
|
+
});
|
68
73
|
var adjustPosition = function adjustPosition(position) {
|
69
74
|
var winHeight = docSize.height;
|
70
75
|
if (!verticalPosition.includes(position)) return position;
|
@@ -141,6 +146,9 @@ export var usePositionStyle = function usePositionStyle(config) {
|
|
141
146
|
};
|
142
147
|
context.containerRect = containerRect;
|
143
148
|
context.containerScroll = containerScroll;
|
149
|
+
console.log('======================');
|
150
|
+
console.log('targetPosition: >>', targetPosition);
|
151
|
+
console.log('======================');
|
144
152
|
if (verticalPosition.includes(targetPosition)) {
|
145
153
|
var _targetPosition$split = targetPosition.split('-'),
|
146
154
|
_targetPosition$split2 = _slicedToArray(_targetPosition$split, 2),
|
@@ -216,11 +224,11 @@ export var usePositionStyle = function usePositionStyle(config) {
|
|
216
224
|
_h = _targetPosition$split4[0],
|
217
225
|
_v = _targetPosition$split4[1];
|
218
226
|
if (_v === 'top') {
|
219
|
-
style.top = rect.top - containerRect.top + containerScroll.top;
|
227
|
+
style.top = rect.top - containerRect.top + containerScroll.top - (offset ? offset[1] : 0);
|
220
228
|
style.transform = '';
|
221
229
|
arrayStyle.top = "8px";
|
222
230
|
} else if (_v === 'bottom') {
|
223
|
-
style.top = rect.bottom - containerRect.top + containerScroll.top;
|
231
|
+
style.top = rect.bottom - containerRect.top + containerScroll.top + (offset ? offset[1] : 0);
|
224
232
|
arrayStyle.bottom = "8px";
|
225
233
|
style.transform = 'translateY(-100%)';
|
226
234
|
} else {
|
@@ -295,17 +303,19 @@ export var usePositionStyle = function usePositionStyle(config) {
|
|
295
303
|
newStyle: style
|
296
304
|
};
|
297
305
|
context.parentRect = parentElRef.current.getBoundingClientRect();
|
306
|
+
var realPosition = position;
|
298
307
|
if (adjust) {
|
299
308
|
var popupInfo = getPopUpInfo(context.parentRect);
|
300
309
|
context.popUpHeight = popupInfo.height;
|
301
310
|
context.popUpWidth = popupInfo.width;
|
311
|
+
realPosition = adjustPosition(position);
|
302
312
|
}
|
303
|
-
var realPosition = adjust ? adjustPosition(position) : position;
|
304
313
|
if (!absolute) {
|
305
314
|
newStyle = getPositionStyle(realPosition, {
|
306
315
|
popupGap: popupGap,
|
307
316
|
zIndex: zIndex,
|
308
|
-
fixedWidth: fixedWidth
|
317
|
+
fixedWidth: fixedWidth,
|
318
|
+
parentBorderWidth: parentElBorderWidth
|
309
319
|
});
|
310
320
|
} else {
|
311
321
|
var _ref3 = getAbsoluteStyle(realPosition),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-cascader.d.ts","sourceRoot":"","sources":["use-cascader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,QAAA,MAAM,WAAW;;;;
|
1
|
+
{"version":3,"file":"use-cascader.d.ts","sourceRoot":"","sources":["use-cascader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,QAAA,MAAM,WAAW;;;;CA2ChB,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
@@ -1,4 +1,5 @@
|
|
1
1
|
import { KeygenResult, TreeKeygenType, ObjectKey } from '../../common/type';
|
2
|
+
import { DisabledOption } from '../use-tree';
|
2
3
|
import { TreeModeType } from '../use-tree/use-tree.type';
|
3
4
|
export interface BaseCascaderProps<DataItem, Value extends KeygenResult[]> {
|
4
5
|
value?: Value;
|
@@ -11,7 +12,7 @@ export interface BaseCascaderProps<DataItem, Value extends KeygenResult[]> {
|
|
11
12
|
beforeChange?: (value: Value) => any;
|
12
13
|
mode?: TreeModeType;
|
13
14
|
keygen: TreeKeygenType<DataItem>;
|
14
|
-
disabled?: ((
|
15
|
+
disabled?: DisabledOption<DataItem> | boolean | ((item: DataItem) => boolean);
|
15
16
|
filterSameChange?: boolean;
|
16
17
|
}
|
17
18
|
//# sourceMappingURL=use-cascader.type.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-cascader.type.d.ts","sourceRoot":"","sources":["use-cascader.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,WAAW,iBAAiB,CAAC,QAAQ,EAAE,KAAK,SAAS,YAAY,EAAE;IACvE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAC;IACrC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,
|
1
|
+
{"version":3,"file":"use-cascader.type.d.ts","sourceRoot":"","sources":["use-cascader.type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,WAAW,iBAAiB,CAAC,QAAQ,EAAE,KAAK,SAAS,YAAY,EAAE;IACvE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAC;IACrC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC9E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AA0B/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;
|
1
|
+
{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AA0B/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAkJpC,CAAC,YAAY,GAAG,EAAE;;;;;EAkDrD"}
|
@@ -88,6 +88,7 @@ export default function useFormControl(props) {
|
|
88
88
|
var formValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
89
89
|
var errors = arguments.length > 1 ? arguments[1] : undefined;
|
90
90
|
var severErrors = arguments.length > 2 ? arguments[2] : undefined;
|
91
|
+
var names = arguments.length > 3 ? arguments[3] : undefined;
|
91
92
|
if (!name) return;
|
92
93
|
if (isArray(name)) {
|
93
94
|
var _value = getValue(name, formValue);
|
@@ -99,7 +100,7 @@ export default function useFormControl(props) {
|
|
99
100
|
var dv = isArray(defaultValue) ? defaultValue : [];
|
100
101
|
var nextValue = [];
|
101
102
|
name.forEach(function (n, index) {
|
102
|
-
if (_value[index] === undefined && dv[index] !== undefined) {
|
103
|
+
if (!names.has(n) && _value[index] === undefined && dv[index] !== undefined) {
|
103
104
|
nextValue[index] = dv[index];
|
104
105
|
} else {
|
105
106
|
nextValue[index] = _value[index];
|
@@ -113,7 +114,7 @@ export default function useFormControl(props) {
|
|
113
114
|
setErrorState(_error2);
|
114
115
|
}
|
115
116
|
if (!shallowEqual(_value2, latestInfo.valueState)) {
|
116
|
-
if (_value2 === undefined && defaultValue !== undefined) {
|
117
|
+
if (!names.has(name) && _value2 === undefined && defaultValue !== undefined) {
|
117
118
|
setValueState(defaultValue);
|
118
119
|
} else {
|
119
120
|
setValueState(_value2);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":";AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;
|
1
|
+
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":";AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAiRC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;aAAE;8BApJd,MAAM;oCAuND,OAAO;;6BAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCAlLxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAoPvB,MAAM,WAAW,gBAAgB;gCA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAzHpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2DjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE;0BApJd,MAAM;gCAuND,OAAO;;yBAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCAlLxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAoPvB,MAAM,WAAW,gBAAgB;4BA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAzHpD,MAAM,0BAAyB,qBAAqB;;CA+Y9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -70,7 +70,7 @@ var useForm = function useForm(props) {
|
|
70
70
|
Object.keys(context.updateMap).forEach(function (key) {
|
71
71
|
var _context$updateMap$ke;
|
72
72
|
(_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
|
73
|
-
update(context.value, context.errors, context.serverErrors);
|
73
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
74
74
|
});
|
75
75
|
});
|
76
76
|
Object.keys(context.flowMap).forEach(function (key) {
|
@@ -88,12 +88,12 @@ var useForm = function useForm(props) {
|
|
88
88
|
var _context$updateMap$pa;
|
89
89
|
var parentKey = key.split('.')[0];
|
90
90
|
(_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
|
91
|
-
update(context.value, context.errors, context.serverErrors);
|
91
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
92
92
|
});
|
93
93
|
} else {
|
94
94
|
var _context$updateMap$ke2;
|
95
95
|
(_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
|
96
|
-
update(context.value, context.errors, context.serverErrors);
|
96
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
97
97
|
});
|
98
98
|
}
|
99
99
|
(_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
|
@@ -154,7 +154,7 @@ var useForm = function useForm(props) {
|
|
154
154
|
return new Promise(function (resolve, reject) {
|
155
155
|
var finalFields = Object.keys(context.validateMap);
|
156
156
|
if (fields) {
|
157
|
-
if (config.ignoreChildren) {
|
157
|
+
if (config.ignoreChildren || config.ignoreBind) {
|
158
158
|
// 旧行为:仅校验当前字段
|
159
159
|
finalFields = (isArray(fields) ? fields : [fields]).filter(function (key) {
|
160
160
|
return context.validateMap[key];
|
@@ -173,6 +173,7 @@ var useForm = function useForm(props) {
|
|
173
173
|
}
|
174
174
|
var validates = finalFields.map(function (key) {
|
175
175
|
var validateField = context.validateMap[key];
|
176
|
+
if (!validateField) return [];
|
176
177
|
return Array.from(validateField).map(function (validate) {
|
177
178
|
return validate(key, deepGet(context.value, key), context.value, config);
|
178
179
|
});
|
@@ -17,7 +17,7 @@ export type ValidateFnConfig = {
|
|
17
17
|
ignoreChildren?: boolean;
|
18
18
|
};
|
19
19
|
export type ValidateFn = (name: string, value: any, formData: ObjectType, config?: ValidateFnConfig) => Promise<true | FormError>;
|
20
|
-
export type UpdateFn = (formValue: ObjectType, errors: ObjectType<Error | undefined>, serverErrors: ObjectType<Error | undefined>) => void;
|
20
|
+
export type UpdateFn = (formValue: ObjectType, errors: ObjectType<Error | undefined>, serverErrors: ObjectType<Error | undefined>, names: Set<string>) => void;
|
21
21
|
export interface FormContextValueType {
|
22
22
|
func?: {
|
23
23
|
unbind: (n: string, reserveAble?: boolean, validate?: ValidateFn, update?: UpdateFn) => void;
|
@@ -198,7 +198,7 @@ export type FormContext = {
|
|
198
198
|
lastValue: ObjectType | undefined;
|
199
199
|
resetTime: number;
|
200
200
|
mounted: boolean;
|
201
|
-
updateMap: ObjectType<Set<(formValue: ObjectType, errors: ObjectType<Error | undefined>, serverErrors: ObjectType<Error | undefined>) => void>>;
|
201
|
+
updateMap: ObjectType<Set<(formValue: ObjectType, errors: ObjectType<Error | undefined>, serverErrors: ObjectType<Error | undefined>, names: Set<string>) => void>>;
|
202
202
|
flowMap: ObjectType<Set<() => void>>;
|
203
203
|
value: ObjectType;
|
204
204
|
errors: ObjectType<Error | undefined>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-form.type.d.ts","sourceRoot":"","sources":["use-form.type.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC;IACV,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,EAAE,CAAC;CACL;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,
|
1
|
+
{"version":3,"file":"use-form.type.d.ts","sourceRoot":"","sources":["use-form.type.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-input-format.d.ts","sourceRoot":"","sources":["use-input-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM3D,QAAA,MAAM,cAAc,UAAW,gBAAgB;kBAsBP,MAAM,GAAG,SAAS;
|
1
|
+
{"version":3,"file":"use-input-format.d.ts","sourceRoot":"","sources":["use-input-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM3D,QAAA,MAAM,cAAc,UAAW,gBAAgB;kBAsBP,MAAM,GAAG,SAAS;gBAoCpB,gBAAgB;iBAgDd,gBAAgB;;;CAyBvD,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
@@ -21,7 +21,7 @@ var useInputFormat = function useInputFormat(props) {
|
|
21
21
|
autoFix = props.autoFix,
|
22
22
|
coin = props.coin,
|
23
23
|
cancelBlurChange = props.cancelBlurChange;
|
24
|
-
var _React$useState = React.useState(
|
24
|
+
var _React$useState = React.useState(coin),
|
25
25
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
26
26
|
showCoin = _React$useState2[0],
|
27
27
|
setShowCoin = _React$useState2[1];
|
@@ -48,6 +48,13 @@ var useInputFormat = function useInputFormat(props) {
|
|
48
48
|
var noNeg = numType === 'non-negative' || numType === 'positive';
|
49
49
|
var regExp = new RegExp("^(".concat(noNeg ? '' : '-', ")?(\\d").concat(regLength(integerLimit), ")(").concat(digits !== 0 ? "\\.\\d".concat(regLength(digits)) : '', ")?.*$"), 'g');
|
50
50
|
value = value.replace(regExp, '$1$2$3');
|
51
|
+
|
52
|
+
// 修正小数位数
|
53
|
+
var _value = v.split('.');
|
54
|
+
var __value = value.split('.');
|
55
|
+
if (_value[1] !== undefined && __value[1] === undefined && digits !== 0) {
|
56
|
+
value = "".concat(value, ".").concat(_value[1]);
|
57
|
+
}
|
51
58
|
}
|
52
59
|
onChange(value);
|
53
60
|
});
|
@@ -105,14 +112,15 @@ var useInputFormat = function useInputFormat(props) {
|
|
105
112
|
});
|
106
113
|
function getValue(str) {
|
107
114
|
if (type === 'number' && coin) {
|
108
|
-
|
109
|
-
|
115
|
+
var _str = str;
|
116
|
+
if (showCoin && _str) {
|
117
|
+
return "".concat(_str).replace(/\d+/, function (n) {
|
110
118
|
return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
|
111
119
|
return "".concat($1, ",");
|
112
120
|
});
|
113
121
|
});
|
114
122
|
}
|
115
|
-
return "".concat(
|
123
|
+
return "".concat(_str === 0 ? _str : _str || '').replace(/,/g, '');
|
116
124
|
}
|
117
125
|
return str;
|
118
126
|
}
|
@@ -1,5 +1,18 @@
|
|
1
1
|
import type { BaseTableProps } from './use-table.type';
|
2
2
|
import { OptionalToRequired } from '../../common/type';
|
3
|
+
type treeDataInfoType = {
|
4
|
+
id: string | number;
|
5
|
+
level: number;
|
6
|
+
data: any;
|
7
|
+
pid: null | string | number;
|
8
|
+
};
|
9
|
+
interface GetExpandDataVirtualResult {
|
10
|
+
treeData: any[];
|
11
|
+
treeExpandLevel: Map<any, number>;
|
12
|
+
unmatchExpandKeys: (string | number)[];
|
13
|
+
treeDataInfo: treeDataInfoType[];
|
14
|
+
}
|
15
|
+
export declare const getExpandVirtualData: (_treeData: any[], keys: (string | number)[], keygen: any, treeColumnsName?: string) => GetExpandDataVirtualResult;
|
3
16
|
export interface UseTableTreeProps extends Pick<OptionalToRequired<BaseTableProps<any>>, 'onTreeExpand' | 'treeExpandKeys' | 'defaultTreeExpandKeys' | 'keygen'> {
|
4
17
|
treeColumnsName: string | undefined;
|
5
18
|
data: any[];
|
@@ -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;
|
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;AAIvD,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,GAAG,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAOF,UAAU,0BAA0B;IAClC,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,eAAe,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAClC,iBAAiB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACvC,YAAY,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAwCD,eAAO,MAAM,oBAAoB,cACpB,GAAG,EAAE,QACV,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,UACjB,GAAG,oBACO,MAAM,KACvB,0BAyDF,CAAC;AAEF,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;;CA4DhE,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
@@ -54,6 +54,73 @@ var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsN
|
|
54
54
|
unmatchExpandKeys: unmatchExpandKeys
|
55
55
|
};
|
56
56
|
};
|
57
|
+
export var getExpandVirtualData = function getExpandVirtualData(_treeData, keys, keygen, treeColumnsName) {
|
58
|
+
var expandKeys = keys;
|
59
|
+
var expandSet = new Set(expandKeys);
|
60
|
+
var unmatchExpandKeys = [];
|
61
|
+
var treeExpandLevel = new Map();
|
62
|
+
if (expandSet.size === 0 || !treeColumnsName) {
|
63
|
+
var _treeDataInfo = _treeData.map(function (item, index) {
|
64
|
+
return {
|
65
|
+
id: getKey(keygen, item, index),
|
66
|
+
level: 1,
|
67
|
+
data: item,
|
68
|
+
pid: null
|
69
|
+
};
|
70
|
+
});
|
71
|
+
return {
|
72
|
+
treeData: _treeData,
|
73
|
+
treeExpandLevel: treeExpandLevel,
|
74
|
+
unmatchExpandKeys: unmatchExpandKeys,
|
75
|
+
treeDataInfo: _treeDataInfo
|
76
|
+
};
|
77
|
+
}
|
78
|
+
var treeData = _toConsumableArray(_treeData || []);
|
79
|
+
var treeDataInfo = treeData.map(function (item) {
|
80
|
+
return {
|
81
|
+
id: getKey(keygen, item),
|
82
|
+
level: 1,
|
83
|
+
data: item,
|
84
|
+
pid: null
|
85
|
+
};
|
86
|
+
});
|
87
|
+
var _loop2 = function _loop2() {
|
88
|
+
if (expandSet.size === 0) return 1; // break
|
89
|
+
var item = treeData[i];
|
90
|
+
var key = getKey(keygen, item, i);
|
91
|
+
var parentLevel = treeExpandLevel.get(key) || 0;
|
92
|
+
var children = isObject(item) && item[treeColumnsName];
|
93
|
+
if (expandSet.has(key)) {
|
94
|
+
if (children && children.length > 0) {
|
95
|
+
var nodes = [];
|
96
|
+
children.forEach(function (child) {
|
97
|
+
var node = {
|
98
|
+
id: getKey(keygen, child),
|
99
|
+
level: parentLevel + 2,
|
100
|
+
data: child,
|
101
|
+
pid: key
|
102
|
+
};
|
103
|
+
nodes.push(node);
|
104
|
+
treeExpandLevel.set(getKey(keygen, child), parentLevel + 1);
|
105
|
+
});
|
106
|
+
treeData.splice.apply(treeData, [i + 1, 0].concat(_toConsumableArray(children)));
|
107
|
+
treeDataInfo.splice.apply(treeDataInfo, [i + 1, 0].concat(nodes));
|
108
|
+
expandSet.delete(key);
|
109
|
+
} else {
|
110
|
+
unmatchExpandKeys.push(key);
|
111
|
+
}
|
112
|
+
}
|
113
|
+
};
|
114
|
+
for (var i = 0; i < treeData.length; i++) {
|
115
|
+
if (_loop2()) break;
|
116
|
+
}
|
117
|
+
return {
|
118
|
+
treeData: treeData,
|
119
|
+
treeExpandLevel: treeExpandLevel,
|
120
|
+
unmatchExpandKeys: unmatchExpandKeys,
|
121
|
+
treeDataInfo: treeDataInfo
|
122
|
+
};
|
123
|
+
};
|
57
124
|
export var useTableTree = function useTableTree(props) {
|
58
125
|
var _useState = useState(props.defaultTreeExpandKeys || []),
|
59
126
|
_useState2 = _slicedToArray(_useState, 2),
|
@@ -163,7 +163,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
163
163
|
});
|
164
164
|
}
|
165
165
|
});
|
166
|
-
var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
|
166
|
+
var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop, fromDrag) {
|
167
167
|
var _props$scrollRef$curr;
|
168
168
|
if (props.disabled) return;
|
169
169
|
var sum = 0;
|
@@ -203,7 +203,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
203
203
|
setStartIndex(currentIndex);
|
204
204
|
|
205
205
|
// startIndex处于上方某个合并行的中间一行时,可能引起translate闪烁
|
206
|
-
if (startIndex < currentIndex) {
|
206
|
+
if (rowSpanInfo && !fromDrag && startIndex < currentIndex) {
|
207
207
|
context.autoAddRows = currentIndex - startIndex;
|
208
208
|
setTimeout(function () {
|
209
209
|
context.autoAddRows = 0;
|
@@ -263,7 +263,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
263
263
|
// 拖动滚动条
|
264
264
|
if (fromDrag) {
|
265
265
|
var top = y * max;
|
266
|
-
updateIndexAndTopFromTop(top);
|
266
|
+
updateIndexAndTopFromTop(top, fromDrag);
|
267
267
|
if (context.rateTimer) clearTimeout(context.rateTimer);
|
268
268
|
context.rateTimer = setTimeout(function () {
|
269
269
|
updateRateScroll(y);
|
@@ -1,5 +1,6 @@
|
|
1
|
-
export { default, default as useTree } from './use-tree';
|
2
|
-
export type { BaseTreeProps, UpdateFunc, TreePathType, TreeModeType } from './use-tree.type';
|
1
|
+
export { default, default as useTree, MODE } from './use-tree';
|
2
|
+
export type { BaseTreeProps, UpdateFunc, TreePathType, TreeModeType, DisabledOption, FlatNodeType, } from './use-tree.type';
|
3
3
|
export { default as useTreeNode } from './use-tree-node';
|
4
|
+
export { default as useTreeVirtualNode } from './use-tree-virtual-node';
|
4
5
|
export type { BaseTreeNodeProps, UpdateType } from './use-tree-node.type';
|
5
6
|
//# sourceMappingURL=index.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,YAAY,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC/D,YAAY,EACV,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACxE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC"}
|
@@ -1,3 +1,4 @@
|
|
1
1
|
"use client";
|
2
|
-
export { default, default as useTree } from "./use-tree";
|
3
|
-
export { default as useTreeNode } from "./use-tree-node";
|
2
|
+
export { default, default as useTree, MODE } from "./use-tree";
|
3
|
+
export { default as useTreeNode } from "./use-tree-node";
|
4
|
+
export { default as useTreeVirtualNode } from "./use-tree-virtual-node";
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-tree-node.d.ts","sourceRoot":"","sources":["use-tree-node.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,WAAW;kBAMmB,MAAM,SAAS,OAAO;;;;;;;;
|
1
|
+
{"version":3,"file":"use-tree-node.d.ts","sourceRoot":"","sources":["use-tree-node.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,WAAW;kBAMmB,MAAM,SAAS,OAAO;;;;;;;;CA+CzD,CAAC;AACF,eAAe,WAAW,CAAC"}
|
@@ -41,11 +41,7 @@ var useTreeNode = function useTreeNode(props) {
|
|
41
41
|
break;
|
42
42
|
}
|
43
43
|
});
|
44
|
-
var handleToggle = function handleToggle() {
|
45
|
-
// const newExpand = !expanded;
|
46
|
-
// setExpanded(newExpand);
|
47
|
-
// if (onToggle) onToggle(id, newExpand);
|
48
|
-
};
|
44
|
+
var handleToggle = function handleToggle() {};
|
49
45
|
var isLeaf = function isLeaf() {
|
50
46
|
var children = data[childrenKey];
|
51
47
|
if (children && children.length > 0) return false;
|