@nokecy/qc-ui 1.0.98 → 1.1.0
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/dist/cjs/ConfirmPro/index.js +1 -1
- package/dist/cjs/ag-grid-plus/ag-gridPlus.js +2 -22
- package/dist/cjs/ag-grid-plus/context/useSchemeDataFlow.js +2 -14
- package/dist/cjs/ag-grid-plus/context/useSchemeManager.js +52 -84
- package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js +27 -30
- package/dist/cjs/ag-grid-plus/shared/storage/backendApiAdapter.js +90 -30
- package/dist/cjs/ag-grid-plus/shared/storage/localStorageAdapter.js +0 -2
- package/dist/cjs/ag-grid-plus/utils/logger.js +1 -2
- package/dist/cjs/array-table/index.js +1 -18
- package/dist/cjs/components/RegexEditor/visualizer/astToRailroad.js +1 -7
- package/dist/cjs/dashboard/dashboard/index.js +0 -1
- package/dist/cjs/dashboard/widget/selector/index.js +0 -3
- package/dist/cjs/deleteConfirm/index.js +1 -1
- package/dist/cjs/formDesigner/FormDesigner.js +1 -3
- package/dist/cjs/formDesigner/widgets/SchemaEditorWidget.js +0 -1
- package/dist/cjs/generatedListPage/PerformanceMonitor.js +0 -3
- package/dist/cjs/generatedListPage/RequestManager.js +9 -11
- package/dist/cjs/standardFormDialog/PortalManager.js +2 -10
- package/dist/cjs/standardFormDialog/withStandardForm.js +0 -2
- package/dist/cjs/toolBar/index.js +1 -1
- package/dist/esm/ConfirmPro/index.js +1 -1
- package/dist/esm/ag-grid-plus/ag-gridPlus.js +2 -22
- package/dist/esm/ag-grid-plus/context/useSchemeDataFlow.js +2 -14
- package/dist/esm/ag-grid-plus/context/useSchemeManager.js +52 -84
- package/dist/esm/ag-grid-plus/setting/ColumnSetting.js +27 -30
- package/dist/esm/ag-grid-plus/shared/storage/backendApiAdapter.js +90 -30
- package/dist/esm/ag-grid-plus/shared/storage/localStorageAdapter.js +0 -2
- package/dist/esm/ag-grid-plus/utils/logger.js +1 -2
- package/dist/esm/array-table/index.js +1 -18
- package/dist/esm/components/RegexEditor/visualizer/astToRailroad.js +1 -7
- package/dist/esm/dashboard/dashboard/index.js +0 -1
- package/dist/esm/dashboard/widget/selector/index.js +0 -3
- package/dist/esm/deleteConfirm/index.js +1 -1
- package/dist/esm/formDesigner/FormDesigner.js +1 -3
- package/dist/esm/formDesigner/widgets/SchemaEditorWidget.js +0 -1
- package/dist/esm/generatedListPage/PerformanceMonitor.js +0 -3
- package/dist/esm/generatedListPage/RequestManager.js +9 -11
- package/dist/esm/standardFormDialog/PortalManager.js +2 -10
- package/dist/esm/standardFormDialog/withStandardForm.js +0 -2
- package/dist/esm/toolBar/index.js +1 -1
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +2 -1
|
@@ -322,13 +322,6 @@ function AgGridPlus(props) {
|
|
|
322
322
|
* 4. 使用 Promise 链和 requestAnimationFrame 解决竞态条件
|
|
323
323
|
*/
|
|
324
324
|
(0, _react.useEffect)(function () {
|
|
325
|
-
console.log('[AgGridPlus] 方案应用 useEffect 触发:', {
|
|
326
|
-
hasGridKey: !!gridKey,
|
|
327
|
-
hasApiRef: !!apiRef.current,
|
|
328
|
-
hasDerivedColumnState: !!derivedColumnState,
|
|
329
|
-
derivedColumnStateLength: derivedColumnState === null || derivedColumnState === void 0 ? void 0 : derivedColumnState.length,
|
|
330
|
-
currentSchemeId: currentColumnScheme === null || currentColumnScheme === void 0 ? void 0 : currentColumnScheme.id
|
|
331
|
-
});
|
|
332
325
|
if (!gridKey || !apiRef.current) return;
|
|
333
326
|
|
|
334
327
|
// 使用 Promise 链确保顺序执行,避免竞态条件
|
|
@@ -338,17 +331,11 @@ function AgGridPlus(props) {
|
|
|
338
331
|
|
|
339
332
|
// 1. 应用派生的列状态(使用 applyColumnState API)
|
|
340
333
|
if (derivedColumnState && derivedColumnState.length > 0) {
|
|
341
|
-
console.log('[AgGridPlus] 正在应用 derivedColumnState:', {
|
|
342
|
-
length: derivedColumnState.length,
|
|
343
|
-
firstState: derivedColumnState[0]
|
|
344
|
-
});
|
|
345
|
-
|
|
346
334
|
// 使用 applyColumnState 而不是 setGridOption("columnDefs")
|
|
347
335
|
apiRef.current.applyColumnState({
|
|
348
336
|
state: derivedColumnState,
|
|
349
337
|
applyOrder: true // 应用列顺序
|
|
350
338
|
});
|
|
351
|
-
console.log('[AgGridPlus] derivedColumnState 已应用');
|
|
352
339
|
}
|
|
353
340
|
|
|
354
341
|
// 2. 应用派生的列样式
|
|
@@ -374,9 +361,7 @@ function AgGridPlus(props) {
|
|
|
374
361
|
|
|
375
362
|
// 3. 应用过滤器(在列状态稳定后执行)
|
|
376
363
|
if (currentColumnScheme !== null && currentColumnScheme !== void 0 && currentColumnScheme.filterModel) {
|
|
377
|
-
console.log('[AgGridPlus] 正在应用 filterModel');
|
|
378
364
|
apiRef.current.setFilterModel(currentColumnScheme.filterModel);
|
|
379
|
-
console.log('[AgGridPlus] filterModel 已应用');
|
|
380
365
|
}
|
|
381
366
|
}).catch(function (error) {
|
|
382
367
|
if (!cancelled) {
|
|
@@ -389,7 +374,8 @@ function AgGridPlus(props) {
|
|
|
389
374
|
return function () {
|
|
390
375
|
cancelled = true;
|
|
391
376
|
};
|
|
392
|
-
}, [gridKey, currentColumnScheme === null || currentColumnScheme === void 0 ? void 0 : currentColumnScheme.id, derivedColumnState
|
|
377
|
+
}, [gridKey, currentColumnScheme === null || currentColumnScheme === void 0 ? void 0 : currentColumnScheme.id, derivedColumnState, ready // 添加 ready 依赖,确保 Grid 初始化完成后再应用方案
|
|
378
|
+
]);
|
|
393
379
|
(0, _react.useEffect)(function () {
|
|
394
380
|
setRowData(dataSource || propRowData || []);
|
|
395
381
|
}, [dataSource, propRowData]);
|
|
@@ -613,12 +599,6 @@ function AgGridPlus(props) {
|
|
|
613
599
|
}, [propsRowSelection, enableClickSelection]);
|
|
614
600
|
var onGridReady = (0, _react.useCallback)(function (params) {
|
|
615
601
|
var _apiRef$current;
|
|
616
|
-
console.log('[AgGridPlus] onGridReady 被调用:', {
|
|
617
|
-
hasCurrentScheme: !!currentColumnScheme,
|
|
618
|
-
currentSchemeId: currentColumnScheme === null || currentColumnScheme === void 0 ? void 0 : currentColumnScheme.id,
|
|
619
|
-
currentSchemeName: currentColumnScheme === null || currentColumnScheme === void 0 ? void 0 : currentColumnScheme.name,
|
|
620
|
-
hasColumnConfig: !!(currentColumnScheme !== null && currentColumnScheme !== void 0 && currentColumnScheme.columnConfig)
|
|
621
|
-
});
|
|
622
602
|
apiRef.current = params.api;
|
|
623
603
|
onReady && onReady(params);
|
|
624
604
|
///@ts-ignore
|
|
@@ -77,28 +77,15 @@ function useSchemeSource(gridKey, schemeData) {
|
|
|
77
77
|
*/
|
|
78
78
|
function useDerivedGridState(currentScheme, allColDefs) {
|
|
79
79
|
return (0, _react.useMemo)(function () {
|
|
80
|
-
var _currentScheme$column;
|
|
81
|
-
console.log('[useDerivedGridState] 输入参数:', {
|
|
82
|
-
hasScheme: !!currentScheme,
|
|
83
|
-
schemeId: currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id,
|
|
84
|
-
configLength: currentScheme === null || currentScheme === void 0 || (_currentScheme$column = currentScheme.columnConfig) === null || _currentScheme$column === void 0 ? void 0 : _currentScheme$column.length,
|
|
85
|
-
allColDefsLength: allColDefs === null || allColDefs === void 0 ? void 0 : allColDefs.length
|
|
86
|
-
});
|
|
87
80
|
if (!(currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) || !allColDefs || allColDefs.length === 0) {
|
|
88
|
-
console.log('[useDerivedGridState] 返回 null (缺少必要数据)');
|
|
89
81
|
return null;
|
|
90
82
|
}
|
|
91
83
|
try {
|
|
92
|
-
var _result$;
|
|
93
84
|
var _require = require("../setting/columnGroupUtils"),
|
|
94
85
|
flatConfigToGridState = _require.flatConfigToGridState;
|
|
95
86
|
|
|
96
87
|
// 转换并缓存结果
|
|
97
88
|
var result = flatConfigToGridState(currentScheme.columnConfig, allColDefs);
|
|
98
|
-
console.log('[useDerivedGridState] 转换成功:', {
|
|
99
|
-
resultLength: result === null || result === void 0 ? void 0 : result.length,
|
|
100
|
-
firstColumn: result === null || result === void 0 || (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.field
|
|
101
|
-
});
|
|
102
89
|
return result;
|
|
103
90
|
} catch (error) {
|
|
104
91
|
console.error('[useDerivedGridState] 转换失败:', error);
|
|
@@ -124,7 +111,8 @@ function useDerivedColumnState(currentScheme) {
|
|
|
124
111
|
flatConfigToColumnState = _require2.flatConfigToColumnState;
|
|
125
112
|
|
|
126
113
|
// 转换列状态
|
|
127
|
-
|
|
114
|
+
var result = flatConfigToColumnState(currentScheme.columnConfig);
|
|
115
|
+
return result;
|
|
128
116
|
} catch (error) {
|
|
129
117
|
console.error('[useDerivedColumnState] 转换失败:', error);
|
|
130
118
|
return null;
|
|
@@ -104,39 +104,34 @@ function useSchemeManager(config) {
|
|
|
104
104
|
loadingRef.current = true;
|
|
105
105
|
setLoading(true);
|
|
106
106
|
_context.prev = 4;
|
|
107
|
-
|
|
108
|
-
_context.next = 8;
|
|
107
|
+
_context.next = 7;
|
|
109
108
|
return adapter.loadAllSchemes();
|
|
110
|
-
case
|
|
109
|
+
case 7:
|
|
111
110
|
data = _context.sent;
|
|
112
111
|
setColumnSchemes(data.columnSchemes || {});
|
|
113
112
|
setQuerySchemes(data.querySchemes || {});
|
|
114
113
|
setCurrentSchemes(data.currentSchemes || {});
|
|
115
114
|
setLastSyncTime(data.syncTime);
|
|
116
115
|
loadedRef.current = true;
|
|
117
|
-
|
|
118
|
-
columnSchemes: Object.keys(data.columnSchemes || {}).length,
|
|
119
|
-
querySchemes: Object.keys(data.querySchemes || {}).length
|
|
120
|
-
});
|
|
121
|
-
_context.next = 21;
|
|
116
|
+
_context.next = 19;
|
|
122
117
|
break;
|
|
123
|
-
case
|
|
124
|
-
_context.prev =
|
|
118
|
+
case 15:
|
|
119
|
+
_context.prev = 15;
|
|
125
120
|
_context.t0 = _context["catch"](4);
|
|
126
121
|
console.error('[useSchemeManager] 加载失败:', _context.t0);
|
|
127
122
|
if (showErrorMessage) {
|
|
128
123
|
_antd.message.error('加载方案失败');
|
|
129
124
|
}
|
|
130
|
-
case
|
|
131
|
-
_context.prev =
|
|
125
|
+
case 19:
|
|
126
|
+
_context.prev = 19;
|
|
132
127
|
setLoading(false);
|
|
133
128
|
loadingRef.current = false;
|
|
134
|
-
return _context.finish(
|
|
135
|
-
case
|
|
129
|
+
return _context.finish(19);
|
|
130
|
+
case 23:
|
|
136
131
|
case "end":
|
|
137
132
|
return _context.stop();
|
|
138
133
|
}
|
|
139
|
-
}, _callee, null, [[4,
|
|
134
|
+
}, _callee, null, [[4, 15, 19, 23]]);
|
|
140
135
|
})), [adapter, showErrorMessage]);
|
|
141
136
|
|
|
142
137
|
// 组件 mount 时自动加载
|
|
@@ -151,10 +146,6 @@ function useSchemeManager(config) {
|
|
|
151
146
|
(0, _react.useEffect)(function () {
|
|
152
147
|
// 只有在用户ID实际变化且已经加载过数据时才重新加载
|
|
153
148
|
if (currentUserId !== prevUserIdRef.current && loadedRef.current) {
|
|
154
|
-
console.log('[useSchemeManager] 用户切换,重新加载方案', {
|
|
155
|
-
from: prevUserIdRef.current,
|
|
156
|
-
to: currentUserId
|
|
157
|
-
});
|
|
158
149
|
prevUserIdRef.current = currentUserId;
|
|
159
150
|
loadedRef.current = false;
|
|
160
151
|
loadAllSchemes();
|
|
@@ -172,12 +163,9 @@ function useSchemeManager(config) {
|
|
|
172
163
|
while (1) switch (_context2.prev = _context2.next) {
|
|
173
164
|
case 0:
|
|
174
165
|
_context2.prev = 0;
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
// 调用适配器保存
|
|
178
|
-
_context2.next = 4;
|
|
166
|
+
_context2.next = 3;
|
|
179
167
|
return adapter.saveColumnScheme(gridId, scheme);
|
|
180
|
-
case
|
|
168
|
+
case 3:
|
|
181
169
|
savedScheme = _context2.sent;
|
|
182
170
|
// 更新本地状态
|
|
183
171
|
setColumnSchemes(function (prev) {
|
|
@@ -192,19 +180,18 @@ function useSchemeManager(config) {
|
|
|
192
180
|
}
|
|
193
181
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, schemes));
|
|
194
182
|
});
|
|
195
|
-
|
|
196
|
-
_context2.next = 13;
|
|
183
|
+
_context2.next = 11;
|
|
197
184
|
break;
|
|
198
|
-
case
|
|
199
|
-
_context2.prev =
|
|
185
|
+
case 7:
|
|
186
|
+
_context2.prev = 7;
|
|
200
187
|
_context2.t0 = _context2["catch"](0);
|
|
201
188
|
console.error('[useSchemeManager] 保存列方案失败:', _context2.t0);
|
|
202
189
|
throw _context2.t0;
|
|
203
|
-
case
|
|
190
|
+
case 11:
|
|
204
191
|
case "end":
|
|
205
192
|
return _context2.stop();
|
|
206
193
|
}
|
|
207
|
-
}, _callee2, null, [[0,
|
|
194
|
+
}, _callee2, null, [[0, 7]]);
|
|
208
195
|
}));
|
|
209
196
|
return function (_x, _x2) {
|
|
210
197
|
return _ref2.apply(this, arguments);
|
|
@@ -216,12 +203,9 @@ function useSchemeManager(config) {
|
|
|
216
203
|
while (1) switch (_context3.prev = _context3.next) {
|
|
217
204
|
case 0:
|
|
218
205
|
_context3.prev = 0;
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
// 调用适配器删除
|
|
222
|
-
_context3.next = 4;
|
|
206
|
+
_context3.next = 3;
|
|
223
207
|
return adapter.deleteColumnScheme(gridId, schemeId);
|
|
224
|
-
case
|
|
208
|
+
case 3:
|
|
225
209
|
// 更新本地状态
|
|
226
210
|
setColumnSchemes(function (prev) {
|
|
227
211
|
var schemes = (prev[gridId] || []).filter(function (s) {
|
|
@@ -240,19 +224,18 @@ function useSchemeManager(config) {
|
|
|
240
224
|
}
|
|
241
225
|
return prev;
|
|
242
226
|
});
|
|
243
|
-
|
|
244
|
-
_context3.next = 13;
|
|
227
|
+
_context3.next = 11;
|
|
245
228
|
break;
|
|
246
|
-
case
|
|
247
|
-
_context3.prev =
|
|
229
|
+
case 7:
|
|
230
|
+
_context3.prev = 7;
|
|
248
231
|
_context3.t0 = _context3["catch"](0);
|
|
249
232
|
console.error('[useSchemeManager] 删除列方案失败:', _context3.t0);
|
|
250
233
|
throw _context3.t0;
|
|
251
|
-
case
|
|
234
|
+
case 11:
|
|
252
235
|
case "end":
|
|
253
236
|
return _context3.stop();
|
|
254
237
|
}
|
|
255
|
-
}, _callee3, null, [[0,
|
|
238
|
+
}, _callee3, null, [[0, 7]]);
|
|
256
239
|
}));
|
|
257
240
|
return function (_x3, _x4) {
|
|
258
241
|
return _ref3.apply(this, arguments);
|
|
@@ -265,32 +248,29 @@ function useSchemeManager(config) {
|
|
|
265
248
|
while (1) switch (_context4.prev = _context4.next) {
|
|
266
249
|
case 0:
|
|
267
250
|
_context4.prev = 0;
|
|
268
|
-
console.log("[useSchemeManager] \u8BBE\u7F6E\u5F53\u524D\u5217\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
|
|
269
|
-
|
|
270
251
|
// 获取当前的查询方案ID
|
|
271
252
|
querySchemeId = ((_currentSchemes$gridI = currentSchemes[gridId]) === null || _currentSchemes$gridI === void 0 ? void 0 : _currentSchemes$gridI.querySchemeId) || null; // 调用适配器设置
|
|
272
|
-
_context4.next =
|
|
253
|
+
_context4.next = 4;
|
|
273
254
|
return adapter.setCurrentScheme(gridId, schemeId, querySchemeId);
|
|
274
|
-
case
|
|
255
|
+
case 4:
|
|
275
256
|
// 更新本地状态
|
|
276
257
|
setCurrentSchemes(function (prev) {
|
|
277
258
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, _objectSpread(_objectSpread({}, prev[gridId] || {}), {}, {
|
|
278
259
|
columnSchemeId: schemeId
|
|
279
260
|
})));
|
|
280
261
|
});
|
|
281
|
-
|
|
282
|
-
_context4.next = 13;
|
|
262
|
+
_context4.next = 11;
|
|
283
263
|
break;
|
|
284
|
-
case
|
|
285
|
-
_context4.prev =
|
|
264
|
+
case 7:
|
|
265
|
+
_context4.prev = 7;
|
|
286
266
|
_context4.t0 = _context4["catch"](0);
|
|
287
267
|
console.error('[useSchemeManager] 设置当前列方案失败:', _context4.t0);
|
|
288
268
|
throw _context4.t0;
|
|
289
|
-
case
|
|
269
|
+
case 11:
|
|
290
270
|
case "end":
|
|
291
271
|
return _context4.stop();
|
|
292
272
|
}
|
|
293
|
-
}, _callee4, null, [[0,
|
|
273
|
+
}, _callee4, null, [[0, 7]]);
|
|
294
274
|
}));
|
|
295
275
|
return function (_x5, _x6) {
|
|
296
276
|
return _ref4.apply(this, arguments);
|
|
@@ -306,12 +286,9 @@ function useSchemeManager(config) {
|
|
|
306
286
|
while (1) switch (_context5.prev = _context5.next) {
|
|
307
287
|
case 0:
|
|
308
288
|
_context5.prev = 0;
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
// 调用适配器保存
|
|
312
|
-
_context5.next = 4;
|
|
289
|
+
_context5.next = 3;
|
|
313
290
|
return adapter.saveQueryScheme(gridId, scheme);
|
|
314
|
-
case
|
|
291
|
+
case 3:
|
|
315
292
|
savedScheme = _context5.sent;
|
|
316
293
|
// 更新本地状态
|
|
317
294
|
setQuerySchemes(function (prev) {
|
|
@@ -326,19 +303,18 @@ function useSchemeManager(config) {
|
|
|
326
303
|
}
|
|
327
304
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, schemes));
|
|
328
305
|
});
|
|
329
|
-
|
|
330
|
-
_context5.next = 13;
|
|
306
|
+
_context5.next = 11;
|
|
331
307
|
break;
|
|
332
|
-
case
|
|
333
|
-
_context5.prev =
|
|
308
|
+
case 7:
|
|
309
|
+
_context5.prev = 7;
|
|
334
310
|
_context5.t0 = _context5["catch"](0);
|
|
335
311
|
console.error('[useSchemeManager] 保存查询方案失败:', _context5.t0);
|
|
336
312
|
throw _context5.t0;
|
|
337
|
-
case
|
|
313
|
+
case 11:
|
|
338
314
|
case "end":
|
|
339
315
|
return _context5.stop();
|
|
340
316
|
}
|
|
341
|
-
}, _callee5, null, [[0,
|
|
317
|
+
}, _callee5, null, [[0, 7]]);
|
|
342
318
|
}));
|
|
343
319
|
return function (_x7, _x8) {
|
|
344
320
|
return _ref5.apply(this, arguments);
|
|
@@ -350,12 +326,9 @@ function useSchemeManager(config) {
|
|
|
350
326
|
while (1) switch (_context6.prev = _context6.next) {
|
|
351
327
|
case 0:
|
|
352
328
|
_context6.prev = 0;
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
// 调用适配器删除
|
|
356
|
-
_context6.next = 4;
|
|
329
|
+
_context6.next = 3;
|
|
357
330
|
return adapter.deleteQueryScheme(gridId, schemeId);
|
|
358
|
-
case
|
|
331
|
+
case 3:
|
|
359
332
|
// 更新本地状态
|
|
360
333
|
setQuerySchemes(function (prev) {
|
|
361
334
|
var schemes = (prev[gridId] || []).filter(function (s) {
|
|
@@ -374,19 +347,18 @@ function useSchemeManager(config) {
|
|
|
374
347
|
}
|
|
375
348
|
return prev;
|
|
376
349
|
});
|
|
377
|
-
|
|
378
|
-
_context6.next = 13;
|
|
350
|
+
_context6.next = 11;
|
|
379
351
|
break;
|
|
380
|
-
case
|
|
381
|
-
_context6.prev =
|
|
352
|
+
case 7:
|
|
353
|
+
_context6.prev = 7;
|
|
382
354
|
_context6.t0 = _context6["catch"](0);
|
|
383
355
|
console.error('[useSchemeManager] 删除查询方案失败:', _context6.t0);
|
|
384
356
|
throw _context6.t0;
|
|
385
|
-
case
|
|
357
|
+
case 11:
|
|
386
358
|
case "end":
|
|
387
359
|
return _context6.stop();
|
|
388
360
|
}
|
|
389
|
-
}, _callee6, null, [[0,
|
|
361
|
+
}, _callee6, null, [[0, 7]]);
|
|
390
362
|
}));
|
|
391
363
|
return function (_x9, _x10) {
|
|
392
364
|
return _ref6.apply(this, arguments);
|
|
@@ -399,32 +371,29 @@ function useSchemeManager(config) {
|
|
|
399
371
|
while (1) switch (_context7.prev = _context7.next) {
|
|
400
372
|
case 0:
|
|
401
373
|
_context7.prev = 0;
|
|
402
|
-
console.log("[useSchemeManager] \u8BBE\u7F6E\u5F53\u524D\u67E5\u8BE2\u65B9\u6848: ".concat(gridId, " - ").concat(schemeId));
|
|
403
|
-
|
|
404
374
|
// 获取当前的列方案ID
|
|
405
375
|
columnSchemeId = ((_currentSchemes$gridI2 = currentSchemes[gridId]) === null || _currentSchemes$gridI2 === void 0 ? void 0 : _currentSchemes$gridI2.columnSchemeId) || null; // 调用适配器设置
|
|
406
|
-
_context7.next =
|
|
376
|
+
_context7.next = 4;
|
|
407
377
|
return adapter.setCurrentScheme(gridId, columnSchemeId, schemeId);
|
|
408
|
-
case
|
|
378
|
+
case 4:
|
|
409
379
|
// 更新本地状态
|
|
410
380
|
setCurrentSchemes(function (prev) {
|
|
411
381
|
return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, gridId, _objectSpread(_objectSpread({}, prev[gridId] || {}), {}, {
|
|
412
382
|
querySchemeId: schemeId
|
|
413
383
|
})));
|
|
414
384
|
});
|
|
415
|
-
|
|
416
|
-
_context7.next = 13;
|
|
385
|
+
_context7.next = 11;
|
|
417
386
|
break;
|
|
418
|
-
case
|
|
419
|
-
_context7.prev =
|
|
387
|
+
case 7:
|
|
388
|
+
_context7.prev = 7;
|
|
420
389
|
_context7.t0 = _context7["catch"](0);
|
|
421
390
|
console.error('[useSchemeManager] 设置当前查询方案失败:', _context7.t0);
|
|
422
391
|
throw _context7.t0;
|
|
423
|
-
case
|
|
392
|
+
case 11:
|
|
424
393
|
case "end":
|
|
425
394
|
return _context7.stop();
|
|
426
395
|
}
|
|
427
|
-
}, _callee7, null, [[0,
|
|
396
|
+
}, _callee7, null, [[0, 7]]);
|
|
428
397
|
}));
|
|
429
398
|
return function (_x11, _x12) {
|
|
430
399
|
return _ref7.apply(this, arguments);
|
|
@@ -548,6 +517,5 @@ function useGridSchemes() {
|
|
|
548
517
|
if (!hasSchemeManagement) {
|
|
549
518
|
throw new Error('[useGridSchemes] 必须在 GridPlusContext.Provider 中传入 SchemeManager 状态。\n' + '请使用 useSchemeManager hook 创建方案管理器,然后通过 Provider 传递:\n' + ' const schemeManager = useSchemeManager({ adapter, ... });\n' + ' <GridPlusContext.Provider value={{ ...otherValues, ...schemeManager }}>');
|
|
550
519
|
}
|
|
551
|
-
console.log('[useGridSchemes] 使用 Context 中的方案管理状态');
|
|
552
520
|
return context;
|
|
553
521
|
}
|
|
@@ -245,15 +245,14 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
245
245
|
|
|
246
246
|
// 【修复】转换为 AG-Grid 的列定义,传入原始列定义以保留自定义属性
|
|
247
247
|
gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs(处理分组结构变化)
|
|
248
|
-
console.log('[ColumnSetting] 更新 columnDefs:', gridColumnDefs);
|
|
249
248
|
gridApi.setGridOption('columnDefs', gridColumnDefs);
|
|
250
249
|
|
|
251
250
|
// 等待 columnDefs 更新完成
|
|
252
|
-
_context2.next =
|
|
251
|
+
_context2.next = 10;
|
|
253
252
|
return new Promise(function (resolve) {
|
|
254
253
|
return setTimeout(resolve, 100);
|
|
255
254
|
});
|
|
256
|
-
case
|
|
255
|
+
case 10:
|
|
257
256
|
// 【修复】然后应用列状态(宽度、隐藏、顺序等)
|
|
258
257
|
columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
|
|
259
258
|
gridApi.applyColumnState({
|
|
@@ -345,7 +344,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
345
344
|
|
|
346
345
|
// message.success 已经在上面的逻辑中处理了
|
|
347
346
|
onClose();
|
|
348
|
-
case
|
|
347
|
+
case 15:
|
|
349
348
|
case "end":
|
|
350
349
|
return _context2.stop();
|
|
351
350
|
}
|
|
@@ -367,22 +366,21 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
367
366
|
case 3:
|
|
368
367
|
_context3.prev = 3;
|
|
369
368
|
if (!(activeTab === 'columns' && form)) {
|
|
370
|
-
_context3.next =
|
|
369
|
+
_context3.next = 17;
|
|
371
370
|
break;
|
|
372
371
|
}
|
|
373
372
|
values = form.values;
|
|
374
373
|
columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
|
|
375
374
|
// 【修复】传入原始列定义以保留自定义属性
|
|
376
375
|
gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, originalColumnDefs); // 【关键修复】先更新 columnDefs(处理分组结构变化)
|
|
377
|
-
console.log('[ColumnSetting] 另存为方案 - 更新 columnDefs');
|
|
378
376
|
gridApi.setGridOption('columnDefs', gridColumnDefs);
|
|
379
377
|
|
|
380
378
|
// 等待 columnDefs 更新完成
|
|
381
|
-
_context3.next =
|
|
379
|
+
_context3.next = 11;
|
|
382
380
|
return new Promise(function (resolve) {
|
|
383
381
|
return setTimeout(resolve, 100);
|
|
384
382
|
});
|
|
385
|
-
case
|
|
383
|
+
case 11:
|
|
386
384
|
// 【修复】然后应用列状态(宽度、隐藏、顺序等)
|
|
387
385
|
columnState = (0, _columnGroupUtils.flatConfigToColumnState)(values.items);
|
|
388
386
|
gridApi.applyColumnState({
|
|
@@ -391,18 +389,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
391
389
|
});
|
|
392
390
|
|
|
393
391
|
// 等待状态更新
|
|
394
|
-
_context3.next =
|
|
392
|
+
_context3.next = 15;
|
|
395
393
|
return new Promise(function (resolve) {
|
|
396
394
|
return setTimeout(resolve, 50);
|
|
397
395
|
});
|
|
398
|
-
case
|
|
399
|
-
_context3.next =
|
|
396
|
+
case 15:
|
|
397
|
+
_context3.next = 19;
|
|
400
398
|
break;
|
|
401
|
-
case
|
|
399
|
+
case 17:
|
|
402
400
|
// 如果在"方案管理"标签页,使用当前表单数据
|
|
403
401
|
_values = form === null || form === void 0 ? void 0 : form.values;
|
|
404
402
|
columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
|
|
405
|
-
case
|
|
403
|
+
case 19:
|
|
406
404
|
// 获取过滤器模型
|
|
407
405
|
filterModel = gridApi.getFilterModel();
|
|
408
406
|
newScheme = {
|
|
@@ -416,9 +414,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
416
414
|
createdAt: Date.now(),
|
|
417
415
|
updatedAt: Date.now()
|
|
418
416
|
};
|
|
419
|
-
_context3.next =
|
|
417
|
+
_context3.next = 23;
|
|
420
418
|
return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
|
|
421
|
-
case
|
|
419
|
+
case 23:
|
|
422
420
|
_antd.message.success('方案保存成功');
|
|
423
421
|
setSaveSchemeVisible(false);
|
|
424
422
|
setSchemeName('');
|
|
@@ -426,17 +424,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
426
424
|
|
|
427
425
|
// 切换到方案管理标签页,显示新创建的方案
|
|
428
426
|
setActiveTab('schemes');
|
|
429
|
-
_context3.next =
|
|
427
|
+
_context3.next = 33;
|
|
430
428
|
break;
|
|
431
|
-
case
|
|
432
|
-
_context3.prev =
|
|
429
|
+
case 30:
|
|
430
|
+
_context3.prev = 30;
|
|
433
431
|
_context3.t0 = _context3["catch"](3);
|
|
434
432
|
_antd.message.error(_context3.t0.message || '保存方案失败');
|
|
435
|
-
case
|
|
433
|
+
case 33:
|
|
436
434
|
case "end":
|
|
437
435
|
return _context3.stop();
|
|
438
436
|
}
|
|
439
|
-
}, _callee3, null, [[3,
|
|
437
|
+
}, _callee3, null, [[3, 30]]);
|
|
440
438
|
})), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
|
|
441
439
|
|
|
442
440
|
// 加载方案
|
|
@@ -455,20 +453,19 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
455
453
|
return s.id === schemeId;
|
|
456
454
|
});
|
|
457
455
|
if (!(scheme && gridApi)) {
|
|
458
|
-
_context4.next =
|
|
456
|
+
_context4.next = 12;
|
|
459
457
|
break;
|
|
460
458
|
}
|
|
461
459
|
// 【关键修复】先更新 columnDefs(处理分组结构)
|
|
462
460
|
gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
|
|
463
|
-
console.log('[ColumnSetting] 加载方案 - 更新 columnDefs');
|
|
464
461
|
gridApi.setGridOption('columnDefs', gridColumnDefs);
|
|
465
462
|
|
|
466
463
|
// 等待 columnDefs 更新完成
|
|
467
|
-
_context4.next =
|
|
464
|
+
_context4.next = 9;
|
|
468
465
|
return new Promise(function (resolve) {
|
|
469
466
|
return setTimeout(resolve, 100);
|
|
470
467
|
});
|
|
471
|
-
case
|
|
468
|
+
case 9:
|
|
472
469
|
// 【修复】然后应用列状态(宽度、隐藏、顺序等)
|
|
473
470
|
columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
|
|
474
471
|
gridApi.applyColumnState({
|
|
@@ -480,7 +477,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
480
477
|
if (scheme.filterModel) {
|
|
481
478
|
gridApi.setFilterModel(scheme.filterModel);
|
|
482
479
|
}
|
|
483
|
-
case
|
|
480
|
+
case 12:
|
|
484
481
|
_antd.message.success('方案已加载');
|
|
485
482
|
|
|
486
483
|
// 等待Grid状态更新后再刷新表单
|
|
@@ -495,17 +492,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
495
492
|
|
|
496
493
|
// 自动关闭弹窗,让用户看到Grid的变化
|
|
497
494
|
onClose();
|
|
498
|
-
_context4.next =
|
|
495
|
+
_context4.next = 20;
|
|
499
496
|
break;
|
|
500
|
-
case
|
|
501
|
-
_context4.prev =
|
|
497
|
+
case 17:
|
|
498
|
+
_context4.prev = 17;
|
|
502
499
|
_context4.t0 = _context4["catch"](0);
|
|
503
500
|
_antd.message.error(_context4.t0.message || '加载方案失败');
|
|
504
|
-
case
|
|
501
|
+
case 20:
|
|
505
502
|
case "end":
|
|
506
503
|
return _context4.stop();
|
|
507
504
|
}
|
|
508
|
-
}, _callee4, null, [[0,
|
|
505
|
+
}, _callee4, null, [[0, 17]]);
|
|
509
506
|
}));
|
|
510
507
|
return function (_x) {
|
|
511
508
|
return _ref5.apply(this, arguments);
|