@nokecy/qc-ui 1.1.38 → 1.1.39

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.
Files changed (121) hide show
  1. package/dist/cjs/ag-grid-plus/ag-gridPlus.js +33 -20
  2. package/dist/cjs/ag-grid-plus/context/useSchemeDataFlow.js +37 -1
  3. package/dist/cjs/ag-grid-plus/context/useSchemeManager.js +120 -79
  4. package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js +52 -36
  5. package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js +14 -3
  6. package/dist/cjs/array-table/arrayAddBtn.js +26 -17
  7. package/dist/cjs/array-table/hooks.d.ts +2 -1
  8. package/dist/cjs/array-table/hooks.js +23 -43
  9. package/dist/cjs/array-table/index.js +105 -25
  10. package/dist/cjs/array-table/preview.js +1 -1
  11. package/dist/cjs/array-table/readOnlyFormatters.d.ts +28 -0
  12. package/dist/cjs/array-table/readOnlyFormatters.js +113 -0
  13. package/dist/cjs/array-table/utils.d.ts +2 -2
  14. package/dist/cjs/array-table/utils.js +162 -11
  15. package/dist/cjs/editable/index.js +3 -1
  16. package/dist/cjs/formDesigner/FormDesigner.js +3 -2
  17. package/dist/cjs/formDesigner/preWidgets/index.d.ts +1 -10
  18. package/dist/cjs/formDesigner/preWidgets/index.js +1 -100
  19. package/dist/cjs/formDesigner/preWidgets/preDefineProperty.d.ts +11 -0
  20. package/dist/cjs/formDesigner/preWidgets/preDefineProperty.js +70 -0
  21. package/dist/esm/ag-grid-plus/ag-gridPlus.js +33 -20
  22. package/dist/esm/ag-grid-plus/context/useSchemeDataFlow.js +37 -1
  23. package/dist/esm/ag-grid-plus/context/useSchemeManager.js +120 -79
  24. package/dist/esm/ag-grid-plus/setting/ColumnSetting.js +52 -36
  25. package/dist/esm/ag-grid-plus/setting/columnGroupUtils.js +13 -0
  26. package/dist/esm/array-table/arrayAddBtn.js +26 -17
  27. package/dist/esm/array-table/hooks.d.ts +2 -1
  28. package/dist/esm/array-table/hooks.js +23 -43
  29. package/dist/esm/array-table/index.js +107 -27
  30. package/dist/esm/array-table/preview.js +2 -2
  31. package/dist/esm/array-table/readOnlyFormatters.d.ts +28 -0
  32. package/dist/esm/array-table/readOnlyFormatters.js +107 -0
  33. package/dist/esm/array-table/utils.d.ts +2 -2
  34. package/dist/esm/array-table/utils.js +162 -11
  35. package/dist/esm/editable/index.js +3 -1
  36. package/dist/esm/formDesigner/FormDesigner.js +3 -2
  37. package/dist/esm/formDesigner/preWidgets/index.d.ts +1 -10
  38. package/dist/esm/formDesigner/preWidgets/index.js +1 -10
  39. package/dist/esm/formDesigner/preWidgets/preDefineProperty.d.ts +11 -0
  40. package/dist/esm/formDesigner/preWidgets/{preDefineProperty1/preview.js → preDefineProperty.js} +49 -30
  41. package/dist/umd/qc-ui.min.js +1 -1
  42. package/package.json +1 -1
  43. package/dist/cjs/formDesigner/preWidgets/preDefineProperty1/index.d.ts +0 -1
  44. package/dist/cjs/formDesigner/preWidgets/preDefineProperty1/index.js +0 -16
  45. package/dist/cjs/formDesigner/preWidgets/preDefineProperty1/preview.d.ts +0 -5
  46. package/dist/cjs/formDesigner/preWidgets/preDefineProperty1/preview.js +0 -51
  47. package/dist/cjs/formDesigner/preWidgets/preDefineProperty10/index.d.ts +0 -1
  48. package/dist/cjs/formDesigner/preWidgets/preDefineProperty10/index.js +0 -16
  49. package/dist/cjs/formDesigner/preWidgets/preDefineProperty10/preview.d.ts +0 -5
  50. package/dist/cjs/formDesigner/preWidgets/preDefineProperty10/preview.js +0 -50
  51. package/dist/cjs/formDesigner/preWidgets/preDefineProperty2/index.d.ts +0 -1
  52. package/dist/cjs/formDesigner/preWidgets/preDefineProperty2/index.js +0 -16
  53. package/dist/cjs/formDesigner/preWidgets/preDefineProperty2/preview.d.ts +0 -5
  54. package/dist/cjs/formDesigner/preWidgets/preDefineProperty2/preview.js +0 -50
  55. package/dist/cjs/formDesigner/preWidgets/preDefineProperty3/index.d.ts +0 -1
  56. package/dist/cjs/formDesigner/preWidgets/preDefineProperty3/index.js +0 -16
  57. package/dist/cjs/formDesigner/preWidgets/preDefineProperty3/preview.d.ts +0 -5
  58. package/dist/cjs/formDesigner/preWidgets/preDefineProperty3/preview.js +0 -50
  59. package/dist/cjs/formDesigner/preWidgets/preDefineProperty4/index.d.ts +0 -1
  60. package/dist/cjs/formDesigner/preWidgets/preDefineProperty4/index.js +0 -16
  61. package/dist/cjs/formDesigner/preWidgets/preDefineProperty4/preview.d.ts +0 -5
  62. package/dist/cjs/formDesigner/preWidgets/preDefineProperty4/preview.js +0 -50
  63. package/dist/cjs/formDesigner/preWidgets/preDefineProperty5/index.d.ts +0 -1
  64. package/dist/cjs/formDesigner/preWidgets/preDefineProperty5/index.js +0 -16
  65. package/dist/cjs/formDesigner/preWidgets/preDefineProperty5/preview.d.ts +0 -5
  66. package/dist/cjs/formDesigner/preWidgets/preDefineProperty5/preview.js +0 -50
  67. package/dist/cjs/formDesigner/preWidgets/preDefineProperty6/index.d.ts +0 -1
  68. package/dist/cjs/formDesigner/preWidgets/preDefineProperty6/index.js +0 -16
  69. package/dist/cjs/formDesigner/preWidgets/preDefineProperty6/preview.d.ts +0 -5
  70. package/dist/cjs/formDesigner/preWidgets/preDefineProperty6/preview.js +0 -50
  71. package/dist/cjs/formDesigner/preWidgets/preDefineProperty7/index.d.ts +0 -1
  72. package/dist/cjs/formDesigner/preWidgets/preDefineProperty7/index.js +0 -16
  73. package/dist/cjs/formDesigner/preWidgets/preDefineProperty7/preview.d.ts +0 -5
  74. package/dist/cjs/formDesigner/preWidgets/preDefineProperty7/preview.js +0 -50
  75. package/dist/cjs/formDesigner/preWidgets/preDefineProperty8/index.d.ts +0 -1
  76. package/dist/cjs/formDesigner/preWidgets/preDefineProperty8/index.js +0 -16
  77. package/dist/cjs/formDesigner/preWidgets/preDefineProperty8/preview.d.ts +0 -5
  78. package/dist/cjs/formDesigner/preWidgets/preDefineProperty8/preview.js +0 -50
  79. package/dist/cjs/formDesigner/preWidgets/preDefineProperty9/index.d.ts +0 -1
  80. package/dist/cjs/formDesigner/preWidgets/preDefineProperty9/index.js +0 -16
  81. package/dist/cjs/formDesigner/preWidgets/preDefineProperty9/preview.d.ts +0 -5
  82. package/dist/cjs/formDesigner/preWidgets/preDefineProperty9/preview.js +0 -50
  83. package/dist/esm/formDesigner/preWidgets/preDefineProperty1/index.d.ts +0 -1
  84. package/dist/esm/formDesigner/preWidgets/preDefineProperty1/index.js +0 -1
  85. package/dist/esm/formDesigner/preWidgets/preDefineProperty1/preview.d.ts +0 -5
  86. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/index.d.ts +0 -1
  87. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/index.js +0 -1
  88. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/preview.d.ts +0 -5
  89. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/preview.js +0 -43
  90. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/index.d.ts +0 -1
  91. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/index.js +0 -1
  92. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/preview.d.ts +0 -5
  93. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/preview.js +0 -43
  94. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/index.d.ts +0 -1
  95. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/index.js +0 -1
  96. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/preview.d.ts +0 -5
  97. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/preview.js +0 -43
  98. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/index.d.ts +0 -1
  99. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/index.js +0 -1
  100. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/preview.d.ts +0 -5
  101. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/preview.js +0 -43
  102. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/index.d.ts +0 -1
  103. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/index.js +0 -1
  104. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/preview.d.ts +0 -5
  105. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/preview.js +0 -43
  106. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/index.d.ts +0 -1
  107. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/index.js +0 -1
  108. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/preview.d.ts +0 -5
  109. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/preview.js +0 -43
  110. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/index.d.ts +0 -1
  111. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/index.js +0 -1
  112. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/preview.d.ts +0 -5
  113. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/preview.js +0 -43
  114. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/index.d.ts +0 -1
  115. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/index.js +0 -1
  116. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/preview.d.ts +0 -5
  117. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/preview.js +0 -43
  118. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/index.d.ts +0 -1
  119. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/index.js +0 -1
  120. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/preview.d.ts +0 -5
  121. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/preview.js +0 -43
@@ -18,6 +18,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
18
18
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
19
19
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
20
  import { useContext, useEffect, useState, useCallback, useRef } from 'react';
21
+ import { logger } from "../utils/logger";
21
22
  import { GridPlusContext } from "./gridContext";
22
23
  import { message } from 'antd';
23
24
 
@@ -98,34 +99,39 @@ export function useSchemeManager(config) {
98
99
  loadingRef.current = true;
99
100
  setLoading(true);
100
101
  _context.prev = 4;
101
- _context.next = 7;
102
+ logger.debug('[useSchemeManager] 开始加载所有方案数据');
103
+ _context.next = 8;
102
104
  return adapter.loadAllSchemes();
103
- case 7:
105
+ case 8:
104
106
  data = _context.sent;
105
107
  setColumnSchemes(data.columnSchemes || {});
106
108
  setQuerySchemes(data.querySchemes || {});
107
109
  setCurrentSchemes(data.currentSchemes || {});
108
110
  setLastSyncTime(data.syncTime);
109
111
  loadedRef.current = true;
110
- _context.next = 19;
112
+ logger.debug('[useSchemeManager] 加载完成', {
113
+ columnSchemes: Object.keys(data.columnSchemes || {}).length,
114
+ querySchemes: Object.keys(data.querySchemes || {}).length
115
+ });
116
+ _context.next = 21;
111
117
  break;
112
- case 15:
113
- _context.prev = 15;
118
+ case 17:
119
+ _context.prev = 17;
114
120
  _context.t0 = _context["catch"](4);
115
121
  console.error('[useSchemeManager] 加载失败:', _context.t0);
116
122
  if (showErrorMessage) {
117
123
  message.error('加载方案失败');
118
124
  }
119
- case 19:
120
- _context.prev = 19;
125
+ case 21:
126
+ _context.prev = 21;
121
127
  setLoading(false);
122
128
  loadingRef.current = false;
123
- return _context.finish(19);
124
- case 23:
129
+ return _context.finish(21);
130
+ case 25:
125
131
  case "end":
126
132
  return _context.stop();
127
133
  }
