@zhenliang/sheet 0.1.39 → 0.1.40
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.
|
@@ -38,13 +38,29 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
|
|
|
38
38
|
}, [dataSource]);
|
|
39
39
|
useEffect(function () {
|
|
40
40
|
if (!hasChildren) return;
|
|
41
|
-
var
|
|
41
|
+
var computedRowGroup = dataSourceToRowConfig(dataSource, tableGroupConfig === null || tableGroupConfig === void 0 ? void 0 : tableGroupConfig.defaultOpen);
|
|
42
|
+
var rowConfig = computedRowGroup;
|
|
43
|
+
var _ref = tableGroupConfig || {},
|
|
44
|
+
rowGroup = _ref.rowGroup;
|
|
45
|
+
if (rowGroup) {
|
|
46
|
+
var notEqual = rowGroup.groups.length !== computedRowGroup.groups.length;
|
|
47
|
+
var notSameGroup = notEqual || rowGroup.groups.some(function (group, index) {
|
|
48
|
+
return computedRowGroup.groups[index].groupStart !== group.groupStart || computedRowGroup.groups[index].groupEnd !== group.groupEnd;
|
|
49
|
+
});
|
|
50
|
+
if (!notSameGroup) {
|
|
51
|
+
console.log(notSameGroup, rowGroup.groups, computedRowGroup);
|
|
52
|
+
rowConfig = rowGroup;
|
|
53
|
+
} else {
|
|
54
|
+
var _tableGroupConfig$onC;
|
|
55
|
+
tableGroupConfig === null || tableGroupConfig === void 0 || (_tableGroupConfig$onC = tableGroupConfig.onChange) === null || _tableGroupConfig$onC === void 0 || _tableGroupConfig$onC.call(tableGroupConfig, computedRowGroup);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
42
58
|
if (groupConfigRef.current) {
|
|
43
|
-
rowConfig.groups.forEach(function (
|
|
59
|
+
rowConfig.groups.forEach(function (_ref2, index) {
|
|
44
60
|
var _groupConfigRef$curre, _groupConfigRef$curre2;
|
|
45
|
-
var groupName =
|
|
46
|
-
newGroupStart =
|
|
47
|
-
newGroupEnd =
|
|
61
|
+
var groupName = _ref2.groupName,
|
|
62
|
+
newGroupStart = _ref2.groupStart,
|
|
63
|
+
newGroupEnd = _ref2.groupEnd;
|
|
48
64
|
var rowIndex = (_groupConfigRef$curre = (_groupConfigRef$curre2 = groupConfigRef.current) === null || _groupConfigRef$curre2 === void 0 ? void 0 : _groupConfigRef$curre2.groups.findIndex(function (item) {
|
|
49
65
|
return item.groupName === groupName;
|
|
50
66
|
})) !== null && _groupConfigRef$curre !== void 0 ? _groupConfigRef$curre : -1;
|
|
@@ -70,7 +86,9 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
|
|
|
70
86
|
groupConfigRef.current = rowConfig;
|
|
71
87
|
}, [dataSource.length, childrenLength, hasChildren]);
|
|
72
88
|
var handleGroupChange = useCallback(function (value) {
|
|
89
|
+
var _tableGroupConfig$onC2;
|
|
73
90
|
setGroupConfig(value);
|
|
91
|
+
tableGroupConfig === null || tableGroupConfig === void 0 || (_tableGroupConfig$onC2 = tableGroupConfig.onChange) === null || _tableGroupConfig$onC2 === void 0 || _tableGroupConfig$onC2.call(tableGroupConfig, value);
|
|
74
92
|
groupConfigRef.current = value;
|
|
75
93
|
}, [setGroupConfig]);
|
|
76
94
|
var groupMap = useMemo(function () {
|