@azrico/reactgrid 1.1.23 → 1.1.26
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.
|
@@ -44,8 +44,9 @@ const defaultOptions = {
|
|
|
44
44
|
rowReorderColumn: false,
|
|
45
45
|
resizable: true,
|
|
46
46
|
rowIndexColumn: true,
|
|
47
|
-
rowHeight:
|
|
48
|
-
maxRowHeight: 40
|
|
47
|
+
rowHeight: 35,
|
|
48
|
+
maxRowHeight: 40,
|
|
49
|
+
minRowHeight: 30
|
|
49
50
|
};
|
|
50
51
|
const forcedOptions = {
|
|
51
52
|
idProperty: '__table_id',
|
|
@@ -363,6 +364,7 @@ function ApplyColumnData(props) {
|
|
|
363
364
|
delete col.field;
|
|
364
365
|
delete col.key;
|
|
365
366
|
delete col.columnName;
|
|
367
|
+
if (col.flex && !col.defaultFlex) col.defaultFlex = col.flex;
|
|
366
368
|
}
|
|
367
369
|
}
|
|
368
370
|
/* -------------------------------------------------------------------------- */
|
package/package.json
CHANGED
package/src/views/DataGrid.tsx
CHANGED
|
@@ -137,8 +137,9 @@ const defaultOptions: GridOptions = {
|
|
|
137
137
|
resizable: true,
|
|
138
138
|
|
|
139
139
|
rowIndexColumn: true,
|
|
140
|
-
rowHeight:
|
|
140
|
+
rowHeight: 35,
|
|
141
141
|
maxRowHeight: 40,
|
|
142
|
+
minRowHeight: 30,
|
|
142
143
|
};
|
|
143
144
|
const forcedOptions: GridOptions = {
|
|
144
145
|
idProperty: '__table_id',
|
|
@@ -501,6 +502,8 @@ function ApplyColumnData(props: any): ColumnDefinition[] {
|
|
|
501
502
|
delete col.field;
|
|
502
503
|
delete col.key;
|
|
503
504
|
delete col.columnName;
|
|
505
|
+
|
|
506
|
+
if (col.flex && !col.defaultFlex) col.defaultFlex = col.flex;
|
|
504
507
|
}
|
|
505
508
|
}
|
|
506
509
|
/* -------------------------------------------------------------------------- */
|