128
- }, _callee, null, [[4, 15, 19, 23]]);
134
+ }, _callee, null, [[4, 17, 21, 25]]);
129
135
  })), [adapter, showErrorMessage]);
130
136
 
131
137
  // 组件 mount 时自动加载
@@ -140,6 +146,10 @@ export function useSchemeManager(config) {
140
146
  useEffect(function () {
141
147
  // 只有在用户ID实际变化且已经加载过数据时才重新加载
142
148
  if (currentUserId !== prevUserIdRef.current && loadedRef.current) {
149
+ logger.debug('[useSchemeManager] 用户切换,重新加载方案', {
150
+ from: prevUserIdRef.current,
151
+ to: currentUserId
152
+ });
143
153
  prevUserIdRef.current = currentUserId;
144
154
  loadedRef.current = false;
145
155
  loadAllSchemes();
@@ -157,9 +167,12 @@ export function useSchemeManager(config) {
157
167
  while (1) switch (_context2.prev = _context2.next) {
158
168
  case 0:
159
169
  _context2.prev = 0;
160
- _context2.next = 3;
170
+ logger.debug("[useSchemeManager] \u4FDD\u5B58\u5217\u65B9\u6848: ".concat(gridId, " - ").concat(scheme.name));
171
+
172
+ // 调用适配器保存
173
+ _context2.next = 4;
161
174
  return adapter.saveColumnScheme(gridId, scheme);
162
- case 3:
175
+ case 4:
163
176
  savedScheme = _context2.sent;
164
177
  // 更新本地状态
165
178
  setColumnSchemes(function (prev) {
@@ -174,18 +187,19 @@ export function useSchemeManager(config) {
174
187
  }
175
188
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, schemes));
176
189
  });
177
- _context2.next = 11;
190
+ logger.debug('[useSchemeManager] 保存成功');
191
+ _context2.next = 13;
178
192
  break;
179
- case 7:
180
- _context2.prev = 7;
193
+ case 9:
194
+ _context2.prev = 9;
181
195
  _context2.t0 = _context2["catch"](0);
182
196
  console.error('[useSchemeManager] 保存列方案失败:', _context2.t0);
183
197
  throw _context2.t0;
184
- case 11:
198
+ case 13:
185
199
  case "end":
186
200
  return _context2.stop();
187
201
  }
188
- }, _callee2, null, [[0, 7]]);
202
+ }, _callee2, null, [[0, 9]]);
189
203
  }));
190
204
  return function (_x, _x2) {
191
205
  return _ref2.apply(this, arguments);
@@ -198,9 +212,12 @@ export function useSchemeManager(config) {
198
212
  while (1) switch (_context3.prev = _context3.next) {
199
213
  case 0:
200
214
  _context3.prev = 0;
201
- _context3.next = 3;
215
+ logger.debug("[useSchemeManager] \u5220\u9664\u5217\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
216
+
217
+ // 调用适配器删除
218
+ _context3.next = 4;
202
219
  return adapter.deleteColumnScheme(gridId, schemeId);
203
- case 3:
220
+ case 4:
204
221
  setColumnSchemes(function (prev) {
205
222
  var schemes = (prev[gridId] || []).filter(function (s) {
206
223
  return s.id !== schemeId;
@@ -216,8 +233,14 @@ export function useSchemeManager(config) {
216
233
  setCurrentSchemes(function (prev) {
217
234
  var _prev$gridId;
218
235
  if (((_prev$gridId = prev[gridId]) === null || _prev$gridId === void 0 ? void 0 : _prev$gridId.columnSchemeId) === schemeId) {
219
- var _defaultScheme;
236
+ var _defaultScheme, _defaultScheme2;
220
237
  var newSchemeId = ((_defaultScheme = defaultScheme) === null || _defaultScheme === void 0 ? void 0 : _defaultScheme.id) || null;
238
+ logger.debug('[useSchemeManager] 删除的是当前方案,自动切换', {
239
+ deletedSchemeId: schemeId,
240
+ defaultSchemeId: newSchemeId,
241
+ defaultSchemeName: (_defaultScheme2 = defaultScheme) === null || _defaultScheme2 === void 0 ? void 0 : _defaultScheme2.name
242
+ });
243
+
221
244
  // 如果存在默认方案,同步到适配器
222
245
  if (newSchemeId) {
223
246
  var _prev$gridId2;
@@ -239,18 +262,19 @@ export function useSchemeManager(config) {
239
262
  }
240
263
  return prev;
241
264
  });
242
- _context3.next = 11;
265
+ logger.debug('[useSchemeManager] 删除成功');
266
+ _context3.next = 13;
243
267
  break;
244
- case 7:
245
- _context3.prev = 7;
268
+ case 9:
269
+ _context3.prev = 9;
246
270
  _context3.t0 = _context3["catch"](0);
247
271
  console.error('[useSchemeManager] 删除列方案失败:', _context3.t0);
248
272
  throw _context3.t0;
249
- case 11:
273
+ case 13:
250
274
  case "end":
251
275
  return _context3.stop();
252
276
  }
253
- }, _callee3, null, [[0, 7]]);
277
+ }, _callee3, null, [[0, 9]]);
254
278
  }));
255
279
  return function (_x3, _x4) {
256
280
  return _ref3.apply(this, arguments);
@@ -263,29 +287,32 @@ export function useSchemeManager(config) {
263
287
  while (1) switch (_context4.prev = _context4.next) {
264
288
  case 0:
265
289
  _context4.prev = 0;
290
+ logger.debug("[useSchemeManager] \u8BBE\u7F6E\u5F53\u524D\u5217\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
291
+
266
292
  // 获取当前的查询方案ID
267
293
  querySchemeId = ((_currentSchemes$gridI = currentSchemes[gridId]) === null || _currentSchemes$gridI === void 0 ? void 0 : _currentSchemes$gridI.querySchemeId) || null; // 调用适配器设置
268
- _context4.next = 4;
294
+ _context4.next = 5;
269
295
  return adapter.setCurrentScheme(gridId, schemeId, querySchemeId);
270
- case 4:
296
+ case 5:
271
297
  // 更新本地状态
272
298
  setCurrentSchemes(function (prev) {
273
299
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, _objectSpread(_objectSpread({}, prev[gridId] || {}), {}, {
274
300
  columnSchemeId: schemeId
275
301
  })));
276
302
  });
277
- _context4.next = 11;
303
+ logger.debug('[useSchemeManager] 设置成功');
304
+ _context4.next = 13;
278
305
  break;
279
- case 7:
280
- _context4.prev = 7;
306
+ case 9:
307
+ _context4.prev = 9;
281
308
  _context4.t0 = _context4["catch"](0);
282
309
  console.error('[useSchemeManager] 设置当前列方案失败:', _context4.t0);
283
310
  throw _context4.t0;
284
- case 11:
311
+ case 13:
285
312
  case "end":
286
313
  return _context4.stop();
287
314
  }
288
- }, _callee4, null, [[0, 7]]);
315
+ }, _callee4, null, [[0, 9]]);
289
316
  }));
