@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
@@ -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,35 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.useCheckElementBorderWidth = void 0;
|
7
|
+
var _react = require("react");
|
8
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
9
|
+
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."); }
|
10
|
+
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); }
|
11
|
+
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; }
|
12
|
+
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; } }
|
13
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
14
|
+
var useCheckElementBorderWidth = exports.useCheckElementBorderWidth = function useCheckElementBorderWidth(elementRef) {
|
15
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
16
|
+
var _useState = (0, _react.useState)(0),
|
17
|
+
_useState2 = _slicedToArray(_useState, 2),
|
18
|
+
borderWidth = _useState2[0],
|
19
|
+
setBorderWidth = _useState2[1];
|
20
|
+
|
21
|
+
// 获取指定方向上的border宽度之和
|
22
|
+
var getBorderWidth = (0, _react.useCallback)(function () {
|
23
|
+
if (elementRef.current) {
|
24
|
+
var _options$direction = options.direction,
|
25
|
+
direction = _options$direction === void 0 ? 'horizontal' : _options$direction;
|
26
|
+
var style = window.getComputedStyle(elementRef.current);
|
27
|
+
var _borderWidth = direction === 'horizontal' ? parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) : parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
|
28
|
+
setBorderWidth(_borderWidth);
|
29
|
+
}
|
30
|
+
}, [elementRef]);
|
31
|
+
(0, _react.useEffect)(function () {
|
32
|
+
getBorderWidth();
|
33
|
+
}, [getBorderWidth]);
|
34
|
+
return borderWidth;
|
35
|
+
};
|
@@ -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"}
|
@@ -28,6 +28,9 @@ var getPositionStyle = exports.getPositionStyle = function getPositionStyle(posi
|
|
28
28
|
if (config !== null && config !== void 0 && config.fixedWidth) {
|
29
29
|
var key = config.fixedWidth === 'min' ? 'minWidth' : 'width';
|
30
30
|
newStyle[key] = '100%';
|
31
|
+
if (config.parentBorderWidth) {
|
32
|
+
newStyle[key] = "calc(100% + ".concat(config.parentBorderWidth, "px)");
|
33
|
+
}
|
31
34
|
}
|
32
35
|
if (position === 'drop-down') {
|
33
36
|
newStyle.top = mainMargin;
|
@@ -39,19 +42,22 @@ var getPositionStyle = exports.getPositionStyle = function getPositionStyle(posi
|
|
39
42
|
var positionArr = (position || '').split('-');
|
40
43
|
if (positionArr.length === 2) {
|
41
44
|
var _positionArr = _slicedToArray(positionArr, 2),
|
42
|
-
|
43
|
-
|
44
|
-
newStyle[ReverseDir[
|
45
|
-
newStyle[
|
45
|
+
vDirection = _positionArr[0],
|
46
|
+
hDirection = _positionArr[1];
|
47
|
+
newStyle[ReverseDir[vDirection]] = mainMargin;
|
48
|
+
newStyle[hDirection] = 0;
|
49
|
+
if (config !== null && config !== void 0 && config.parentBorderWidth) {
|
50
|
+
newStyle[hDirection] = -config.parentBorderWidth / 2;
|
51
|
+
}
|
46
52
|
} else {
|
47
53
|
var _positionArr2 = _slicedToArray(positionArr, 1),
|
48
|
-
|
49
|
-
newStyle[ReverseDir[
|
50
|
-
if (
|
54
|
+
_vDirection = _positionArr2[0];
|
55
|
+
newStyle[ReverseDir[_vDirection]] = mainMargin;
|
56
|
+
if (_vDirection === 'left' || _vDirection === 'right') {
|
51
57
|
newStyle.top = halfMargin;
|
52
58
|
newStyle.transform = 'translateY(-50%)';
|
53
59
|
}
|
54
|
-
if (
|
60
|
+
if (_vDirection === 'top' || _vDirection === 'bottom') {
|
55
61
|
newStyle.left = halfMargin;
|
56
62
|
newStyle.transform = 'translateX(-50%)';
|
57
63
|
}
|
@@ -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"}
|
@@ -9,6 +9,7 @@ exports.usePositionStyle = exports.default = void 0;
|
|
9
9
|
var _react = _interopRequireWildcard(require("react"));
|
10
10
|
var _getPositionStyle = require("./get-position-style");
|
11
11
|
var _checkPosition = require("./check-position");
|
12
|
+
var _checkBorder = require("./check-border");
|
12
13
|
var _shallowEqual = _interopRequireDefault(require("../../utils/shallow-equal"));
|
13
14
|
var _usePersistFn = _interopRequireDefault(require("../use-persist-fn"));
|
14
15
|
var _utils = require("../../utils");
|
@@ -43,7 +44,8 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
|
|
43
44
|
popupElRef = _ref.popupElRef,
|
44
45
|
scrollElRef = _ref.scrollElRef,
|
45
46
|
updateKey = _ref.updateKey,
|
46
|
-
adjust = _ref.adjust
|
47
|
+
adjust = _ref.adjust,
|
48
|
+
offset = _ref.offset;
|
47
49
|
// 初次渲染无样式的时候, 隐藏展示
|
48
50
|
var _useState = (0, _react.useState)(hideStyle),
|
49
51
|
_useState2 = _slicedToArray(_useState, 2),
|
@@ -74,6 +76,9 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
|
|
74
76
|
scrollContainer: scrollElRef === null || scrollElRef === void 0 ? void 0 : scrollElRef.current,
|
75
77
|
enable: show && adjust
|
76
78
|
});
|
79
|
+
var parentElBorderWidth = (0, _checkBorder.useCheckElementBorderWidth)(parentElRef, {
|
80
|
+
direction: 'horizontal'
|
81
|
+
});
|
77
82
|
var adjustPosition = function adjustPosition(position) {
|
78
83
|
var winHeight = _utils.docSize.height;
|
79
84
|
if (!verticalPosition.includes(position)) return position;
|
@@ -150,6 +155,9 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
|
|
150
155
|
};
|
151
156
|
context.containerRect = containerRect;
|
152
157
|
context.containerScroll = containerScroll;
|
158
|
+
console.log('======================');
|
159
|
+
console.log('targetPosition: >>', targetPosition);
|
160
|
+
console.log('======================');
|
153
161
|
if (verticalPosition.includes(targetPosition)) {
|
154
162
|
var _targetPosition$split = targetPosition.split('-'),
|
155
163
|
_targetPosition$split2 = _slicedToArray(_targetPosition$split, 2),
|
@@ -225,11 +233,11 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
|
|
225
233
|
_h = _targetPosition$split4[0],
|
226
234
|
_v = _targetPosition$split4[1];
|
227
235
|
if (_v === 'top') {
|
228
|
-
style.top = rect.top - containerRect.top + containerScroll.top;
|
236
|
+
style.top = rect.top - containerRect.top + containerScroll.top - (offset ? offset[1] : 0);
|
229
237
|
style.transform = '';
|
230
238
|
arrayStyle.top = "8px";
|
231
239
|
} else if (_v === 'bottom') {
|
232
|
-
style.top = rect.bottom - containerRect.top + containerScroll.top;
|
240
|
+
style.top = rect.bottom - containerRect.top + containerScroll.top + (offset ? offset[1] : 0);
|
233
241
|
arrayStyle.bottom = "8px";
|
234
242
|
style.transform = 'translateY(-100%)';
|
235
243
|
} else {
|
@@ -304,17 +312,19 @@ var usePositionStyle = exports.usePositionStyle = function usePositionStyle(conf
|
|
304
312
|
newStyle: style
|
305
313
|
};
|
306
314
|
context.parentRect = parentElRef.current.getBoundingClientRect();
|
315
|
+
var realPosition = position;
|
307
316
|
if (adjust) {
|
308
317
|
var popupInfo = getPopUpInfo(context.parentRect);
|
309
318
|
context.popUpHeight = popupInfo.height;
|
310
319
|
context.popUpWidth = popupInfo.width;
|
320
|
+
realPosition = adjustPosition(position);
|
311
321
|
}
|
312
|
-
var realPosition = adjust ? adjustPosition(position) : position;
|
313
322
|
if (!absolute) {
|
314
323
|
newStyle = (0, _getPositionStyle.getPositionStyle)(realPosition, {
|
315
324
|
popupGap: popupGap,
|
316
325
|
zIndex: zIndex,
|
317
|
-
fixedWidth: fixedWidth
|
326
|
+
fixedWidth: fixedWidth,
|
327
|
+
parentBorderWidth: parentElBorderWidth
|
318
328
|
});
|
319
329
|
} else {
|
320
330
|
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"}
|
@@ -97,6 +97,7 @@ function useFormControl(props) {
|
|
97
97
|
var formValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
98
98
|
var errors = arguments.length > 1 ? arguments[1] : undefined;
|
99
99
|
var severErrors = arguments.length > 2 ? arguments[2] : undefined;
|
100
|
+
var names = arguments.length > 3 ? arguments[3] : undefined;
|
100
101
|
if (!name) return;
|
101
102
|
if ((0, _is.isArray)(name)) {
|
102
103
|
var _value = getValue(name, formValue);
|
@@ -108,7 +109,7 @@ function useFormControl(props) {
|
|
108
109
|
var dv = (0, _is.isArray)(defaultValue) ? defaultValue : [];
|
109
110
|
var nextValue = [];
|
110
111
|
name.forEach(function (n, index) {
|
111
|
-
if (_value[index] === undefined && dv[index] !== undefined) {
|
112
|
+
if (!names.has(n) && _value[index] === undefined && dv[index] !== undefined) {
|
112
113
|
nextValue[index] = dv[index];
|
113
114
|
} else {
|
114
115
|
nextValue[index] = _value[index];
|
@@ -122,7 +123,7 @@ function useFormControl(props) {
|
|
122
123
|
setErrorState(_error2);
|
123
124
|
}
|
124
125
|
if (!(0, _shallowEqual.shallowEqual)(_value2, latestInfo.valueState)) {
|
125
|
-
if (_value2 === undefined && defaultValue !== undefined) {
|
126
|
+
if (!names.has(name) && _value2 === undefined && defaultValue !== undefined) {
|
126
127
|
setValueState(defaultValue);
|
127
128
|
} else {
|
128
129
|
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"}
|
@@ -79,7 +79,7 @@ var useForm = function useForm(props) {
|
|
79
79
|
Object.keys(context.updateMap).forEach(function (key) {
|
80
80
|
var _context$updateMap$ke;
|
81
81
|
(_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
|
82
|
-
update(context.value, context.errors, context.serverErrors);
|
82
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
83
83
|
});
|
84
84
|
});
|
85
85
|
Object.keys(context.flowMap).forEach(function (key) {
|
@@ -97,12 +97,12 @@ var useForm = function useForm(props) {
|
|
97
97
|
var _context$updateMap$pa;
|
98
98
|
var parentKey = key.split('.')[0];
|
99
99
|
(_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
|
100
|
-
update(context.value, context.errors, context.serverErrors);
|
100
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
101
101
|
});
|
102
102
|
} else {
|
103
103
|
var _context$updateMap$ke2;
|
104
104
|
(_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
|
105
|
-
update(context.value, context.errors, context.serverErrors);
|
105
|
+
update(context.value, context.errors, context.serverErrors, context.names);
|
106
106
|
});
|
107
107
|
}
|
108
108
|
(_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
|
@@ -163,7 +163,7 @@ var useForm = function useForm(props) {
|
|
163
163
|
return new Promise(function (resolve, reject) {
|
164
164
|
var finalFields = Object.keys(context.validateMap);
|
165
165
|
if (fields) {
|
166
|
-
if (config.ignoreChildren) {
|
166
|
+
if (config.ignoreChildren || config.ignoreBind) {
|
167
167
|
// 旧行为:仅校验当前字段
|
168
168
|
finalFields = ((0, _utils.isArray)(fields) ? fields : [fields]).filter(function (key) {
|
169
169
|
return context.validateMap[key];
|
@@ -182,6 +182,7 @@ var useForm = function useForm(props) {
|
|
182
182
|
}
|
183
183
|
var validates = finalFields.map(function (key) {
|
184
184
|
var validateField = context.validateMap[key];
|
185
|
+
if (!validateField) return [];
|
185
186
|
return Array.from(validateField).map(function (validate) {
|
186
187
|
return validate(key, (0, _utils.deepGet)(context.value, key), context.value, config);
|
187
188
|
});
|
@@ -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"}
|
@@ -28,7 +28,7 @@ var useInputFormat = function useInputFormat(props) {
|
|
28
28
|
autoFix = props.autoFix,
|
29
29
|
coin = props.coin,
|
30
30
|
cancelBlurChange = props.cancelBlurChange;
|
31
|
-
var _React$useState = _react.default.useState(
|
31
|
+
var _React$useState = _react.default.useState(coin),
|
32
32
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
33
33
|
showCoin = _React$useState2[0],
|
34
34
|
setShowCoin = _React$useState2[1];
|
@@ -55,6 +55,13 @@ var useInputFormat = function useInputFormat(props) {
|
|
55
55
|
var noNeg = numType === 'non-negative' || numType === 'positive';
|
56
56
|
var regExp = new RegExp("^(".concat(noNeg ? '' : '-', ")?(\\d").concat(regLength(integerLimit), ")(").concat(digits !== 0 ? "\\.\\d".concat(regLength(digits)) : '', ")?.*$"), 'g');
|
57
57
|
value = value.replace(regExp, '$1$2$3');
|
58
|
+
|
59
|
+
// 修正小数位数
|
60
|
+
var _value = v.split('.');
|
61
|
+
var __value = value.split('.');
|
62
|
+
if (_value[1] !== undefined && __value[1] === undefined && digits !== 0) {
|
63
|
+
value = "".concat(value, ".").concat(_value[1]);
|
64
|
+
}
|
58
65
|
}
|
59
66
|
onChange(value);
|
60
67
|
});
|
@@ -112,14 +119,15 @@ var useInputFormat = function useInputFormat(props) {
|
|
112
119
|
});
|
113
120
|
function getValue(str) {
|
114
121
|
if (type === 'number' && coin) {
|
115
|
-
|
116
|
-
|
122
|
+
var _str = str;
|
123
|
+
if (showCoin && _str) {
|
124
|
+
return "".concat(_str).replace(/\d+/, function (n) {
|
117
125
|
return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
|
118
126
|
return "".concat($1, ",");
|
119
127
|
});
|
120
128
|
});
|
121
129
|
}
|
122
|
-
return "".concat(
|
130
|
+
return "".concat(_str === 0 ? _str : _str || '').replace(/,/g, '');
|
123
131
|
}
|
124
132
|
return str;
|
125
133
|
}
|
@@ -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"}
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.useTableTree = exports.default = void 0;
|
6
|
+
exports.useTableTree = exports.getExpandVirtualData = exports.default = void 0;
|
7
7
|
var _react = require("react");
|
8
8
|
var _usePersistFn = require("../../common/use-persist-fn");
|
9
9
|
var _render = require("../../utils/render");
|
@@ -60,6 +60,73 @@ var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsN
|
|
60
60
|
unmatchExpandKeys: unmatchExpandKeys
|
61
61
|
};
|
62
62
|
};
|
63
|
+
var getExpandVirtualData = exports.getExpandVirtualData = function getExpandVirtualData(_treeData, keys, keygen, treeColumnsName) {
|
64
|
+
var expandKeys = keys;
|
65
|
+
var expandSet = new Set(expandKeys);
|
66
|
+
var unmatchExpandKeys = [];
|
67
|
+
var treeExpandLevel = new Map();
|
68
|
+
if (expandSet.size === 0 || !treeColumnsName) {
|
69
|
+
var _treeDataInfo = _treeData.map(function (item, index) {
|
70
|
+
return {
|
71
|
+
id: (0, _render.getKey)(keygen, item, index),
|
72
|
+
level: 1,
|
73
|
+
data: item,
|
74
|
+
pid: null
|
75
|
+
};
|
76
|
+
});
|
77
|
+
return {
|
78
|
+
treeData: _treeData,
|
79
|
+
treeExpandLevel: treeExpandLevel,
|
80
|
+
unmatchExpandKeys: unmatchExpandKeys,
|
81
|
+
treeDataInfo: _treeDataInfo
|
82
|
+
};
|
83
|
+
}
|
84
|
+
var treeData = _toConsumableArray(_treeData || []);
|
85
|
+
var treeDataInfo = treeData.map(function (item) {
|
86
|
+
return {
|
87
|
+
id: (0, _render.getKey)(keygen, item),
|
88
|
+
level: 1,
|
89
|
+
data: item,
|
90
|
+
pid: null
|
91
|
+
};
|
92
|
+
});
|
93
|
+
var _loop2 = function _loop2() {
|
94
|
+
if (expandSet.size === 0) return 1; // break
|
95
|
+
var item = treeData[i];
|
96
|
+
var key = (0, _render.getKey)(keygen, item, i);
|
97
|
+
var parentLevel = treeExpandLevel.get(key) || 0;
|
98
|
+
var children = (0, _is.isObject)(item) && item[treeColumnsName];
|
99
|
+
if (expandSet.has(key)) {
|
100
|
+
if (children && children.length > 0) {
|
101
|
+
var nodes = [];
|
102
|
+
children.forEach(function (child) {
|
103
|
+
var node = {
|
104
|
+
id: (0, _render.getKey)(keygen, child),
|
105
|
+
level: parentLevel + 2,
|
106
|
+
data: child,
|
107
|
+
pid: key
|
108
|
+
};
|
109
|
+
nodes.push(node);
|
110
|
+
treeExpandLevel.set((0, _render.getKey)(keygen, child), parentLevel + 1);
|
111
|
+
});
|
112
|
+
treeData.splice.apply(treeData, [i + 1, 0].concat(_toConsumableArray(children)));
|
113
|
+
treeDataInfo.splice.apply(treeDataInfo, [i + 1, 0].concat(nodes));
|
114
|
+
expandSet.delete(key);
|
115
|
+
} else {
|
116
|
+
unmatchExpandKeys.push(key);
|
117
|
+
}
|
118
|
+
}
|
119
|
+
};
|
120
|
+
for (var i = 0; i < treeData.length; i++) {
|
121
|
+
if (_loop2()) break;
|
122
|
+
}
|
123
|
+
return {
|
124
|
+
treeData: treeData,
|
125
|
+
treeExpandLevel: treeExpandLevel,
|
126
|
+
unmatchExpandKeys: unmatchExpandKeys,
|
127
|
+
treeDataInfo: treeDataInfo
|
128
|
+
};
|
129
|
+
};
|
63
130
|
var useTableTree = exports.useTableTree = function useTableTree(props) {
|
64
131
|
var _useState = (0, _react.useState)(props.defaultTreeExpandKeys || []),
|
65
132
|
_useState2 = _slicedToArray(_useState, 2),
|
@@ -169,7 +169,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
169
169
|
});
|
170
170
|
}
|
171
171
|
});
|
172
|
-
var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop) {
|
172
|
+
var updateIndexAndTopFromTop = function updateIndexAndTopFromTop(scrollTop, fromDrag) {
|
173
173
|
var _props$scrollRef$curr;
|
174
174
|
if (props.disabled) return;
|
175
175
|
var sum = 0;
|
@@ -209,7 +209,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
209
209
|
setStartIndex(currentIndex);
|
210
210
|
|
211
211
|
// startIndex处于上方某个合并行的中间一行时,可能引起translate闪烁
|
212
|
-
if (startIndex < currentIndex) {
|
212
|
+
if (rowSpanInfo && !fromDrag && startIndex < currentIndex) {
|
213
213
|
context.autoAddRows = currentIndex - startIndex;
|
214
214
|
setTimeout(function () {
|
215
215
|
context.autoAddRows = 0;
|
@@ -269,7 +269,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
269
269
|
// 拖动滚动条
|
270
270
|
if (fromDrag) {
|
271
271
|
var top = y * max;
|
272
|
-
updateIndexAndTopFromTop(top);
|
272
|
+
updateIndexAndTopFromTop(top, fromDrag);
|
273
273
|
if (context.rateTimer) clearTimeout(context.rateTimer);
|
274
274
|
context.rateTimer = setTimeout(function () {
|
275
275
|
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,9 +1,16 @@
|
|
1
1
|
"use strict";
|
2
2
|
"use client";
|
3
3
|
|
4
|
+
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); }
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
5
6
|
value: true
|
6
7
|
});
|
8
|
+
Object.defineProperty(exports, "MODE", {
|
9
|
+
enumerable: true,
|
10
|
+
get: function get() {
|
11
|
+
return _useTree.MODE;
|
12
|
+
}
|
13
|
+
});
|
7
14
|
Object.defineProperty(exports, "default", {
|
8
15
|
enumerable: true,
|
9
16
|
get: function get() {
|
@@ -22,6 +29,15 @@ Object.defineProperty(exports, "useTreeNode", {
|
|
22
29
|
return _useTreeNode.default;
|
23
30
|
}
|
24
31
|
});
|
25
|
-
|
32
|
+
Object.defineProperty(exports, "useTreeVirtualNode", {
|
33
|
+
enumerable: true,
|
34
|
+
get: function get() {
|
35
|
+
return _useTreeVirtualNode.default;
|
36
|
+
}
|
37
|
+
});
|
38
|
+
var _useTree = _interopRequireWildcard(require("./use-tree"));
|
26
39
|
var _useTreeNode = _interopRequireDefault(require("./use-tree-node"));
|
27
|
-
|
40
|
+
var _useTreeVirtualNode = _interopRequireDefault(require("./use-tree-virtual-node"));
|
41
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
42
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
43
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
@@ -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"}
|
@@ -48,11 +48,7 @@ var useTreeNode = function useTreeNode(props) {
|
|
48
48
|
break;
|
49
49
|
}
|
50
50
|
});
|
51
|
-
var handleToggle = function handleToggle() {
|
52
|
-
// const newExpand = !expanded;
|
53
|
-
// setExpanded(newExpand);
|
54
|
-
// if (onToggle) onToggle(id, newExpand);
|
55
|
-
};
|
51
|
+
var handleToggle = function handleToggle() {};
|
56
52
|
var isLeaf = function isLeaf() {
|
57
53
|
var children = data[childrenKey];
|
58
54
|
if (children && children.length > 0) return false;
|