es-grid-template 1.5.9 → 1.5.10
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.
|
@@ -210,11 +210,11 @@ const InternalTable = props => {
|
|
|
210
210
|
const mergedData = React.useMemo(() => {
|
|
211
211
|
// return addRowIdArray(dataSource)
|
|
212
212
|
|
|
213
|
-
if (groupSetting && groupSetting.client !== false) {
|
|
213
|
+
if (groupAble && groupSetting && groupSetting.client !== false) {
|
|
214
214
|
return groupArrayByColumns(dataSource, groupColumns);
|
|
215
215
|
}
|
|
216
216
|
return addRowIdArray(dataSource);
|
|
217
|
-
}, [dataSource, groupColumns, groupSetting]);
|
|
217
|
+
}, [dataSource, groupAble, groupColumns, groupSetting]);
|
|
218
218
|
const [columns, setColumns] = React.useState([]);
|
|
219
219
|
React.useEffect(() => {
|
|
220
220
|
if (propsHeight) {
|
|
@@ -221,11 +221,11 @@ const InternalTable = props => {
|
|
|
221
221
|
const mergedData = _react.default.useMemo(() => {
|
|
222
222
|
// return addRowIdArray(dataSource)
|
|
223
223
|
|
|
224
|
-
if (groupSetting && groupSetting.client !== false) {
|
|
224
|
+
if (groupAble && groupSetting && groupSetting.client !== false) {
|
|
225
225
|
return (0, _hooks.groupArrayByColumns)(dataSource, groupColumns);
|
|
226
226
|
}
|
|
227
227
|
return (0, _hooks.addRowIdArray)(dataSource);
|
|
228
|
-
}, [dataSource, groupColumns, groupSetting]);
|
|
228
|
+
}, [dataSource, groupAble, groupColumns, groupSetting]);
|
|
229
229
|
const [columns, setColumns] = _react.default.useState([]);
|
|
230
230
|
_react.default.useEffect(() => {
|
|
231
231
|
if (propsHeight) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "es-grid-template",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.10",
|
|
4
4
|
"description": "es-grid-template",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
"scripts": {
|
|
21
21
|
"__compile": "father build && ",
|
|
22
22
|
"compile": "father build && sass assets/index.scss assets/index.css",
|
|
23
|
+
"clean": "rimraf lib es",
|
|
23
24
|
"__docs:build": "dumi build",
|
|
24
25
|
"__docs:deploy": "gh-pages -d dist",
|
|
25
26
|
"lint": "eslint src/ --ext .tsx,.ts,.jsx,.js",
|
|
@@ -71,6 +72,7 @@
|
|
|
71
72
|
"react-numeric-component": "^1.0.7",
|
|
72
73
|
"react-resizable": "^3.0.5",
|
|
73
74
|
"react-tooltip": "^5.28.1",
|
|
75
|
+
"rimraf": "^6.0.1",
|
|
74
76
|
"sass": "^1.81.0",
|
|
75
77
|
"styled-components": "^6.1.15",
|
|
76
78
|
"sweetalert2": "^11.4.14",
|