290
317
  return function (_x5, _x6) {
291
318
  return _ref4.apply(this, arguments);
@@ -301,9 +328,12 @@ export function useSchemeManager(config) {
301
328
  while (1) switch (_context5.prev = _context5.next) {
302
329
  case 0:
303
330
  _context5.prev = 0;
304
- _context5.next = 3;
331
+ logger.debug("[useSchemeManager] \u4FDD\u5B58\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(scheme.name));
332
+
333
+ // 调用适配器保存
334
+ _context5.next = 4;
305
335
  return adapter.saveQueryScheme(gridId, scheme);
306
- case 3:
336
+ case 4:
307
337
  savedScheme = _context5.sent;
308
338
  // 更新本地状态
309
339
  setQuerySchemes(function (prev) {
@@ -318,18 +348,19 @@ export function useSchemeManager(config) {
318
348
  }
319
349
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, schemes));
320
350
  });
321
- _context5.next = 11;
351
+ logger.debug('[useSchemeManager] 保存成功');
352
+ _context5.next = 13;
322
353
  break;
323
- case 7:
324
- _context5.prev = 7;
354
+ case 9:
355
+ _context5.prev = 9;
325
356
  _context5.t0 = _context5["catch"](0);
326
357
  console.error('[useSchemeManager] 保存查询方案失败:', _context5.t0);
327
358
  throw _context5.t0;
328
- case 11:
359
+ case 13:
329
360
  case "end":
330
361
  return _context5.stop();
331
362
  }
332
- }, _callee5, null, [[0, 7]]);
363
+ }, _callee5, null, [[0, 9]]);
333
364
  }));
334
365
  return function (_x7, _x8) {
335
366
  return _ref5.apply(this, arguments);
@@ -341,9 +372,12 @@ export function useSchemeManager(config) {
341
372
  while (1) switch (_context6.prev = _context6.next) {
342
373
  case 0:
343
374
  _context6.prev = 0;
344
- _context6.next = 3;
375
+ logger.debug("[useSchemeManager] \u5220\u9664\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
376
+
377
+ // 调用适配器删除
378
+ _context6.next = 4;
345
379
  return adapter.deleteQueryScheme(gridId, schemeId);
346
- case 3:
380
+ case 4:
347
381
  // 更新本地状态
348
382
  setQuerySchemes(function (prev) {
349
383
  var schemes = (prev[gridId] || []).filter(function (s) {
@@ -362,18 +396,19 @@ export function useSchemeManager(config) {
362
396
  }
363
397
  return prev;
364
398
  });
365
- _context6.next = 11;
399
+ logger.debug('[useSchemeManager] 删除成功');
400
+ _context6.next = 13;
366
401
  break;
367
- case 7:
368
- _context6.prev = 7;
402
+ case 9:
403
+ _context6.prev = 9;
369
404
  _context6.t0 = _context6["catch"](0);
370
405
  console.error('[useSchemeManager] 删除查询方案失败:', _context6.t0);
371
406
  throw _context6.t0;
372
- case 11:
407
+ case 13:
373
408
  case "end":
374
409
  return _context6.stop();
375
410
  }
376
- }, _callee6, null, [[0, 7]]);
411
+ }, _callee6, null, [[0, 9]]);
377
412
  }));
378
413
  return function (_x9, _x10) {
379
414
  return _ref6.apply(this, arguments);
@@ -386,29 +421,32 @@ export function useSchemeManager(config) {
386
421
  while (1) switch (_context7.prev = _context7.next) {
387
422
  case 0:
388
423
  _context7.prev = 0;
424
+ logger.debug("[useSchemeManager] \u8BBE\u7F6E\u5F53\u524D\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
425
+
389
426
  // 获取当前的列方案ID
390
427
  columnSchemeId = ((_currentSchemes$gridI2 = currentSchemes[gridId]) === null || _currentSchemes$gridI2 === void 0 ? void 0 : _currentSchemes$gridI2.columnSchemeId) || null; // 调用适配器设置
391
- _context7.next = 4;
428
+ _context7.next = 5;
392
429
  return adapter.setCurrentScheme(gridId, columnSchemeId, schemeId);
393
- case 4:
430
+ case 5:
394
431
  // 更新本地状态
395
432
  setCurrentSchemes(function (prev) {
396
433
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, _objectSpread(_objectSpread({}, prev[gridId] || {}), {}, {
397
434
  querySchemeId: schemeId
398
435
  })));
399
436
  });
400
- _context7.next = 11;
437
+ logger.debug('[useSchemeManager] 设置成功');
438
+ _context7.next = 13;
401
439
  break;
402
- case 7:
403
- _context7.prev = 7;
440
+ case 9:
441
+ _context7.prev = 9;
404
442
  _context7.t0 = _context7["catch"](0);
405
443
  console.error('[useSchemeManager] 设置当前查询方案失败:', _context7.t0);
406
444
  throw _context7.t0;
407
- case 11:
445
+ case 13:
408
446
  case "end":
409
447
  return _context7.stop();
410
448
  }
411
- }, _callee7, null, [[0, 7]]);
449
+ }, _callee7, null, [[0, 9]]);
412
450
  }));
