@nokecy/qc-ui 1.0.24 → 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.
@@ -169,6 +169,8 @@ function AgGridPlus(props) {
169
169
  onRequest(queryFilter);
170
170
  }
171
171
  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]);
172
+ // 测试列数据
173
+ // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
172
174
 
173
175
  // 加载列方案
174
176
  (0, _react.useEffect)(function () {
@@ -178,7 +180,6 @@ function AgGridPlus(props) {
178
180
  state: gridPlusColumnState[gridKey],
179
181
  applyOrder: true
180
182
  });
181
- apiRef.current.setGridOption("columnDefs", gridPlusColumnState[gridKey]);
182
183
  }
183
184
  }, [gridPlusColumnState, apiRef.current]);
184
185
  (0, _react.useEffect)(function () {
@@ -226,8 +227,13 @@ function AgGridPlus(props) {
226
227
  var cellMap = {};
227
228
  if ((0, _isArray2.default)(columnState)) {
228
229
  columnState.map(function (item) {
229
- if (item.cellClass) {
230
- cellMap[item.field] = item.cellClass;
230
+ if (item.cellClass || item.suppressHeaderFilterButton !== undefined) {
231
+ // 使用对象存储多个字段的值
232
+ cellMap[item.field] = {
233
+ cellClass: item.cellClass,
234
+ // 单元格默认样式类
235
+ suppressHeaderFilterButton: item.suppressHeaderFilterButton // 是否显示过滤按钮
236
+ };
231
237
  }
232
238
  });
233
239
  }
@@ -438,8 +444,14 @@ function AgGridPlus(props) {
438
444
  var colDefs = (0, _react.useMemo)(function () {
439
445
  var columnDefs = getTableColumns(rowData);
440
446
  columnDefs = columnDefs.map(function (i) {
441
- if (columnCellClass[i.field]) {
442
- i.cellClass = columnCellClass[i.field];
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
+ }
443
455
  }
444
456
  return i;
445
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
- setTimeout(function () {
230
- var falg = gridApi.applyColumnState({
231
- state: values.items,
232
- applyOrder: true
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:
@@ -160,6 +160,8 @@ function AgGridPlus(props) {
160
160
  onRequest(queryFilter);
161
161
  }
162
162
  }, [ready, JSON.stringify(gridParams), JSON.stringify(sortColumn), pagination.pageSize, pagination.current]);
163
+ // 测试列数据
164
+ // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
163
165
 
164
166
  // 加载列方案
165
167
  useEffect(function () {
@@ -169,7 +171,6 @@ function AgGridPlus(props) {
169
171
  state: gridPlusColumnState[gridKey],
170
172
  applyOrder: true
171
173
  });
172
- apiRef.current.setGridOption("columnDefs", gridPlusColumnState[gridKey]);
173
174
  }
174
175
  }, [gridPlusColumnState, apiRef.current]);
175
176
  useEffect(function () {
@@ -217,8 +218,13 @@ function AgGridPlus(props) {
217
218
  var cellMap = {};
218
219
  if (_isArray(columnState)) {
219
220
  columnState.map(function (item) {
220
- if (item.cellClass) {
221
- cellMap[item.field] = item.cellClass;
221
+ if (item.cellClass || item.suppressHeaderFilterButton !== undefined) {
222
+ // 使用对象存储多个字段的值
223
+ cellMap[item.field] = {
224
+ cellClass: item.cellClass,
225
+ // 单元格默认样式类
226
+ suppressHeaderFilterButton: item.suppressHeaderFilterButton // 是否显示过滤按钮
227
+ };
222
228
  }
223
229
  });
224
230
  }
@@ -429,8 +435,14 @@ function AgGridPlus(props) {
429
435
  var colDefs = useMemo(function () {
430
436
  var columnDefs = getTableColumns(rowData);
431
437
  columnDefs = columnDefs.map(function (i) {
432
- if (columnCellClass[i.field]) {
433
- i.cellClass = columnCellClass[i.field];
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
+ }
434
446
  }
435
447
  return i;
436
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
- setTimeout(function () {
221
- var falg = gridApi.applyColumnState({
222
- state: values.items,
223
- applyOrder: true
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: