@sheinx/hooks 3.8.0-beta.16 → 3.8.0-beta.18
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.
- package/cjs/components/use-datepicker/use-time.d.ts.map +1 -1
- package/cjs/components/use-datepicker/use-time.js +4 -2
- package/cjs/components/use-datepicker/use-time.type.d.ts +3 -1
- package/cjs/components/use-datepicker/use-time.type.d.ts.map +1 -1
- package/cjs/components/use-form/use-form.d.ts.map +1 -1
- package/cjs/components/use-form/use-form.js +2 -6
- package/cjs/components/use-input/use-input.d.ts.map +1 -1
- package/cjs/components/use-input/use-input.js +4 -1
- package/cjs/components/use-popup/use-popup.js +4 -4
- package/cjs/components/use-table/use-table-virtual.d.ts +2 -1
- package/cjs/components/use-table/use-table-virtual.d.ts.map +1 -1
- package/cjs/components/use-table/use-table-virtual.js +3 -3
- package/cjs/components/use-tree/use-tree.js +1 -1
- package/cjs/utils/object.d.ts +6 -0
- package/cjs/utils/object.d.ts.map +1 -1
- package/cjs/utils/object.js +21 -1
- package/esm/components/use-datepicker/use-time.d.ts.map +1 -1
- package/esm/components/use-datepicker/use-time.js +4 -2
- package/esm/components/use-datepicker/use-time.type.d.ts +3 -1
- package/esm/components/use-datepicker/use-time.type.d.ts.map +1 -1
- package/esm/components/use-form/use-form.d.ts.map +1 -1
- package/esm/components/use-form/use-form.js +2 -6
- package/esm/components/use-input/use-input.d.ts.map +1 -1
- package/esm/components/use-input/use-input.js +4 -1
- package/esm/components/use-popup/use-popup.js +4 -4
- package/esm/components/use-table/use-table-virtual.d.ts +2 -1
- package/esm/components/use-table/use-table-virtual.d.ts.map +1 -1
- package/esm/components/use-table/use-table-virtual.js +3 -3
- package/esm/components/use-tree/use-tree.js +1 -1
- package/esm/utils/object.d.ts +6 -0
- package/esm/utils/object.d.ts.map +1 -1
- package/esm/utils/object.js +20 -0
- package/package.json +3 -3
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-time.d.ts","sourceRoot":"","sources":["use-time.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;
|
1
|
+
{"version":3,"file":"use-time.d.ts","sourceRoot":"","sources":["use-time.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;iBA+HU,MAAM;kBAAQ,IAAI;sBAAY,OAAO;;;;;6BAvBrD,IAAI;2BAlEN,IAAI,gBAAgB,MAAM;;CA8IrD,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -19,7 +19,9 @@ var useTime = function useTime(props) {
|
|
19
19
|
_props$secondStep = props.secondStep,
|
20
20
|
secondStep = _props$secondStep === void 0 ? 1 : _props$secondStep,
|
21
21
|
staticMin = props.staticMin,
|
22
|
-
staticMax = props.staticMax
|
22
|
+
staticMax = props.staticMax,
|
23
|
+
position = props.position,
|
24
|
+
rangeDate = props.rangeDate;
|
23
25
|
var min = _util.default.resetTimeByFormat(mi, format, options);
|
24
26
|
var max = _util.default.resetTimeByFormat(ma, format, options);
|
25
27
|
var current = props.value || _util.default.newDate(undefined, options);
|
@@ -45,7 +47,7 @@ var useTime = function useTime(props) {
|
|
45
47
|
disabledTime = props.disabledTime;
|
46
48
|
if (disabledTime) {
|
47
49
|
var _time = _util.default.format(date, _util.default.TIME_FORMAT, options);
|
48
|
-
if (typeof disabledTime === 'function') return disabledTime(_time);
|
50
|
+
if (typeof disabledTime === 'function') return disabledTime(_time, position, rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[0], rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[1]);
|
49
51
|
return disabledTime === _time;
|
50
52
|
}
|
51
53
|
var isDis = disabled && typeof disabled === 'function' ? disabled(date) : false;
|
@@ -11,9 +11,11 @@ export interface UseTimeProps {
|
|
11
11
|
staticMin?: Date;
|
12
12
|
staticMax?: Date;
|
13
13
|
disabled?: boolean | ((date: Date) => boolean);
|
14
|
-
disabledTime?: string | ((time: string) => boolean);
|
14
|
+
disabledTime?: string | ((time: string, type?: 'start' | 'end', value0?: Date, value1?: Date) => boolean);
|
15
15
|
minuteStep?: number;
|
16
16
|
hourStep?: number;
|
17
17
|
secondStep?: number;
|
18
|
+
position?: 'start' | 'end';
|
19
|
+
rangeDate?: Array<Date | undefined>;
|
18
20
|
}
|
19
21
|
//# sourceMappingURL=use-time.type.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-time.type.d.ts","sourceRoot":"","sources":["use-time.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"use-time.type.d.ts","sourceRoot":"","sources":["use-time.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC1G,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;CACrC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AAiCA,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;;;;;;;;;wBAmSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApPnB,MAAM;oCAmUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAiWvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCArJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApPnB,MAAM;gCAmUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAiWvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BArJpD,MAAM,0BAAyB,qBAAqB;;
|
1
|
+
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AAiCA,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;;;;;;;;;wBAmSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApPnB,MAAM;oCAmUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAiWvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCArJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApPnB,MAAM;gCAmUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAiWvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BArJpD,MAAM,0BAAyB,qBAAqB;;CA0b9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -236,7 +236,7 @@ var useForm = function useForm(props) {
|
|
236
236
|
var _props$onChange;
|
237
237
|
var newValue = typeof change === 'function' ? (0, _immer.produce)(context.value, change) : change;
|
238
238
|
context.value = newValue;
|
239
|
-
(_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
|
239
|
+
(_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, (0, _utils.deepClone)(context.value));
|
240
240
|
});
|
241
241
|
var scrollToField = (0, _usePersistFn.default)(function (name) {
|
242
242
|
var _document;
|
@@ -622,11 +622,6 @@ var useForm = function useForm(props) {
|
|
622
622
|
// 默认值更新
|
623
623
|
React.useEffect(function () {
|
624
624
|
context.removeLock = false;
|
625
|
-
// 内部 onChange 改的 value, 不需要更新
|
626
|
-
if (props.value === context.value) {
|
627
|
-
if (!isControl) update();
|
628
|
-
return;
|
629
|
-
}
|
630
625
|
if (initValidate && !context.resetTime) {
|
631
626
|
var keys = Object.keys(context.validateMap).filter(function (key) {
|
632
627
|
var oldValue = (0, _utils.deepGet)(preValue || emptyObj, key);
|
@@ -636,6 +631,7 @@ var useForm = function useForm(props) {
|
|
636
631
|
validateFields(keys).catch(function () {});
|
637
632
|
}
|
638
633
|
update();
|
634
|
+
if (!isControl) return;
|
639
635
|
// 默认值上位时会提前触发外部的onChange, 导致外部的多次setFormValue不能合并后生效的问题(ReactDOM.render方式渲染)
|
640
636
|
setTimeout(updateDefaultValue);
|
641
637
|
context.resetTime = 0;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-input.d.ts","sourceRoot":"","sources":["use-input.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAa5D,QAAA,MAAM,QAAQ,WAAY,cAAc;;;;;;;
|
1
|
+
{"version":3,"file":"use-input.d.ts","sourceRoot":"","sources":["use-input.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAa5D,QAAA,MAAM,QAAQ,WAAY,cAAc;;;;;;;CA4IvC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -97,7 +97,10 @@ var useInput = function useInput(params) {
|
|
97
97
|
(_otherHandlers$onFocu = otherHandlers.onFocus) === null || _otherHandlers$onFocu === void 0 || _otherHandlers$onFocu.call(otherHandlers, event);
|
98
98
|
setFocused(true);
|
99
99
|
if (autoSelect) {
|
100
|
-
|
100
|
+
// why requestAnimationFrame: 当在文字身体上hover后立即点击,select()与浏览器的光标定位逻辑产生竞争,有可能导致只选中的部分文本,所以需要延迟一下
|
101
|
+
requestAnimationFrame(function () {
|
102
|
+
event.target.select();
|
103
|
+
});
|
101
104
|
}
|
102
105
|
};
|
103
106
|
};
|
@@ -142,20 +142,20 @@ var usePopup = function usePopup(props) {
|
|
142
142
|
}
|
143
143
|
};
|
144
144
|
var handleMouseEnter = (0, _usePersistFn.default)(function (e) {
|
145
|
-
var _targetEvents$onMouse, _targetRef$current;
|
145
|
+
var _targetEvents$onMouse, _targetRef$current, _popupRef$current2;
|
146
146
|
targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
|
147
147
|
if (trigger !== 'hover') return;
|
148
148
|
var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
|
149
|
-
if (isParentContainsCurrent) {
|
149
|
+
if (isParentContainsCurrent || popupRef !== null && popupRef !== void 0 && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.target)) {
|
150
150
|
handleHoverToggle(true);
|
151
151
|
}
|
152
152
|
});
|
153
153
|
var handleMouseLeave = (0, _usePersistFn.default)(function (e) {
|
154
|
-
var _targetEvents$onMouse2, _popupRef$
|
154
|
+
var _targetEvents$onMouse2, _popupRef$current3;
|
155
155
|
targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse2 = targetEvents.onMouseLeave) === null || _targetEvents$onMouse2 === void 0 || _targetEvents$onMouse2.call(targetEvents, e);
|
156
156
|
if (trigger !== 'hover') return;
|
157
157
|
// @ts-ignore
|
158
|
-
if (e.relatedTarget instanceof HTMLElement && (_popupRef$
|
158
|
+
if (e.relatedTarget instanceof HTMLElement && (_popupRef$current3 = popupRef.current) !== null && _popupRef$current3 !== void 0 && _popupRef$current3.contains(e.relatedTarget)) {
|
159
159
|
return;
|
160
160
|
}
|
161
161
|
handleHoverToggle(false);
|
@@ -11,7 +11,8 @@ interface UseTableVirtualProps {
|
|
11
11
|
isRtl?: boolean;
|
12
12
|
columns: TableFormatColumn<any>[];
|
13
13
|
colgroup: (number | string | undefined)[];
|
14
|
-
|
14
|
+
theadHeight: number;
|
15
|
+
tfootHeight: number;
|
15
16
|
}
|
16
17
|
declare const useTableVirtual: (props: UseTableVirtualProps) => {
|
17
18
|
scrollHeight: number;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,
|
1
|
+
{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnGuB,MAAM,UAAU,MAAM;2BAsIrB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAUR,MAAM,GAAG,MAAM;CA0GnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
@@ -129,7 +129,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
129
129
|
for (var i = 0; i <= index; i++) {
|
130
130
|
sum += context.cachedHeight[i] || props.rowHeight;
|
131
131
|
}
|
132
|
-
return sum + props.
|
132
|
+
return sum + props.theadHeight + props.tfootHeight;
|
133
133
|
};
|
134
134
|
var setRowHeight = (0, _usePersistFn.usePersistFn)(function (index, height) {
|
135
135
|
if (props.disabled) return;
|
@@ -272,7 +272,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
272
272
|
callback();
|
273
273
|
}
|
274
274
|
};
|
275
|
-
props.scrollRef.current.scrollTop = beforeHeight;
|
275
|
+
props.scrollRef.current.scrollTop = beforeHeight - props.theadHeight;
|
276
276
|
}
|
277
277
|
});
|
278
278
|
var scrollColumnByLeft = (0, _usePersistFn.usePersistFn)(function (targetLeft) {
|
@@ -349,7 +349,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
349
349
|
(0, _react.useEffect)(function () {
|
350
350
|
if (props.disabled) return;
|
351
351
|
setHeight(getContentHeight(props.data.length - 1));
|
352
|
-
}, [props.data.length, props.
|
352
|
+
}, [props.data.length, props.theadHeight, props.tfootHeight]);
|
353
353
|
(0, _react.useEffect)(function () {
|
354
354
|
if (props.disabled) return;
|
355
355
|
if (context.heightCallback) {
|
@@ -504,7 +504,7 @@ var useTree = function useTree(props) {
|
|
504
504
|
(_context$value = context.value) === null || _context$value === void 0 || _context$value.forEach(function (id) {
|
505
505
|
var _ref3 = context.pathMap.get(id),
|
506
506
|
children = _ref3.children;
|
507
|
-
if (children.length) {
|
507
|
+
if (children && children.length) {
|
508
508
|
var noCheckedChildren = children.filter(function (cid) {
|
509
509
|
var _context$value2;
|
510
510
|
return !((_context$value2 = context.value) !== null && _context$value2 !== void 0 && _context$value2.includes(cid));
|
package/cjs/utils/object.d.ts
CHANGED
@@ -45,5 +45,11 @@ export declare const getAllKeyPaths: (obj: ObjectType, parentKey?: string) => st
|
|
45
45
|
* console.log(completeFields) // ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
|
46
46
|
*/
|
47
47
|
export declare const getCompleteFieldKeys: (fields: string | string[], allFields: string[]) => string[];
|
48
|
+
/**
|
49
|
+
* 将对象中的所有值设置为空, 如果值是数组,重置为空数组,如果是对象,重置为空对象,如果是基础类型,重置为undefined
|
50
|
+
* @param obj 对象
|
51
|
+
* @returns 空对象
|
52
|
+
*/
|
53
|
+
export declare const clearValue: (obj: ObjectType) => any;
|
48
54
|
export {};
|
49
55
|
//# sourceMappingURL=object.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA"}
|
1
|
+
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA;AAGD;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAS,UAAU,KAAG,GAW5C,CAAC"}
|
package/cjs/utils/object.js
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.getCompleteFieldKeys = exports.getAllKeyPaths = exports.entries = exports.deepSet = exports.deepRemove = exports.deepMerge = exports.deepHas = exports.deepGet = void 0;
|
6
|
+
exports.getCompleteFieldKeys = exports.getAllKeyPaths = exports.entries = exports.deepSet = exports.deepRemove = exports.deepMerge = exports.deepHas = exports.deepGet = exports.clearValue = void 0;
|
7
7
|
exports.insertPoint = insertPoint;
|
8
8
|
exports.objectValues = void 0;
|
9
9
|
exports.pathGenerator = pathGenerator;
|
@@ -335,4 +335,24 @@ var getCompleteFieldKeys = exports.getCompleteFieldKeys = function getCompleteFi
|
|
335
335
|
|
336
336
|
// 返回之前去重
|
337
337
|
return Array.from(new Set(completeFields));
|
338
|
+
};
|
339
|
+
|
340
|
+
/**
|
341
|
+
* 将对象中的所有值设置为空, 如果值是数组,重置为空数组,如果是对象,重置为空对象,如果是基础类型,重置为undefined
|
342
|
+
* @param obj 对象
|
343
|
+
* @returns 空对象
|
344
|
+
*/
|
345
|
+
var clearValue = exports.clearValue = function clearValue(obj) {
|
346
|
+
if ((0, _is.isArray)(obj)) {
|
347
|
+
return obj.map(function (item) {
|
348
|
+
return clearValue(item);
|
349
|
+
});
|
350
|
+
}
|
351
|
+
if ((0, _is.isObject)(obj)) {
|
352
|
+
return Object.keys(obj).reduce(function (acc, key) {
|
353
|
+
acc[key] = clearValue(obj[key]);
|
354
|
+
return acc;
|
355
|
+
}, {});
|
356
|
+
}
|
357
|
+
return undefined;
|
338
358
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-time.d.ts","sourceRoot":"","sources":["use-time.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;
|
1
|
+
{"version":3,"file":"use-time.d.ts","sourceRoot":"","sources":["use-time.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,QAAA,MAAM,OAAO,UAAW,YAAY;;;;iBA+HU,MAAM;kBAAQ,IAAI;sBAAY,OAAO;;;;;6BAvBrD,IAAI;2BAlEN,IAAI,gBAAgB,MAAM;;CA8IrD,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -12,7 +12,9 @@ var useTime = function useTime(props) {
|
|
12
12
|
_props$secondStep = props.secondStep,
|
13
13
|
secondStep = _props$secondStep === void 0 ? 1 : _props$secondStep,
|
14
14
|
staticMin = props.staticMin,
|
15
|
-
staticMax = props.staticMax
|
15
|
+
staticMax = props.staticMax,
|
16
|
+
position = props.position,
|
17
|
+
rangeDate = props.rangeDate;
|
16
18
|
var min = dateUtil.resetTimeByFormat(mi, format, options);
|
17
19
|
var max = dateUtil.resetTimeByFormat(ma, format, options);
|
18
20
|
var current = props.value || dateUtil.newDate(undefined, options);
|
@@ -38,7 +40,7 @@ var useTime = function useTime(props) {
|
|
38
40
|
disabledTime = props.disabledTime;
|
39
41
|
if (disabledTime) {
|
40
42
|
var _time = dateUtil.format(date, dateUtil.TIME_FORMAT, options);
|
41
|
-
if (typeof disabledTime === 'function') return disabledTime(_time);
|
43
|
+
if (typeof disabledTime === 'function') return disabledTime(_time, position, rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[0], rangeDate === null || rangeDate === void 0 ? void 0 : rangeDate[1]);
|
42
44
|
return disabledTime === _time;
|
43
45
|
}
|
44
46
|
var isDis = disabled && typeof disabled === 'function' ? disabled(date) : false;
|
@@ -11,9 +11,11 @@ export interface UseTimeProps {
|
|
11
11
|
staticMin?: Date;
|
12
12
|
staticMax?: Date;
|
13
13
|
disabled?: boolean | ((date: Date) => boolean);
|
14
|
-
disabledTime?: string | ((time: string) => boolean);
|
14
|
+
disabledTime?: string | ((time: string, type?: 'start' | 'end', value0?: Date, value1?: Date) => boolean);
|
15
15
|
minuteStep?: number;
|
16
16
|
hourStep?: number;
|
17
17
|
secondStep?: number;
|
18
|
+
position?: 'start' | 'end';
|
19
|
+
rangeDate?: Array<Date | undefined>;
|
18
20
|
}
|
19
21
|
//# sourceMappingURL=use-time.type.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-time.type.d.ts","sourceRoot":"","sources":["use-time.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"use-time.type.d.ts","sourceRoot":"","sources":["use-time.type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC/C,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC;IAC1G,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;CACrC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AAiCA,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;;;;;;;;;wBAmSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApPnB,MAAM;oCAmUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAiWvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCArJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApPnB,MAAM;gCAmUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAiWvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BArJpD,MAAM,0BAAyB,qBAAqB;;
|
1
|
+
{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AAiCA,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;;;;;;;;;wBAmSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BApPnB,MAAM;oCAmUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAiWvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCArJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BApPnB,MAAM;gCAmUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA9RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAiWvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BArJpD,MAAM,0BAAyB,qBAAqB;;CA0b9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -227,7 +227,7 @@ var useForm = function useForm(props) {
|
|
227
227
|
var _props$onChange;
|
228
228
|
var newValue = typeof change === 'function' ? produce(context.value, change) : change;
|
229
229
|
context.value = newValue;
|
230
|
-
(_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
|
230
|
+
(_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, deepClone(context.value));
|
231
231
|
});
|
232
232
|
var scrollToField = usePersistFn(function (name) {
|
233
233
|
var _document;
|
@@ -613,11 +613,6 @@ var useForm = function useForm(props) {
|
|
613
613
|
// 默认值更新
|
614
614
|
React.useEffect(function () {
|
615
615
|
context.removeLock = false;
|
616
|
-
// 内部 onChange 改的 value, 不需要更新
|
617
|
-
if (props.value === context.value) {
|
618
|
-
if (!isControl) update();
|
619
|
-
return;
|
620
|
-
}
|
621
616
|
if (initValidate && !context.resetTime) {
|
622
617
|
var keys = Object.keys(context.validateMap).filter(function (key) {
|
623
618
|
var oldValue = deepGet(preValue || emptyObj, key);
|
@@ -627,6 +622,7 @@ var useForm = function useForm(props) {
|
|
627
622
|
validateFields(keys).catch(function () {});
|
628
623
|
}
|
629
624
|
update();
|
625
|
+
if (!isControl) return;
|
630
626
|
// 默认值上位时会提前触发外部的onChange, 导致外部的多次setFormValue不能合并后生效的问题(ReactDOM.render方式渲染)
|
631
627
|
setTimeout(updateDefaultValue);
|
632
628
|
context.resetTime = 0;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-input.d.ts","sourceRoot":"","sources":["use-input.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAa5D,QAAA,MAAM,QAAQ,WAAY,cAAc;;;;;;;
|
1
|
+
{"version":3,"file":"use-input.d.ts","sourceRoot":"","sources":["use-input.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAa5D,QAAA,MAAM,QAAQ,WAAY,cAAc;;;;;;;CA4IvC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -88,7 +88,10 @@ var useInput = function useInput(params) {
|
|
88
88
|
(_otherHandlers$onFocu = otherHandlers.onFocus) === null || _otherHandlers$onFocu === void 0 || _otherHandlers$onFocu.call(otherHandlers, event);
|
89
89
|
setFocused(true);
|
90
90
|
if (autoSelect) {
|
91
|
-
|
91
|
+
// why requestAnimationFrame: 当在文字身体上hover后立即点击,select()与浏览器的光标定位逻辑产生竞争,有可能导致只选中的部分文本,所以需要延迟一下
|
92
|
+
requestAnimationFrame(function () {
|
93
|
+
event.target.select();
|
94
|
+
});
|
92
95
|
}
|
93
96
|
};
|
94
97
|
};
|
@@ -135,20 +135,20 @@ var usePopup = function usePopup(props) {
|
|
135
135
|
}
|
136
136
|
};
|
137
137
|
var handleMouseEnter = usePersistFn(function (e) {
|
138
|
-
var _targetEvents$onMouse, _targetRef$current;
|
138
|
+
var _targetEvents$onMouse, _targetRef$current, _popupRef$current2;
|
139
139
|
targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse = targetEvents.onMouseEnter) === null || _targetEvents$onMouse === void 0 || _targetEvents$onMouse.call(targetEvents, e);
|
140
140
|
if (trigger !== 'hover') return;
|
141
141
|
var isParentContainsCurrent = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.contains(e.target);
|
142
|
-
if (isParentContainsCurrent) {
|
142
|
+
if (isParentContainsCurrent || popupRef !== null && popupRef !== void 0 && (_popupRef$current2 = popupRef.current) !== null && _popupRef$current2 !== void 0 && _popupRef$current2.contains(e.target)) {
|
143
143
|
handleHoverToggle(true);
|
144
144
|
}
|
145
145
|
});
|
146
146
|
var handleMouseLeave = usePersistFn(function (e) {
|
147
|
-
var _targetEvents$onMouse2, _popupRef$
|
147
|
+
var _targetEvents$onMouse2, _popupRef$current3;
|
148
148
|
targetEvents === null || targetEvents === void 0 || (_targetEvents$onMouse2 = targetEvents.onMouseLeave) === null || _targetEvents$onMouse2 === void 0 || _targetEvents$onMouse2.call(targetEvents, e);
|
149
149
|
if (trigger !== 'hover') return;
|
150
150
|
// @ts-ignore
|
151
|
-
if (e.relatedTarget instanceof HTMLElement && (_popupRef$
|
151
|
+
if (e.relatedTarget instanceof HTMLElement && (_popupRef$current3 = popupRef.current) !== null && _popupRef$current3 !== void 0 && _popupRef$current3.contains(e.relatedTarget)) {
|
152
152
|
return;
|
153
153
|
}
|
154
154
|
handleHoverToggle(false);
|
@@ -11,7 +11,8 @@ interface UseTableVirtualProps {
|
|
11
11
|
isRtl?: boolean;
|
12
12
|
columns: TableFormatColumn<any>[];
|
13
13
|
colgroup: (number | string | undefined)[];
|
14
|
-
|
14
|
+
theadHeight: number;
|
15
|
+
tfootHeight: number;
|
15
16
|
}
|
16
17
|
declare const useTableVirtual: (props: UseTableVirtualProps) => {
|
17
18
|
scrollHeight: number;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,
|
1
|
+
{"version":3,"file":"use-table-virtual.d.ts","sourceRoot":"","sources":["use-table-virtual.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAWrD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;oBAqLpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnGuB,MAAM,UAAU,MAAM;2BAsIrB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAUR,MAAM,GAAG,MAAM;CA0GnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
@@ -123,7 +123,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
123
123
|
for (var i = 0; i <= index; i++) {
|
124
124
|
sum += context.cachedHeight[i] || props.rowHeight;
|
125
125
|
}
|
126
|
-
return sum + props.
|
126
|
+
return sum + props.theadHeight + props.tfootHeight;
|
127
127
|
};
|
128
128
|
var setRowHeight = usePersistFn(function (index, height) {
|
129
129
|
if (props.disabled) return;
|
@@ -266,7 +266,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
266
266
|
callback();
|
267
267
|
}
|
268
268
|
};
|
269
|
-
props.scrollRef.current.scrollTop = beforeHeight;
|
269
|
+
props.scrollRef.current.scrollTop = beforeHeight - props.theadHeight;
|
270
270
|
}
|
271
271
|
});
|
272
272
|
var scrollColumnByLeft = usePersistFn(function (targetLeft) {
|
@@ -343,7 +343,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
343
343
|
useEffect(function () {
|
344
344
|
if (props.disabled) return;
|
345
345
|
setHeight(getContentHeight(props.data.length - 1));
|
346
|
-
}, [props.data.length, props.
|
346
|
+
}, [props.data.length, props.theadHeight, props.tfootHeight]);
|
347
347
|
useEffect(function () {
|
348
348
|
if (props.disabled) return;
|
349
349
|
if (context.heightCallback) {
|
@@ -497,7 +497,7 @@ var useTree = function useTree(props) {
|
|
497
497
|
(_context$value = context.value) === null || _context$value === void 0 || _context$value.forEach(function (id) {
|
498
498
|
var _ref3 = context.pathMap.get(id),
|
499
499
|
children = _ref3.children;
|
500
|
-
if (children.length) {
|
500
|
+
if (children && children.length) {
|
501
501
|
var noCheckedChildren = children.filter(function (cid) {
|
502
502
|
var _context$value2;
|
503
503
|
return !((_context$value2 = context.value) !== null && _context$value2 !== void 0 && _context$value2.includes(cid));
|
package/esm/utils/object.d.ts
CHANGED
@@ -45,5 +45,11 @@ export declare const getAllKeyPaths: (obj: ObjectType, parentKey?: string) => st
|
|
45
45
|
* console.log(completeFields) // ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
|
46
46
|
*/
|
47
47
|
export declare const getCompleteFieldKeys: (fields: string | string[], allFields: string[]) => string[];
|
48
|
+
/**
|
49
|
+
* 将对象中的所有值设置为空, 如果值是数组,重置为空数组,如果是对象,重置为空对象,如果是基础类型,重置为undefined
|
50
|
+
* @param obj 对象
|
51
|
+
* @returns 空对象
|
52
|
+
*/
|
53
|
+
export declare const clearValue: (obj: ObjectType) => any;
|
48
54
|
export {};
|
49
55
|
//# sourceMappingURL=object.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA"}
|
1
|
+
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA;AAGD;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAS,UAAU,KAAG,GAW5C,CAAC"}
|
package/esm/utils/object.js
CHANGED
@@ -325,4 +325,24 @@ export var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allField
|
|
325
325
|
|
326
326
|
// 返回之前去重
|
327
327
|
return Array.from(new Set(completeFields));
|
328
|
+
};
|
329
|
+
|
330
|
+
/**
|
331
|
+
* 将对象中的所有值设置为空, 如果值是数组,重置为空数组,如果是对象,重置为空对象,如果是基础类型,重置为undefined
|
332
|
+
* @param obj 对象
|
333
|
+
* @returns 空对象
|
334
|
+
*/
|
335
|
+
export var clearValue = function clearValue(obj) {
|
336
|
+
if (isArray(obj)) {
|
337
|
+
return obj.map(function (item) {
|
338
|
+
return clearValue(item);
|
339
|
+
});
|
340
|
+
}
|
341
|
+
if (isObject(obj)) {
|
342
|
+
return Object.keys(obj).reduce(function (acc, key) {
|
343
|
+
acc[key] = clearValue(obj[key]);
|
344
|
+
return acc;
|
345
|
+
}, {});
|
346
|
+
}
|
347
|
+
return undefined;
|
328
348
|
};
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@sheinx/hooks",
|
3
|
-
"version": "3.8.0-beta.
|
3
|
+
"version": "3.8.0-beta.18",
|
4
4
|
"description": "",
|
5
5
|
"keywords": [],
|
6
6
|
"license": "MIT",
|
@@ -18,8 +18,8 @@
|
|
18
18
|
"immer": "10.0.2"
|
19
19
|
},
|
20
20
|
"peerDependencies": {
|
21
|
-
"react": ">=16.
|
22
|
-
"react-dom": ">=16.
|
21
|
+
"react": ">=16.14.0",
|
22
|
+
"react-dom": ">=16.14.0",
|
23
23
|
"core-js": ">=3"
|
24
24
|
},
|
25
25
|
"repository": {
|