413
451
  return function (_x11, _x12) {
414
452
  return _ref7.apply(this, arguments);
@@ -471,26 +509,27 @@ export function useSchemeManager(config) {
471
509
  throw new Error('当前存储适配器不支持全局配置功能');
472
510
  case 5:
473
511
  _context9.prev = 5;
474
- _context9.next = 8;
512
+ logger.debug("[useSchemeManager] \u5E94\u7528\u5230\u5168\u5C40: ".concat(gridId, " - ").concat(targetSchemeId));
513
+ _context9.next = 9;
475
514
  return adapter.applyToGlobal(gridId, targetSchemeId);
476
- case 8:
515
+ case 9:
477
516
  globalSchemeId = _context9.sent;
478
517
  message.success('已应用到全局配置');
479
- _context9.next = 12;
518
+ _context9.next = 13;
480
519
  return refreshSchemes();
481
- case 12:
520
+ case 13:
482
521
  return _context9.abrupt("return", globalSchemeId);
483
- case 15:
484
- _context9.prev = 15;
522
+ case 16:
523
+ _context9.prev = 16;
485
524
  _context9.t0 = _context9["catch"](5);
486
525
  console.error('[useSchemeManager] 应用到全局失败:', _context9.t0);
487
526
  handleGlobalConfigError(_context9.t0, '应用到全局失败');
488
527
  throw _context9.t0;
489
- case 20:
528
+ case 21:
490
529
  case "end":
491
530
  return _context9.stop();
492
531
  }
493
- }, _callee9, null, [[5, 15]]);
532
+ }, _callee9, null, [[5, 16]]);
494
533
  }));
495
534
  return function (_x13, _x14) {
496
535
  return _ref9.apply(this, arguments);
@@ -513,31 +552,32 @@ export function useSchemeManager(config) {
513
552
  throw new Error('当前存储适配器不支持全局配置功能');
514
553
  case 2:
515
554
  _context10.prev = 2;
516
- _context10.next = 5;
555
+ logger.debug("[useSchemeManager] \u91CD\u7F6E\u4E3A\u5168\u5C40\u914D\u7F6E: ".concat(gridId));
556
+ _context10.next = 6;
517
557
  return adapter.resetToGlobal(gridId);
518
- case 5:
558
+ case 6:
519
559
  setCurrentSchemes(function (prev) {
520
560
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, _objectSpread(_objectSpread({}, prev[gridId]), {}, {
521
561
  columnSchemeId: null
522
562
  })));
523
563
  });
524
- _context10.next = 8;
564
+ _context10.next = 9;
525
565
  return refreshSchemes();
526
- case 8:
566
+ case 9:
527
567
  message.success('已重置为全局配置');
528
- _context10.next = 16;
568
+ _context10.next = 17;
529
569
  break;
530
- case 11:
531
- _context10.prev = 11;
570
+ case 12:
571
+ _context10.prev = 12;
532
572
  _context10.t0 = _context10["catch"](2);
533
573
  console.error('[useSchemeManager] 重置为全局配置失败:', _context10.t0);
534
574
  handleGlobalConfigError(_context10.t0, '重置失败');
535
575
  throw _context10.t0;
536
- case 16:
576
+ case 17:
537
577
  case "end":
538
578
  return _context10.stop();
539
579
  }
540
- }, _callee10, null, [[2, 11]]);
580
+ }, _callee10, null, [[2, 12]]);
541
581
  }));
542
582
  return function (_x15) {
543
583
  return _ref10.apply(this, arguments);
@@ -560,26 +600,27 @@ export function useSchemeManager(config) {
560
600
  throw new Error('当前存储适配器不支持全局配置功能');
561
601
  case 2:
562
602
  _context11.prev = 2;
563
- _context11.next = 5;
603
+ logger.debug("[useSchemeManager] \u91CD\u7F6E\u6240\u6709\u7528\u6237\u914D\u7F6E: ".concat(gridId));
604
+ _context11.next = 6;
564
605
  return adapter.resetAllUsers(gridId);
565
- case 5:
566
- _context11.next = 7;
606
+ case 6:
607
+ _context11.next = 8;
567
608
  return refreshSchemes();
568
- case 7:
609
+ case 8:
569
610
  message.success('已重置所有用户配置');
570
- _context11.next = 15;
611
+ _context11.next = 16;
571
612
  break;
572
- case 10:
573
- _context11.prev = 10;
613
+ case 11:
614
+ _context11.prev = 11;
574
615
  _context11.t0 = _context11["catch"](2);
575
616
  console.error('[useSchemeManager] 重置所有用户配置失败:', _context11.t0);
576
617
  handleGlobalConfigError(_context11.t0, '重置失败');
577
618
  throw _context11.t0;
578
- case 15:
619
+ case 16:
579
620
  case "end":
580
621
  return _context11.stop();
581
622
  }
582
- }, _callee11, null, [[2, 10]]);
623
+ }, _callee11, null, [[2, 11]]);
583
624
  }));
