@etsoo/materialui 1.6.45 → 1.6.46
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/lib/cjs/DataGridEx.js
CHANGED
|
@@ -319,9 +319,7 @@ function DataGridEx(props) {
|
|
|
319
319
|
const child = cellRenderer({
|
|
320
320
|
data,
|
|
321
321
|
field,
|
|
322
|
-
formattedValue: valueFormatter
|
|
323
|
-
? valueFormatter(formatProps)
|
|
324
|
-
: undefined,
|
|
322
|
+
formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
|
|
325
323
|
selected,
|
|
326
324
|
type,
|
|
327
325
|
rowIndex,
|
|
@@ -27,16 +27,19 @@ var DataGridRenderers;
|
|
|
27
27
|
// First column, show loading indicator
|
|
28
28
|
if (columnIndex === 0)
|
|
29
29
|
return (0, jsx_runtime_1.jsx)(CircularProgress_1.default, { size: 15 });
|
|
30
|
-
// Others return
|
|
31
|
-
return
|
|
30
|
+
// Others return
|
|
31
|
+
return;
|
|
32
32
|
}
|
|
33
|
+
// No formatted value
|
|
34
|
+
if (formattedValue === undefined)
|
|
35
|
+
return;
|
|
33
36
|
// No formatted value and data field
|
|
34
37
|
if (formattedValue == null && field == null)
|
|
35
|
-
return
|
|
38
|
+
return;
|
|
36
39
|
// Cell value
|
|
37
40
|
const value = formattedValue ?? data[field];
|
|
38
41
|
if (value == null)
|
|
39
|
-
return
|
|
42
|
+
return;
|
|
40
43
|
// For unknow and string type, keep the simple format
|
|
41
44
|
if (type === react_1.GridDataType.Unkwown)
|
|
42
45
|
return value;
|
|
@@ -104,7 +107,6 @@ var DataGridRenderers;
|
|
|
104
107
|
return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
|
|
105
108
|
}
|
|
106
109
|
}
|
|
107
|
-
return undefined;
|
|
108
110
|
}
|
|
109
111
|
DataGridRenderers.defaultFooterItemRenderer = defaultFooterItemRenderer;
|
|
110
112
|
})(DataGridRenderers || (exports.DataGridRenderers = DataGridRenderers = {}));
|
package/lib/mjs/DataGridEx.js
CHANGED
|
@@ -312,9 +312,7 @@ export function DataGridEx(props) {
|
|
|
312
312
|
const child = cellRenderer({
|
|
313
313
|
data,
|
|
314
314
|
field,
|
|
315
|
-
formattedValue: valueFormatter
|
|
316
|
-
? valueFormatter(formatProps)
|
|
317
|
-
: undefined,
|
|
315
|
+
formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
|
|
318
316
|
selected,
|
|
319
317
|
type,
|
|
320
318
|
rowIndex,
|
|
@@ -21,16 +21,19 @@ export var DataGridRenderers;
|
|
|
21
21
|
// First column, show loading indicator
|
|
22
22
|
if (columnIndex === 0)
|
|
23
23
|
return _jsx(CircularProgress, { size: 15 });
|
|
24
|
-
// Others return
|
|
25
|
-
return
|
|
24
|
+
// Others return
|
|
25
|
+
return;
|
|
26
26
|
}
|
|
27
|
+
// No formatted value
|
|
28
|
+
if (formattedValue === undefined)
|
|
29
|
+
return;
|
|
27
30
|
// No formatted value and data field
|
|
28
31
|
if (formattedValue == null && field == null)
|
|
29
|
-
return
|
|
32
|
+
return;
|
|
30
33
|
// Cell value
|
|
31
34
|
const value = formattedValue ?? data[field];
|
|
32
35
|
if (value == null)
|
|
33
|
-
return
|
|
36
|
+
return;
|
|
34
37
|
// For unknow and string type, keep the simple format
|
|
35
38
|
if (type === GridDataType.Unkwown)
|
|
36
39
|
return value;
|
|
@@ -98,7 +101,6 @@ export var DataGridRenderers;
|
|
|
98
101
|
return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
|
-
return undefined;
|
|
102
104
|
}
|
|
103
105
|
DataGridRenderers.defaultFooterItemRenderer = defaultFooterItemRenderer;
|
|
104
106
|
})(DataGridRenderers || (DataGridRenderers = {}));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etsoo/materialui",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.46",
|
|
4
4
|
"description": "TypeScript Material-UI Implementation",
|
|
5
5
|
"main": "lib/cjs/index.js",
|
|
6
6
|
"module": "lib/mjs/index.js",
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
"@dnd-kit/react": "^0.4.0",
|
|
41
41
|
"@emotion/react": "^11.14.0",
|
|
42
42
|
"@emotion/styled": "^11.14.1",
|
|
43
|
-
"@etsoo/appscript": "^1.6.
|
|
43
|
+
"@etsoo/appscript": "^1.6.61",
|
|
44
44
|
"@etsoo/notificationbase": "^1.1.69",
|
|
45
|
-
"@etsoo/react": "^1.8.
|
|
45
|
+
"@etsoo/react": "^1.8.85",
|
|
46
46
|
"@etsoo/shared": "^1.2.83",
|
|
47
47
|
"@mui/icons-material": "^9.0.0",
|
|
48
48
|
"@mui/material": "^9.0.0",
|
package/src/DataGridEx.tsx
CHANGED
|
@@ -665,9 +665,7 @@ export function DataGridEx<T extends object>(props: DataGridExProps<T>) {
|
|
|
665
665
|
const child = cellRenderer({
|
|
666
666
|
data,
|
|
667
667
|
field,
|
|
668
|
-
formattedValue: valueFormatter
|
|
669
|
-
? valueFormatter(formatProps)
|
|
670
|
-
: undefined,
|
|
668
|
+
formattedValue: valueFormatter ? valueFormatter(formatProps) : null,
|
|
671
669
|
selected,
|
|
672
670
|
type,
|
|
673
671
|
rowIndex,
|
|
@@ -31,16 +31,19 @@ export namespace DataGridRenderers {
|
|
|
31
31
|
// First column, show loading indicator
|
|
32
32
|
if (columnIndex === 0) return <CircularProgress size={15} />;
|
|
33
33
|
|
|
34
|
-
// Others return
|
|
35
|
-
return
|
|
34
|
+
// Others return
|
|
35
|
+
return;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
// No formatted value
|
|
39
|
+
if (formattedValue === undefined) return;
|
|
40
|
+
|
|
38
41
|
// No formatted value and data field
|
|
39
|
-
if (formattedValue == null && field == null) return
|
|
42
|
+
if (formattedValue == null && field == null) return;
|
|
40
43
|
|
|
41
44
|
// Cell value
|
|
42
45
|
const value = formattedValue ?? data[field!];
|
|
43
|
-
if (value == null) return
|
|
46
|
+
if (value == null) return;
|
|
44
47
|
|
|
45
48
|
// For unknow and string type, keep the simple format
|
|
46
49
|
if (type === GridDataType.Unkwown) return value;
|
|
@@ -139,7 +142,5 @@ export namespace DataGridRenderers {
|
|
|
139
142
|
return loadedItems.toLocaleString() + (hasNextPage ? "+" : "");
|
|
140
143
|
}
|
|
141
144
|
}
|
|
142
|
-
|
|
143
|
-
return undefined;
|
|
144
145
|
}
|
|
145
146
|
}
|