@nokecy/qc-ui 1.0.25 → 1.0.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.
|
@@ -180,9 +180,6 @@ function AgGridPlus(props) {
|
|
|
180
180
|
state: gridPlusColumnState[gridKey],
|
|
181
181
|
applyOrder: true
|
|
182
182
|
});
|
|
183
|
-
setTimeout(function () {
|
|
184
|
-
apiRef.current.setGridOption("columnDefs", gridPlusColumnState[gridKey]);
|
|
185
|
-
}, 10);
|
|
186
183
|
}
|
|
187
184
|
}, [gridPlusColumnState, apiRef.current]);
|
|
188
185
|
(0, _react.useEffect)(function () {
|
|
@@ -230,8 +227,13 @@ function AgGridPlus(props) {
|
|
|
230
227
|
var cellMap = {};
|
|
231
228
|
if ((0, _isArray2.default)(columnState)) {
|
|
232
229
|
columnState.map(function (item) {
|
|
233
|
-
if (item.cellClass) {
|
|
234
|
-
|
|
230
|
+
if (item.cellClass || item.suppressHeaderFilterButton !== undefined) {
|
|
231
|
+
// 使用对象存储多个字段的值
|
|
232
|
+
cellMap[item.field] = {
|
|
233
|
+
cellClass: item.cellClass,
|
|
234
|
+
// 单元格默认样式类
|
|
235
|
+
suppressHeaderFilterButton: item.suppressHeaderFilterButton // 是否显示过滤按钮
|
|
236
|
+
};
|
|
235
237
|
}
|
|
236
238
|
});
|
|
237
239
|
}
|
|
@@ -442,8 +444,14 @@ function AgGridPlus(props) {
|
|
|
442
444
|
var colDefs = (0, _react.useMemo)(function () {
|
|
443
445
|
var columnDefs = getTableColumns(rowData);
|
|
444
446
|
columnDefs = columnDefs.map(function (i) {
|
|
445
|
-
|
|
446
|
-
|
|
447
|
+
var cellConfig = columnCellClass[i.field];
|
|
448
|
+
if (cellConfig) {
|
|
449
|
+
if (cellConfig.cellClass) {
|
|
450
|
+
i.cellClass = cellConfig.cellClass;
|
|
451
|
+
}
|
|
452
|
+
if (cellConfig.suppressHeaderFilterButton !== undefined) {
|
|
453
|
+
i.suppressHeaderFilterButton = cellConfig.suppressHeaderFilterButton;
|
|
454
|
+
}
|
|
447
455
|
}
|
|
448
456
|
return i;
|
|
449
457
|
}).filter(function (x) {
|
|
@@ -226,13 +226,10 @@ var Setting = function Setting(props) {
|
|
|
226
226
|
formDialog.forConfirm(function (payload, next) {
|
|
227
227
|
var values = payload.values;
|
|
228
228
|
onSaveColumnState && onSaveColumnState(values.items);
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
});
|
|
234
|
-
gridApi.setGridOption("columnDefs", values.items);
|
|
235
|
-
}, 100);
|
|
229
|
+
var falg = gridApi.applyColumnState({
|
|
230
|
+
state: values.items,
|
|
231
|
+
applyOrder: true
|
|
232
|
+
});
|
|
236
233
|
next(payload);
|
|
237
234
|
}).open(formProps);
|
|
238
235
|
case 2:
|
|
@@ -171,9 +171,6 @@ function AgGridPlus(props) {
|
|
|
171
171
|
state: gridPlusColumnState[gridKey],
|
|
172
172
|
applyOrder: true
|
|
173
173
|
});
|
|
174
|
-
setTimeout(function () {
|
|
175
|
-
apiRef.current.setGridOption("columnDefs", gridPlusColumnState[gridKey]);
|
|
176
|
-
}, 10);
|
|
177
174
|
}
|
|
178
175
|
}, [gridPlusColumnState, apiRef.current]);
|
|
179
176
|
useEffect(function () {
|
|
@@ -221,8 +218,13 @@ function AgGridPlus(props) {
|
|
|
221
218
|
var cellMap = {};
|
|
222
219
|
if (_isArray(columnState)) {
|
|
223
220
|
columnState.map(function (item) {
|
|
224
|
-
if (item.cellClass) {
|
|
225
|
-
|
|
221
|
+
if (item.cellClass || item.suppressHeaderFilterButton !== undefined) {
|
|
222
|
+
// 使用对象存储多个字段的值
|
|
223
|
+
cellMap[item.field] = {
|
|
224
|
+
cellClass: item.cellClass,
|
|
225
|
+
// 单元格默认样式类
|
|
226
|
+
suppressHeaderFilterButton: item.suppressHeaderFilterButton // 是否显示过滤按钮
|
|
227
|
+
};
|
|
226
228
|
}
|
|
227
229
|
});
|
|
228
230
|
}
|
|
@@ -433,8 +435,14 @@ function AgGridPlus(props) {
|
|
|
433
435
|
var colDefs = useMemo(function () {
|
|
434
436
|
var columnDefs = getTableColumns(rowData);
|
|
435
437
|
columnDefs = columnDefs.map(function (i) {
|
|
436
|
-
|
|
437
|
-
|
|
438
|
+
var cellConfig = columnCellClass[i.field];
|
|
439
|
+
if (cellConfig) {
|
|
440
|
+
if (cellConfig.cellClass) {
|
|
441
|
+
i.cellClass = cellConfig.cellClass;
|
|
442
|
+
}
|
|
443
|
+
if (cellConfig.suppressHeaderFilterButton !== undefined) {
|
|
444
|
+
i.suppressHeaderFilterButton = cellConfig.suppressHeaderFilterButton;
|
|
445
|
+
}
|
|
438
446
|
}
|
|
439
447
|
return i;
|
|
440
448
|
}).filter(function (x) {
|
|
@@ -217,13 +217,10 @@ var Setting = function Setting(props) {
|
|
|
217
217
|
formDialog.forConfirm(function (payload, next) {
|
|
218
218
|
var values = payload.values;
|
|
219
219
|
onSaveColumnState && onSaveColumnState(values.items);
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
});
|
|
225
|
-
gridApi.setGridOption("columnDefs", values.items);
|
|
226
|
-
}, 100);
|
|
220
|
+
var falg = gridApi.applyColumnState({
|
|
221
|
+
state: values.items,
|
|
222
|
+
applyOrder: true
|
|
223
|
+
});
|
|
227
224
|
next(payload);
|
|
228
225
|
}).open(formProps);
|
|
229
226
|
case 2:
|