584
625
  return function (_x16) {
585
626
  return _ref11.apply(this, arguments);
@@ -24,6 +24,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
24
24
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
25
25
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
26
26
  import React, { useState, useCallback, useMemo, useEffect } from 'react';
27
+ import { logger } from "../utils/logger";
27
28
  import { Modal, Tabs, Space, Button, Input, message, Popconfirm, Tag, Tooltip, Empty } from 'antd';
28
29
  import { SaveOutlined, ReloadOutlined, EditOutlined, DeleteOutlined, StarOutlined, StarFilled, SearchOutlined,
29
30
  // 全局配置相关图标
@@ -279,6 +280,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
279
280
  // 从根级别开始查找新增列
280
281
  findNewColumns(originalDefs, 0);
281
282
  if (newItems.length > 0) {
283
+ logger.debug('[getColumnData] 检测到新增列/分组,已追加到末尾:', newItems.map(function (i) {
284
+ return i.field || i.groupId;
285
+ }));
282
286
  return [].concat(_toConsumableArray(config), newItems);
283
287
  }
284
288
  return config;
@@ -423,19 +427,20 @@ var ColumnSetting = function ColumnSetting(_ref) {
423
427
  return s.id === schemeId;
424
428
  });
425
429
  if (!(scheme && gridApi)) {
426
- _context.next = 12;
430
+ _context.next = 13;
427
431
  break;
428
432
  }
429
433
  // 【关键修复】先更新 columnDefs(处理分组结构),使用 allColDefs 保留自定义属性
430
434
  gridColumnDefs = flatConfigToGridState(scheme.columnConfig, allColDefs);
435
+ logger.debug('[ColumnSetting] 加载方案 - 更新 columnDefs');
431
436
  gridApi.setGridOption('columnDefs', gridColumnDefs);
432
437
 
433
438
  // 等待 columnDefs 更新完成
434
- _context.next = 9;
439
+ _context.next = 10;
435
440
  return new Promise(function (resolve) {
436
441
  return setTimeout(resolve, 100);
437
442
  });
438
- case 9:
443
+ case 10:
439
444
  // 【修复】然后应用列状态(宽度、隐藏、顺序等)
440
445
  columnState = flatConfigToColumnState(scheme.columnConfig);
441
446
  gridApi.applyColumnState({
@@ -447,7 +452,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
447
452
  if (scheme.filterModel) {
448
453
  gridApi.setFilterModel(scheme.filterModel);
449
454
  }
450
- case 12:
455
+ case 13:
451
456
  message.success('方案已加载');
452
457
 
453
458
  // 等待Grid状态更新后再刷新表单
@@ -462,17 +467,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
462
467
 
463
468
  // 自动关闭弹窗,让用户看到Grid的变化
464
469
  onClose();
465
- _context.next = 20;
470
+ _context.next = 21;
466
471
  break;
467
- case 17:
468
- _context.prev = 17;
472
+ case 18:
473
+ _context.prev = 18;
469
474
  _context.t0 = _context["catch"](0);
470
475
  message.error(_context.t0.message || '加载方案失败');
471
- case 20:
476
+ case 21:
472
477
  case "end":
473
478
  return _context.stop();
474
479
  }
475
- }, _callee, null, [[0, 17]]);
480
+ }, _callee, null, [[0, 18]]);
476
481
  }));
477
482
  return function (_x) {
478
483
  return _ref2.apply(this, arguments);
@@ -590,15 +595,24 @@ var ColumnSetting = function ColumnSetting(_ref) {
590
595
  return setTimeout(resolve, 100);
591
596
  });
592
597
  case 39:
598
+ // 【关键修复】直接应用方案到 Grid,不通过 handleLoadScheme
599
+ // 这样可以避免依赖 Context 状态更新的时序问题
600
+ logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
601
+
602
+ // 【修复】始终更新 columnDefs,确保 cellClass 等属性能即时生效
603
+ // 原逻辑只在有分组时才更新 columnDefs,导致对齐方式保存后无法即时生效
604
+ logger.debug('[ColumnSetting] 更新 columnDefs');
593
605
  gridColumnDefs = flatConfigToGridState(savedScheme.columnConfig, allColDefs);
594
606
  gridApi.setGridOption('columnDefs', gridColumnDefs);
595
607
 
596
608
  // 等待 columnDefs 更新完成
597
- _context2.next = 43;
609
+ _context2.next = 45;
598
610
  return new Promise(function (resolve) {
599
611
  return setTimeout(resolve, 100);
600
612
  });
601
- case 43:
613
+ case 45:
614
+ // 2. 应用列状态(列顺序、宽度、隐藏、固定等)
615
+ logger.debug('[ColumnSetting] 应用列状态');
602
616
  columnState = flatConfigToColumnState(savedScheme.columnConfig);
