@sheinx/hooks 3.7.0-beta.3 → 3.7.0-beta.4
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-form/use-form.d.ts.map +1 -1
- package/cjs/components/use-form/use-form.js +3 -5
- package/cjs/components/use-table/use-table-layout.d.ts.map +1 -1
- package/cjs/components/use-table/use-table-layout.js +29 -1
- package/cjs/components/use-table/use-table-row.d.ts +0 -1
- package/cjs/components/use-table/use-table-row.d.ts.map +1 -1
- package/cjs/components/use-table/use-table-row.js +0 -11
- package/cjs/components/use-table/use-table-virtual.d.ts +1 -0
- package/cjs/components/use-table/use-table-virtual.d.ts.map +1 -1
- package/cjs/components/use-table/use-table-virtual.js +2 -2
- package/esm/components/use-form/use-form.d.ts.map +1 -1
- package/esm/components/use-form/use-form.js +3 -5
- package/esm/components/use-table/use-table-layout.d.ts.map +1 -1
- package/esm/components/use-table/use-table-layout.js +29 -1
- package/esm/components/use-table/use-table-row.d.ts +0 -1
- package/esm/components/use-table/use-table-row.d.ts.map +1 -1
- package/esm/components/use-table/use-table-row.js +0 -11
- package/esm/components/use-table/use-table-virtual.d.ts +1 -0
- package/esm/components/use-table/use-table-virtual.d.ts.map +1 -1
- package/esm/components/use-table/use-table-virtual.js +2 -2
- package/package.json +1 -1
@@ -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;;;;;;;;;wBA+RC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;aAAE;8BApKd,MAAM;oCAuOD,OAAO;;6BAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAoQvB,MAAM,WAAW,gBAAgB;gCA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAzIpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE;0BApKd,MAAM;gCAuOD,OAAO;;yBAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAoQvB,MAAM,WAAW,gBAAgB;4BA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAzIpD,MAAM,0BAAyB,qBAAqB;;CAua9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -494,12 +494,10 @@ var useForm = function useForm(props) {
|
|
494
494
|
context.removeArr.delete(n);
|
495
495
|
if (df !== undefined && (0, _utils.deepGet)(context.value, n) === undefined) {
|
496
496
|
if (!context.mounted) context.defaultValues[n] = df;
|
497
|
-
|
498
|
-
|
499
|
-
(0, _utils.deepSet)(v, n, df, deepSetOptions);
|
500
|
-
});
|
501
|
-
update(n);
|
497
|
+
onChange(function (v) {
|
498
|
+
(0, _utils.deepSet)(v, n, df, deepSetOptions);
|
502
499
|
});
|
500
|
+
update(n);
|
503
501
|
}
|
504
502
|
},
|
505
503
|
unbind: function unbind(n, reserveAble, validateField, update) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA0CrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA+CX,MAAM,UAAU,MAAM;;;;;;;CA+O5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
@@ -30,6 +30,34 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
30
30
|
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; }
|
31
31
|
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; } }
|
32
32
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
33
|
+
function getDecimalAndIntegerPart(num) {
|
34
|
+
if (!num) return [0, 0];
|
35
|
+
var str = num.toString();
|
36
|
+
var dotIndex = str.indexOf('.');
|
37
|
+
if (dotIndex === -1) return [parseInt(str), 0];
|
38
|
+
var integerPart = parseInt(str.slice(0, dotIndex));
|
39
|
+
var decimalPart = parseFloat("0.".concat(str.slice(dotIndex + 1)));
|
40
|
+
return [integerPart, decimalPart];
|
41
|
+
}
|
42
|
+
|
43
|
+
// 将所有的小数部分转移到最后一列
|
44
|
+
function shiftDecimalToLastColumn(cols) {
|
45
|
+
var decimalSum = 0;
|
46
|
+
cols.forEach(function (v, i) {
|
47
|
+
var _getDecimalAndInteger = getDecimalAndIntegerPart(v),
|
48
|
+
_getDecimalAndInteger2 = _slicedToArray(_getDecimalAndInteger, 2),
|
49
|
+
inter = _getDecimalAndInteger2[0],
|
50
|
+
decimal = _getDecimalAndInteger2[1];
|
51
|
+
if (decimal > 0) {
|
52
|
+
decimalSum += decimal;
|
53
|
+
cols[i] = inter;
|
54
|
+
}
|
55
|
+
});
|
56
|
+
if (decimalSum > 0) {
|
57
|
+
cols[cols.length - 1] = Number(cols[cols.length - 1]) + decimalSum;
|
58
|
+
}
|
59
|
+
return cols;
|
60
|
+
}
|
33
61
|
var MIN_RESIZABLE_WIDTH = 20;
|
34
62
|
function compareColumnWidth(curCols, preCols) {
|
35
63
|
if (curCols.length !== preCols.length) return false;
|
@@ -151,7 +179,7 @@ var useTableLayout = function useTableLayout(props) {
|
|
151
179
|
if (cols && cols.every(function (v) {
|
152
180
|
return v === 0;
|
153
181
|
})) return;
|
154
|
-
setColgroup(cols);
|
182
|
+
setColgroup(shiftDecimalToLastColumn(cols));
|
155
183
|
setAdjust(adjust);
|
156
184
|
if (!adjust) {
|
157
185
|
updateResizeFlag();
|
@@ -24,7 +24,6 @@ export interface Row {
|
|
24
24
|
declare const useTableRow: (props: TableRowProps) => {
|
25
25
|
rowData: Row[][];
|
26
26
|
handleCellHover: (rowIndex: number, colSpan?: any) => void;
|
27
|
-
isCellHover: (rowIndex: number, colSpan?: any) => boolean;
|
28
27
|
hoverIndex: Set<number>;
|
29
28
|
rowSelectMergeStartData: any[];
|
30
29
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM
|
1
|
+
{"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CAgDvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
@@ -71,16 +71,6 @@ var useTableRow = function useTableRow(props) {
|
|
71
71
|
}
|
72
72
|
setHoverIndex(hoverIndex);
|
73
73
|
});
|
74
|
-
var isCellHover = (0, _usePersistFn.usePersistFn)(function (rowIndex) {
|
75
|
-
var colSpan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
|
76
|
-
if (!props.hover) return false;
|
77
|
-
var isHover = false;
|
78
|
-
for (var i = 0; i < colSpan; i++) {
|
79
|
-
isHover = hoverIndex.has(rowIndex + i);
|
80
|
-
if (isHover) break;
|
81
|
-
}
|
82
|
-
return isHover;
|
83
|
-
});
|
84
74
|
var rowData = (0, _react.useMemo)(function () {
|
85
75
|
var rows = [];
|
86
76
|
context.rowSelectMergeStartData = [];
|
@@ -114,7 +104,6 @@ var useTableRow = function useTableRow(props) {
|
|
114
104
|
return {
|
115
105
|
rowData: rowData,
|
116
106
|
handleCellHover: handleCellHover,
|
117
|
-
isCellHover: isCellHover,
|
118
107
|
hoverIndex: hoverIndex,
|
119
108
|
rowSelectMergeStartData: context.rowSelectMergeStartData
|
120
109
|
};
|
@@ -11,6 +11,7 @@ interface UseTableVirtualProps {
|
|
11
11
|
isRtl?: boolean;
|
12
12
|
columns: TableFormatColumn<any>[];
|
13
13
|
colgroup: (number | string | undefined)[];
|
14
|
+
theadAndTfootHeight: number;
|
14
15
|
}
|
15
16
|
declare const useTableVirtual: (props: UseTableVirtualProps) => {
|
16
17
|
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;
|
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,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;oBA6LpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnGuB,MAAM,UAAU,MAAM;0BAjBtB,MAAM,QAAQ,MAAM;2BAuJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAUR,MAAM,GAAG,MAAM;CAgGnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
@@ -136,7 +136,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
136
136
|
for (var i = 0; i <= index; i++) {
|
137
137
|
sum += context.cachedHeight[i] || props.rowHeight;
|
138
138
|
}
|
139
|
-
return sum;
|
139
|
+
return sum + props.theadAndTfootHeight;
|
140
140
|
};
|
141
141
|
var setRowHeight = (0, _usePersistFn.usePersistFn)(function (index, height) {
|
142
142
|
if (props.disabled) return;
|
@@ -356,7 +356,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
356
356
|
(0, _react.useEffect)(function () {
|
357
357
|
if (props.disabled) return;
|
358
358
|
setHeight(getContentHeight(props.data.length - 1));
|
359
|
-
}, [props.data.length]);
|
359
|
+
}, [props.data.length, props.theadAndTfootHeight]);
|
360
360
|
(0, _react.useEffect)(function () {
|
361
361
|
if (props.disabled) return;
|
362
362
|
if (context.heightCallback) {
|
@@ -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;;;;;;;;;wBA+RC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;aAAE;8BApKd,MAAM;oCAuOD,OAAO;;6BAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAoQvB,MAAM,WAAW,gBAAgB;gCA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAzIpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE;0BApKd,MAAM;gCAuOD,OAAO;;yBAfb,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCAlMxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAoQvB,MAAM,WAAW,gBAAgB;4BA/CzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAzIpD,MAAM,0BAAyB,qBAAqB;;CAua9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
@@ -485,12 +485,10 @@ var useForm = function useForm(props) {
|
|
485
485
|
context.removeArr.delete(n);
|
486
486
|
if (df !== undefined && deepGet(context.value, n) === undefined) {
|
487
487
|
if (!context.mounted) context.defaultValues[n] = df;
|
488
|
-
|
489
|
-
|
490
|
-
deepSet(v, n, df, deepSetOptions);
|
491
|
-
});
|
492
|
-
update(n);
|
488
|
+
onChange(function (v) {
|
489
|
+
deepSet(v, n, df, deepSetOptions);
|
493
490
|
});
|
491
|
+
update(n);
|
494
492
|
}
|
495
493
|
},
|
496
494
|
unbind: function unbind(n, reserveAble, validateField, update) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"use-table-layout.d.ts","sourceRoot":"","sources":["use-table-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA0CrE,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,cAAc,CAAC,GAAG,CAAC,EACnB,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,OAAO,CAC7E;IACD,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,cAAc,UAAW,mBAAmB;;;;;;;;;;;yBA+CX,MAAM,UAAU,MAAM;;;;;;;CA+O5D,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
@@ -21,6 +21,34 @@ import usePrevious from "../../common/use-previous";
|
|
21
21
|
import { addResizeObserver } from "../../utils/dom/element";
|
22
22
|
import { isFunc, isNumber } from "../../utils/is";
|
23
23
|
import { toNum } from "../../utils/number";
|
24
|
+
function getDecimalAndIntegerPart(num) {
|
25
|
+
if (!num) return [0, 0];
|
26
|
+
var str = num.toString();
|
27
|
+
var dotIndex = str.indexOf('.');
|
28
|
+
if (dotIndex === -1) return [parseInt(str), 0];
|
29
|
+
var integerPart = parseInt(str.slice(0, dotIndex));
|
30
|
+
var decimalPart = parseFloat("0.".concat(str.slice(dotIndex + 1)));
|
31
|
+
return [integerPart, decimalPart];
|
32
|
+
}
|
33
|
+
|
34
|
+
// 将所有的小数部分转移到最后一列
|
35
|
+
function shiftDecimalToLastColumn(cols) {
|
36
|
+
var decimalSum = 0;
|
37
|
+
cols.forEach(function (v, i) {
|
38
|
+
var _getDecimalAndInteger = getDecimalAndIntegerPart(v),
|
39
|
+
_getDecimalAndInteger2 = _slicedToArray(_getDecimalAndInteger, 2),
|
40
|
+
inter = _getDecimalAndInteger2[0],
|
41
|
+
decimal = _getDecimalAndInteger2[1];
|
42
|
+
if (decimal > 0) {
|
43
|
+
decimalSum += decimal;
|
44
|
+
cols[i] = inter;
|
45
|
+
}
|
46
|
+
});
|
47
|
+
if (decimalSum > 0) {
|
48
|
+
cols[cols.length - 1] = Number(cols[cols.length - 1]) + decimalSum;
|
49
|
+
}
|
50
|
+
return cols;
|
51
|
+
}
|
24
52
|
var MIN_RESIZABLE_WIDTH = 20;
|
25
53
|
function compareColumnWidth(curCols, preCols) {
|
26
54
|
if (curCols.length !== preCols.length) return false;
|
@@ -142,7 +170,7 @@ var useTableLayout = function useTableLayout(props) {
|
|
142
170
|
if (cols && cols.every(function (v) {
|
143
171
|
return v === 0;
|
144
172
|
})) return;
|
145
|
-
setColgroup(cols);
|
173
|
+
setColgroup(shiftDecimalToLastColumn(cols));
|
146
174
|
setAdjust(adjust);
|
147
175
|
if (!adjust) {
|
148
176
|
updateResizeFlag();
|
@@ -24,7 +24,6 @@ export interface Row {
|
|
24
24
|
declare const useTableRow: (props: TableRowProps) => {
|
25
25
|
rowData: Row[][];
|
26
26
|
handleCellHover: (rowIndex: number, colSpan?: any) => void;
|
27
|
-
isCellHover: (rowIndex: number, colSpan?: any) => boolean;
|
28
27
|
hoverIndex: Set<number>;
|
29
28
|
rowSelectMergeStartData: any[];
|
30
29
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM
|
1
|
+
{"version":3,"file":"use-table-row.d.ts","sourceRoot":"","sources":["use-table-row.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtE,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4CD;;;;GAIG;AACH,QAAA,MAAM,WAAW,UAAW,aAAa;;gCASS,MAAM;;;CAgDvD,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
@@ -65,16 +65,6 @@ var useTableRow = function useTableRow(props) {
|
|
65
65
|
}
|
66
66
|
setHoverIndex(hoverIndex);
|
67
67
|
});
|
68
|
-
var isCellHover = usePersistFn(function (rowIndex) {
|
69
|
-
var colSpan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
|
70
|
-
if (!props.hover) return false;
|
71
|
-
var isHover = false;
|
72
|
-
for (var i = 0; i < colSpan; i++) {
|
73
|
-
isHover = hoverIndex.has(rowIndex + i);
|
74
|
-
if (isHover) break;
|
75
|
-
}
|
76
|
-
return isHover;
|
77
|
-
});
|
78
68
|
var rowData = useMemo(function () {
|
79
69
|
var rows = [];
|
80
70
|
context.rowSelectMergeStartData = [];
|
@@ -108,7 +98,6 @@ var useTableRow = function useTableRow(props) {
|
|
108
98
|
return {
|
109
99
|
rowData: rowData,
|
110
100
|
handleCellHover: handleCellHover,
|
111
|
-
isCellHover: isCellHover,
|
112
101
|
hoverIndex: hoverIndex,
|
113
102
|
rowSelectMergeStartData: context.rowSelectMergeStartData
|
114
103
|
};
|
@@ -11,6 +11,7 @@ interface UseTableVirtualProps {
|
|
11
11
|
isRtl?: boolean;
|
12
12
|
columns: TableFormatColumn<any>[];
|
13
13
|
colgroup: (number | string | undefined)[];
|
14
|
+
theadAndTfootHeight: number;
|
14
15
|
}
|
15
16
|
declare const useTableVirtual: (props: UseTableVirtualProps) => {
|
16
17
|
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;
|
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,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AACD,QAAA,MAAM,eAAe,UAAW,oBAAoB;;;;;;oBA6LpC,MAAM;mBACP,MAAM;WACd,MAAM;gBACD,MAAM;kBACJ,OAAO;;0BAnGuB,MAAM,UAAU,MAAM;0BAjBtB,MAAM,QAAQ,MAAM;2BAuJnB,MAAM,aAAa,MAAM,IAAI;qCAoBnB,MAAM;mCAUR,MAAM,GAAG,MAAM;CAgGnE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
@@ -130,7 +130,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
130
130
|
for (var i = 0; i <= index; i++) {
|
131
131
|
sum += context.cachedHeight[i] || props.rowHeight;
|
132
132
|
}
|
133
|
-
return sum;
|
133
|
+
return sum + props.theadAndTfootHeight;
|
134
134
|
};
|
135
135
|
var setRowHeight = usePersistFn(function (index, height) {
|
136
136
|
if (props.disabled) return;
|
@@ -350,7 +350,7 @@ var useTableVirtual = function useTableVirtual(props) {
|
|
350
350
|
useEffect(function () {
|
351
351
|
if (props.disabled) return;
|
352
352
|
setHeight(getContentHeight(props.data.length - 1));
|
353
|
-
}, [props.data.length]);
|
353
|
+
}, [props.data.length, props.theadAndTfootHeight]);
|
354
354
|
useEffect(function () {
|
355
355
|
if (props.disabled) return;
|
356
356
|
if (context.heightCallback) {
|