603
617
  gridApi.applyColumnState({
604
618
  state: columnState,
@@ -607,36 +621,37 @@ var ColumnSetting = function ColumnSetting(_ref) {
607
621
 
608
622
  // 3. 应用过滤器
609
623
  if (savedScheme.filterModel) {
624
+ logger.debug('[ColumnSetting] 应用 filterModel');
610
625
  gridApi.setFilterModel(savedScheme.filterModel);
611
626
  }
612
627
 
613
628
  // 4. 设置为当前方案(如果不是当前方案)
614
629
  if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
615
- _context2.next = 49;
630
+ _context2.next = 52;
616
631
  break;
617
632
  }
618
- _context2.next = 49;
633
+ _context2.next = 52;
619
634
  return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
620
- case 49:
621
- _context2.next = 51;
635
+ case 52:
636
+ _context2.next = 54;
622
637
  return new Promise(function (resolve) {
623
638
  return setTimeout(resolve, 50);
624
639
  });
625
- case 51:
640
+ case 54:
626
641
  // 5. 关闭弹窗
627
642
  onClose();
628
- _context2.next = 58;
643
+ _context2.next = 61;
629
644
  break;
630
- case 54:
631
- _context2.prev = 54;
645
+ case 57:
646
+ _context2.prev = 57;
632
647
  _context2.t0 = _context2["catch"](8);
633
648
  console.error('保存列配置到方案失败:', _context2.t0);
634
649
  message.error('保存列配置失败');
635
- case 58:
650
+ case 61:
636
651
  case "end":
637
652
  return _context2.stop();
638
653
  }
639
- }, _callee2, null, [[8, 54]]);
654
+ }, _callee2, null, [[8, 57]]);
640
655
  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
641
656
 
642
657
  // 保存为新方案
@@ -654,21 +669,22 @@ var ColumnSetting = function ColumnSetting(_ref) {
654
669
  case 3:
655
670
  _context3.prev = 3;
656
671
  if (!(activeTab === 'columns' && form)) {
657
- _context3.next = 17;
672
+ _context3.next = 18;
658
673
  break;
659
674
  }
660
675
  values = form.values;
661
676
  columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
662
677
  // 【修复】传入 allColDefs 以保留自定义属性(cellRenderer 等)
663
678
  gridColumnDefs = flatConfigToGridState(values.items, allColDefs); // 【关键修复】先更新 columnDefs(处理分组结构变化)
679
+ logger.debug('[ColumnSetting] 另存为方案 - 更新 columnDefs');
664
680
  gridApi.setGridOption('columnDefs', gridColumnDefs);
665
681
 
666
682
  // 等待 columnDefs 更新完成
667
- _context3.next = 11;
683
+ _context3.next = 12;
668
684
  return new Promise(function (resolve) {
669
685
  return setTimeout(resolve, 100);
670
686
  });
671
- case 11:
687
+ case 12:
672
688
  // 【修复】然后应用列状态(宽度、隐藏、顺序等)
673
689
  columnState = flatConfigToColumnState(values.items);
674
690
  gridApi.applyColumnState({
@@ -677,18 +693,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
677
693
  });
678
694
 
679
695
  // 等待状态更新
680
- _context3.next = 15;
696
+ _context3.next = 16;
681
697
  return new Promise(function (resolve) {
682
698
  return setTimeout(resolve, 50);
683
699
  });
684
- case 15:
685
- _context3.next = 19;
700
+ case 16:
701
+ _context3.next = 20;
686
702
  break;
687
- case 17:
703
+ case 18:
688
704
  // 如果在"方案管理"标签页,使用当前表单数据
689
705
  _values = form === null || form === void 0 ? void 0 : form.values;
690
706
  columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
691
- case 19:
707
+ case 20:
692
708
  // 获取过滤器模型
693
709
  filterModel = gridApi.getFilterModel();
694
710
  newScheme = {
@@ -701,9 +717,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
701
717
  isSystem: false
702
718
  // createdAt 和 updatedAt 由存储适配器自动生成
703
719
  };
704
- _context3.next = 23;
720
+ _context3.next = 24;
705
721
  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
706
- case 23:
722
+ case 24:
707
723
  message.success('方案保存成功');
708
724
  setSaveSchemeVisible(false);
709
725
  setSchemeName('');
@@ -711,17 +727,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
711
727
 
712
728
  // 切换到方案管理标签页,显示新创建的方案
713
729
  setActiveTab('schemes');
714
- _context3.next = 33;
730
+ _context3.next = 34;
715
731
  break;
716
- case 30:
717
- _context3.prev = 30;
732
+ case 31:
733
+ _context3.prev = 31;
718
734
  _context3.t0 = _context3["catch"](3);
719
735
  message.error(_context3.t0.message || '保存方案失败');
720
- case 33:
736
+ case 34:
721
737
  case "end":
722
738
  return _context3.stop();
723
739
  }
724
- }, _callee3, null, [[3, 30]]);
740
+ }, _callee3, null, [[3, 31]]);
725
741
  })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
726
742
 
727
743
  // 设置默认方案