@nokecy/qc-ui 1.0.90 → 1.0.91
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/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
- package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js +34 -83
- package/dist/esm/ag-grid-plus/errors/ErrorBoundary.d.ts +1 -1
- package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +1 -1
- package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
- package/dist/esm/ag-grid-plus/setting/ColumnSetting.d.ts.map +1 -1
- package/dist/esm/ag-grid-plus/setting/ColumnSetting.js +34 -83
- package/dist/esm/components/RegexEditor/validation/types.d.ts.map +1 -1
- package/dist/esm/components/RegexEditor/visualizer/astToRailroad.d.ts.map +1 -1
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +1 -1
- package/dist/cjs/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +0 -1
|
@@ -200,20 +200,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
200
200
|
var updateItems = (0, _react.useCallback)(function (newItems) {
|
|
201
201
|
// 重新计算 order
|
|
202
202
|
(0, _columnGroupUtils.reorderItems)(newItems);
|
|
203
|
-
console.log('[ColumnConfigTable] updateItems 调用,重新计算 order 后:', {
|
|
204
|
-
itemsCount: newItems.length,
|
|
205
|
-
items: newItems.map(function (item, idx) {
|
|
206
|
-
return {
|
|
207
|
-
index: idx,
|
|
208
|
-
id: item.id,
|
|
209
|
-
type: item.type,
|
|
210
|
-
headerName: item.headerName,
|
|
211
|
-
field: item.field,
|
|
212
|
-
order: item.order,
|
|
213
|
-
parentId: item.parentId
|
|
214
|
-
};
|
|
215
|
-
})
|
|
216
|
-
});
|
|
217
203
|
setLocalItems(_toConsumableArray(newItems));
|
|
218
204
|
onChange(_toConsumableArray(newItems));
|
|
219
205
|
}, [onChange]);
|
|
@@ -260,10 +246,10 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
260
246
|
|
|
261
247
|
// 计算表格可用高度 = Modal Content 高度 - Header - Footer - 容器之前的内容高度 - 底部留白
|
|
262
248
|
var contentBeforeTable = containerRect.top - modalContentRect.top - headerHeight;
|
|
263
|
-
var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable -
|
|
249
|
+
var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 55;
|
|
264
250
|
|
|
265
251
|
// 设置最小高度为300px
|
|
266
|
-
var finalHeight = Math.max(
|
|
252
|
+
var finalHeight = Math.max(600, availableHeight);
|
|
267
253
|
setTableHeight(finalHeight);
|
|
268
254
|
}
|
|
269
255
|
}
|
|
@@ -401,24 +387,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
401
387
|
* 打开移动节点弹窗
|
|
402
388
|
*/
|
|
403
389
|
var handleOpenMoveModal = (0, _react.useCallback)(function (node) {
|
|
404
|
-
console.log('[ColumnConfigTable] 打开移动弹窗:', {
|
|
405
|
-
node: {
|
|
406
|
-
id: node.id,
|
|
407
|
-
headerName: node.headerName,
|
|
408
|
-
type: node.type,
|
|
409
|
-
parentId: node.parentId,
|
|
410
|
-
level: node.level
|
|
411
|
-
},
|
|
412
|
-
allItems: localItems.map(function (n) {
|
|
413
|
-
return {
|
|
414
|
-
id: n.id,
|
|
415
|
-
headerName: n.headerName,
|
|
416
|
-
type: n.type,
|
|
417
|
-
parentId: n.parentId,
|
|
418
|
-
level: n.level
|
|
419
|
-
};
|
|
420
|
-
})
|
|
421
|
-
});
|
|
422
390
|
setCurrentMoveNode(node);
|
|
423
391
|
setMoveModalVisible(true);
|
|
424
392
|
}, [localItems]);
|
|
@@ -480,18 +448,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
480
448
|
});
|
|
481
449
|
};
|
|
482
450
|
collectNodes(nodeId);
|
|
483
|
-
console.log('[ColumnConfigTable] 移动节点:', {
|
|
484
|
-
nodeId: nodeId,
|
|
485
|
-
targetParentId: targetParentId,
|
|
486
|
-
nodesToMoveCount: nodesToMove.length,
|
|
487
|
-
nodesToMove: nodesToMove.map(function (n) {
|
|
488
|
-
return {
|
|
489
|
-
id: n.id,
|
|
490
|
-
headerName: n.headerName,
|
|
491
|
-
parentId: n.parentId
|
|
492
|
-
};
|
|
493
|
-
})
|
|
494
|
-
});
|
|
495
451
|
|
|
496
452
|
// 3.2 从原位置移除这些节点
|
|
497
453
|
var remainingItems = newItems.filter(function (item) {
|
|
@@ -524,37 +480,12 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
524
480
|
// 插入到根级别的末尾
|
|
525
481
|
insertIndex = remainingItems.length;
|
|
526
482
|
}
|
|
527
|
-
console.log('[ColumnConfigTable] 插入位置:', {
|
|
528
|
-
insertIndex: insertIndex,
|
|
529
|
-
targetParentId: targetParentId,
|
|
530
|
-
remainingItemsCount: remainingItems.length,
|
|
531
|
-
updatedNodesToMove: updatedNodesToMove.map(function (n) {
|
|
532
|
-
return {
|
|
533
|
-
id: n.id,
|
|
534
|
-
headerName: n.headerName,
|
|
535
|
-
parentId: n.parentId,
|
|
536
|
-
level: n.level
|
|
537
|
-
};
|
|
538
|
-
})
|
|
539
|
-
});
|
|
540
483
|
|
|
541
484
|
// 3.6 插入节点
|
|
542
485
|
remainingItems.splice.apply(remainingItems, [insertIndex, 0].concat(_toConsumableArray(updatedNodesToMove)));
|
|
543
486
|
|
|
544
487
|
// 3.7 重新计算 order
|
|
545
488
|
(0, _columnGroupUtils.reorderItems)(remainingItems);
|
|
546
|
-
console.log('[ColumnConfigTable] 移动完成后的数组:', {
|
|
547
|
-
totalCount: remainingItems.length,
|
|
548
|
-
items: remainingItems.map(function (n) {
|
|
549
|
-
return {
|
|
550
|
-
id: n.id,
|
|
551
|
-
headerName: n.headerName,
|
|
552
|
-
parentId: n.parentId,
|
|
553
|
-
level: n.level,
|
|
554
|
-
order: n.order
|
|
555
|
-
};
|
|
556
|
-
})
|
|
557
|
-
});
|
|
558
489
|
updateItems(remainingItems);
|
|
559
490
|
_antd.message.success("\u5DF2\u5C06\"".concat(currentMoveNode.headerName, "\"\u79FB\u52A8\u5230\u65B0\u4F4D\u7F6E"));
|
|
560
491
|
handleCloseMoveModal();
|
|
@@ -670,25 +601,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
670
601
|
};
|
|
671
602
|
collectDescendants(draggedItem.id);
|
|
672
603
|
}
|
|
673
|
-
console.log('[ColumnConfigTable] 拖动排序:', {
|
|
674
|
-
dragIndex: dragIndex,
|
|
675
|
-
hoverIndex: hoverIndex,
|
|
676
|
-
realDragIndex: realDragIndex,
|
|
677
|
-
realHoverIndex: realHoverIndex,
|
|
678
|
-
draggedItem: {
|
|
679
|
-
id: draggedItem.id,
|
|
680
|
-
headerName: draggedItem.headerName,
|
|
681
|
-
type: draggedItem.type
|
|
682
|
-
},
|
|
683
|
-
nodesToMoveCount: nodesToMove.length,
|
|
684
|
-
nodesToMove: nodesToMove.map(function (n) {
|
|
685
|
-
return {
|
|
686
|
-
id: n.id,
|
|
687
|
-
headerName: n.headerName,
|
|
688
|
-
parentId: n.parentId
|
|
689
|
-
};
|
|
690
|
-
})
|
|
691
|
-
});
|
|
692
604
|
|
|
693
605
|
// 从原数组中移除所有要移动的节点
|
|
694
606
|
var remainingItems = newItems.filter(function (item) {
|
|
@@ -707,20 +619,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
707
619
|
|
|
708
620
|
// 在新位置插入所有节点
|
|
709
621
|
remainingItems.splice.apply(remainingItems, [adjustedHoverIndex, 0].concat(nodesToMove));
|
|
710
|
-
console.log('[ColumnConfigTable] 拖动完成,准备更新:', {
|
|
711
|
-
remainingItemsCount: remainingItems.length,
|
|
712
|
-
items: remainingItems.map(function (item, idx) {
|
|
713
|
-
return {
|
|
714
|
-
index: idx,
|
|
715
|
-
id: item.id,
|
|
716
|
-
type: item.type,
|
|
717
|
-
headerName: item.headerName,
|
|
718
|
-
field: item.field,
|
|
719
|
-
order: item.order,
|
|
720
|
-
parentId: item.parentId
|
|
721
|
-
};
|
|
722
|
-
})
|
|
723
|
-
});
|
|
724
622
|
|
|
725
623
|
// 使用 updateItems 来同时更新本地状态和通知父组件
|
|
726
624
|
updateItems(remainingItems);
|
|
@@ -98,17 +98,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
98
98
|
var _schemeManager$curren;
|
|
99
99
|
// 优先使用当前方案中保存的完整列配置(包含分组结构)
|
|
100
100
|
if (schemeManager !== null && schemeManager !== void 0 && (_schemeManager$curren = schemeManager.currentScheme) !== null && _schemeManager$curren !== void 0 && _schemeManager$curren.columnConfig) {
|
|
101
|
-
console.log('[ColumnSetting] 使用方案中保存的 columnConfig:', schemeManager.currentScheme.columnConfig);
|
|
102
101
|
return schemeManager.currentScheme.columnConfig;
|
|
103
102
|
}
|
|
104
103
|
|
|
105
104
|
// 如果方案中没有 columnConfig,则从 Grid 读取
|
|
106
105
|
var columnDefs = gridApi.getColumnDefs() || [];
|
|
107
106
|
var columnStates = gridApi.getColumnState();
|
|
108
|
-
console.log('[ColumnSetting] 从 Grid 读取列配置:', {
|
|
109
|
-
columnDefs: columnDefs,
|
|
110
|
-
columnStates: columnStates
|
|
111
|
-
});
|
|
112
107
|
|
|
113
108
|
// 将 Grid 状态转换为扁平化配置
|
|
114
109
|
var flatConfig = (0, _columnGroupUtils.gridStateToFlatConfig)(columnDefs);
|
|
@@ -234,13 +229,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
234
229
|
}
|
|
235
230
|
|
|
236
231
|
// 转换为 AG-Grid 的列定义
|
|
237
|
-
gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave);
|
|
238
|
-
console.log('[ColumnSetting] 保存列配置:', {
|
|
239
|
-
flatConfig: configToSave,
|
|
240
|
-
gridColumnDefs: gridColumnDefs
|
|
241
|
-
});
|
|
242
|
-
|
|
243
|
-
// 先应用列配置到 Grid
|
|
232
|
+
gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave); // 先应用列配置到 Grid
|
|
244
233
|
if (type !== 'formArrayTable') {
|
|
245
234
|
gridApi.setGridOption("columnDefs", gridColumnDefs);
|
|
246
235
|
}
|
|
@@ -249,69 +238,54 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
249
238
|
|
|
250
239
|
// 等待 Grid 状态更新完成后再保存到方案
|
|
251
240
|
setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
252
|
-
var updatedState, filterModel, defaultScheme,
|
|
241
|
+
var updatedState, filterModel, defaultScheme, newScheme;
|
|
253
242
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
254
243
|
while (1) switch (_context.prev = _context.next) {
|
|
255
244
|
case 0:
|
|
256
245
|
if (!(schemeManager && gridKey)) {
|
|
257
|
-
_context.next =
|
|
246
|
+
_context.next = 25;
|
|
258
247
|
break;
|
|
259
248
|
}
|
|
260
249
|
_context.prev = 1;
|
|
261
250
|
// 从 Grid 获取应用后的最新列状态和过滤器状态
|
|
262
251
|
updatedState = gridApi.getColumnState();
|
|
263
252
|
filterModel = gridApi.getFilterModel();
|
|
264
|
-
console.log('[ColumnSetting] 准备保存到方案:', {
|
|
265
|
-
columnConfig: configToSave,
|
|
266
|
-
columnConfigLength: configToSave.length,
|
|
267
|
-
columnConfigDetail: configToSave.map(function (item, idx) {
|
|
268
|
-
return {
|
|
269
|
-
index: idx,
|
|
270
|
-
type: item.type,
|
|
271
|
-
headerName: item.headerName,
|
|
272
|
-
field: item.field,
|
|
273
|
-
order: item.order,
|
|
274
|
-
parentId: item.parentId
|
|
275
|
-
};
|
|
276
|
-
}),
|
|
277
|
-
filterModel: filterModel
|
|
278
|
-
});
|
|
279
253
|
if (!schemeManager.currentScheme) {
|
|
280
|
-
_context.next =
|
|
254
|
+
_context.next = 9;
|
|
281
255
|
break;
|
|
282
256
|
}
|
|
283
|
-
_context.next =
|
|
257
|
+
_context.next = 7;
|
|
284
258
|
return schemeManager.saveScheme({
|
|
285
259
|
columnConfig: configToSave,
|
|
286
260
|
// 保存完整的列配置(包含分组结构)
|
|
287
261
|
filterModel: filterModel
|
|
288
262
|
});
|
|
289
|
-
case
|
|
290
|
-
_context.next =
|
|
263
|
+
case 7:
|
|
264
|
+
_context.next = 20;
|
|
291
265
|
break;
|
|
292
|
-
case
|
|
266
|
+
case 9:
|
|
293
267
|
// 如果没有激活的方案,查找或创建"默认配置"方案
|
|
294
268
|
defaultScheme = schemeManager.schemes.find(function (s) {
|
|
295
269
|
return s.isDefault;
|
|
296
270
|
});
|
|
297
271
|
if (!defaultScheme) {
|
|
298
|
-
_context.next =
|
|
272
|
+
_context.next = 17;
|
|
299
273
|
break;
|
|
300
274
|
}
|
|
301
|
-
_context.next =
|
|
275
|
+
_context.next = 13;
|
|
302
276
|
return schemeManager.loadScheme(defaultScheme.id);
|
|
303
|
-
case
|
|
304
|
-
_context.next =
|
|
277
|
+
case 13:
|
|
278
|
+
_context.next = 15;
|
|
305
279
|
return schemeManager.saveScheme({
|
|
306
280
|
columnConfig: configToSave,
|
|
307
281
|
// 保存完整的列配置(包含分组结构)
|
|
308
282
|
filterModel: filterModel
|
|
309
283
|
});
|
|
310
|
-
case
|
|
311
|
-
_context.next = 22;
|
|
312
|
-
break;
|
|
313
|
-
case 18:
|
|
284
|
+
case 15:
|
|
314
285
|
_context.next = 20;
|
|
286
|
+
break;
|
|
287
|
+
case 17:
|
|
288
|
+
_context.next = 19;
|
|
315
289
|
return schemeManager.createScheme('默认配置', configToSave,
|
|
316
290
|
// 使用 columnConfig 而不是 columnState
|
|
317
291
|
{
|
|
@@ -320,33 +294,27 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
320
294
|
filterModel: filterModel,
|
|
321
295
|
activate: true // 立即激活该方案
|
|
322
296
|
});
|
|
323
|
-
case
|
|
297
|
+
case 19:
|
|
324
298
|
newScheme = _context.sent;
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
schemeName: newScheme.name,
|
|
328
|
-
hasColumnConfig: !!newScheme.columnConfig,
|
|
329
|
-
columnConfigLength: ((_newScheme$columnConf = newScheme.columnConfig) === null || _newScheme$columnConf === void 0 ? void 0 : _newScheme$columnConf.length) || 0
|
|
330
|
-
});
|
|
331
|
-
case 22:
|
|
332
|
-
_context.next = 27;
|
|
299
|
+
case 20:
|
|
300
|
+
_context.next = 25;
|
|
333
301
|
break;
|
|
334
|
-
case
|
|
335
|
-
_context.prev =
|
|
302
|
+
case 22:
|
|
303
|
+
_context.prev = 22;
|
|
336
304
|
_context.t0 = _context["catch"](1);
|
|
337
|
-
console.error('
|
|
338
|
-
case
|
|
305
|
+
console.error('保存列配置到方案失败:', _context.t0);
|
|
306
|
+
case 25:
|
|
339
307
|
case "end":
|
|
340
308
|
return _context.stop();
|
|
341
309
|
}
|
|
342
|
-
}, _callee, null, [[1,
|
|
310
|
+
}, _callee, null, [[1, 22]]);
|
|
343
311
|
})), 50);
|
|
344
312
|
|
|
345
313
|
// 保存成功后清除备份
|
|
346
314
|
setOriginalColumnDefs(null);
|
|
347
315
|
_antd.message.success('列配置已保存');
|
|
348
316
|
onClose();
|
|
349
|
-
case
|
|
317
|
+
case 12:
|
|
350
318
|
case "end":
|
|
351
319
|
return _context2.stop();
|
|
352
320
|
}
|
|
@@ -676,7 +644,14 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
676
644
|
}
|
|
677
645
|
}];
|
|
678
646
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
|
|
679
|
-
title: "\u5217\u65B9\u6848\u7BA1\u7406",
|
|
647
|
+
title: /*#__PURE__*/_react.default.createElement("span", null, "\u5217\u65B9\u6848\u7BA1\u7406", (schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme) && /*#__PURE__*/_react.default.createElement("span", {
|
|
648
|
+
style: {
|
|
649
|
+
marginLeft: 16,
|
|
650
|
+
fontSize: 14,
|
|
651
|
+
fontWeight: 'normal',
|
|
652
|
+
color: '#1890ff'
|
|
653
|
+
}
|
|
654
|
+
}, "- \u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name)),
|
|
680
655
|
open: visible,
|
|
681
656
|
onCancel: handleClose,
|
|
682
657
|
width: 1100,
|
|
@@ -705,31 +680,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
705
680
|
}, /*#__PURE__*/_react.default.createElement(TabPane, {
|
|
706
681
|
tab: "\u5217\u914D\u7F6E",
|
|
707
682
|
key: "columns"
|
|
708
|
-
},
|
|
709
|
-
style: {
|
|
710
|
-
marginBottom: 16,
|
|
711
|
-
padding: '12px 16px',
|
|
712
|
-
background: schemeManager.currentScheme ? '#e6f7ff' : '#f5f5f5',
|
|
713
|
-
borderRadius: 4,
|
|
714
|
-
border: '1px solid',
|
|
715
|
-
borderColor: schemeManager.currentScheme ? '#91d5ff' : '#d9d9d9'
|
|
716
|
-
}
|
|
717
|
-
}, schemeManager.currentScheme ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
|
|
718
|
-
style: {
|
|
719
|
-
fontWeight: 600,
|
|
720
|
-
marginBottom: 4,
|
|
721
|
-
color: '#1890ff'
|
|
722
|
-
}
|
|
723
|
-
}, "\u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name), schemeManager.currentScheme.description && /*#__PURE__*/_react.default.createElement("div", {
|
|
724
|
-
style: {
|
|
725
|
-
fontSize: 12,
|
|
726
|
-
color: '#666'
|
|
727
|
-
}
|
|
728
|
-
}, schemeManager.currentScheme.description)) : /*#__PURE__*/_react.default.createElement("div", {
|
|
729
|
-
style: {
|
|
730
|
-
color: '#666'
|
|
731
|
-
}
|
|
732
|
-
}, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
|
|
683
|
+
}, /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
|
|
733
684
|
items: form.values.items || [],
|
|
734
685
|
onChange: handleColumnChange,
|
|
735
686
|
simple: type === 'formArrayTable'
|
|
@@ -31,6 +31,6 @@ export declare class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBo
|
|
|
31
31
|
* 重置错误状态,重新渲染组件
|
|
32
32
|
*/
|
|
33
33
|
handleRetry: () => void;
|
|
34
|
-
render(): string | number | boolean | React.
|
|
34
|
+
render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
|
|
35
35
|
}
|
|
36
36
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnConfigTable.d.ts","sourceRoot":"","sources":["ColumnConfigTable.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAA6E,MAAM,OAAO,CAAC;AA6BlG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD,UAAU,sBAAsB;IAC9B,gBAAgB;IAChB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,aAAa;IACb,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC5C,0CAA0C;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA4ID;;GAEG;AACH,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"ColumnConfigTable.d.ts","sourceRoot":"","sources":["ColumnConfigTable.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAA6E,MAAM,OAAO,CAAC;AA6BlG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD,UAAU,sBAAsB;IAC9B,gBAAgB;IAChB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,aAAa;IACb,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC5C,0CAA0C;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA4ID;;GAEG;AACH,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CA40BvD,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
|
@@ -193,20 +193,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
193
193
|
var updateItems = useCallback(function (newItems) {
|
|
194
194
|
// 重新计算 order
|
|
195
195
|
reorderItems(newItems);
|
|
196
|
-
console.log('[ColumnConfigTable] updateItems 调用,重新计算 order 后:', {
|
|
197
|
-
itemsCount: newItems.length,
|
|
198
|
-
items: newItems.map(function (item, idx) {
|
|
199
|
-
return {
|
|
200
|
-
index: idx,
|
|
201
|
-
id: item.id,
|
|
202
|
-
type: item.type,
|
|
203
|
-
headerName: item.headerName,
|
|
204
|
-
field: item.field,
|
|
205
|
-
order: item.order,
|
|
206
|
-
parentId: item.parentId
|
|
207
|
-
};
|
|
208
|
-
})
|
|
209
|
-
});
|
|
210
196
|
setLocalItems(_toConsumableArray(newItems));
|
|
211
197
|
onChange(_toConsumableArray(newItems));
|
|
212
198
|
}, [onChange]);
|
|
@@ -253,10 +239,10 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
253
239
|
|
|
254
240
|
// 计算表格可用高度 = Modal Content 高度 - Header - Footer - 容器之前的内容高度 - 底部留白
|
|
255
241
|
var contentBeforeTable = containerRect.top - modalContentRect.top - headerHeight;
|
|
256
|
-
var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable -
|
|
242
|
+
var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 55;
|
|
257
243
|
|
|
258
244
|
// 设置最小高度为300px
|
|
259
|
-
var finalHeight = Math.max(
|
|
245
|
+
var finalHeight = Math.max(600, availableHeight);
|
|
260
246
|
setTableHeight(finalHeight);
|
|
261
247
|
}
|
|
262
248
|
}
|
|
@@ -394,24 +380,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
394
380
|
* 打开移动节点弹窗
|
|
395
381
|
*/
|
|
396
382
|
var handleOpenMoveModal = useCallback(function (node) {
|
|
397
|
-
console.log('[ColumnConfigTable] 打开移动弹窗:', {
|
|
398
|
-
node: {
|
|
399
|
-
id: node.id,
|
|
400
|
-
headerName: node.headerName,
|
|
401
|
-
type: node.type,
|
|
402
|
-
parentId: node.parentId,
|
|
403
|
-
level: node.level
|
|
404
|
-
},
|
|
405
|
-
allItems: localItems.map(function (n) {
|
|
406
|
-
return {
|
|
407
|
-
id: n.id,
|
|
408
|
-
headerName: n.headerName,
|
|
409
|
-
type: n.type,
|
|
410
|
-
parentId: n.parentId,
|
|
411
|
-
level: n.level
|
|
412
|
-
};
|
|
413
|
-
})
|
|
414
|
-
});
|
|
415
383
|
setCurrentMoveNode(node);
|
|
416
384
|
setMoveModalVisible(true);
|
|
417
385
|
}, [localItems]);
|
|
@@ -473,18 +441,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
473
441
|
});
|
|
474
442
|
};
|
|
475
443
|
collectNodes(nodeId);
|
|
476
|
-
console.log('[ColumnConfigTable] 移动节点:', {
|
|
477
|
-
nodeId: nodeId,
|
|
478
|
-
targetParentId: targetParentId,
|
|
479
|
-
nodesToMoveCount: nodesToMove.length,
|
|
480
|
-
nodesToMove: nodesToMove.map(function (n) {
|
|
481
|
-
return {
|
|
482
|
-
id: n.id,
|
|
483
|
-
headerName: n.headerName,
|
|
484
|
-
parentId: n.parentId
|
|
485
|
-
};
|
|
486
|
-
})
|
|
487
|
-
});
|
|
488
444
|
|
|
489
445
|
// 3.2 从原位置移除这些节点
|
|
490
446
|
var remainingItems = newItems.filter(function (item) {
|
|
@@ -517,37 +473,12 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
517
473
|
// 插入到根级别的末尾
|
|
518
474
|
insertIndex = remainingItems.length;
|
|
519
475
|
}
|
|
520
|
-
console.log('[ColumnConfigTable] 插入位置:', {
|
|
521
|
-
insertIndex: insertIndex,
|
|
522
|
-
targetParentId: targetParentId,
|
|
523
|
-
remainingItemsCount: remainingItems.length,
|
|
524
|
-
updatedNodesToMove: updatedNodesToMove.map(function (n) {
|
|
525
|
-
return {
|
|
526
|
-
id: n.id,
|
|
527
|
-
headerName: n.headerName,
|
|
528
|
-
parentId: n.parentId,
|
|
529
|
-
level: n.level
|
|
530
|
-
};
|
|
531
|
-
})
|
|
532
|
-
});
|
|
533
476
|
|
|
534
477
|
// 3.6 插入节点
|
|
535
478
|
remainingItems.splice.apply(remainingItems, [insertIndex, 0].concat(_toConsumableArray(updatedNodesToMove)));
|
|
536
479
|
|
|
537
480
|
// 3.7 重新计算 order
|
|
538
481
|
reorderItems(remainingItems);
|
|
539
|
-
console.log('[ColumnConfigTable] 移动完成后的数组:', {
|
|
540
|
-
totalCount: remainingItems.length,
|
|
541
|
-
items: remainingItems.map(function (n) {
|
|
542
|
-
return {
|
|
543
|
-
id: n.id,
|
|
544
|
-
headerName: n.headerName,
|
|
545
|
-
parentId: n.parentId,
|
|
546
|
-
level: n.level,
|
|
547
|
-
order: n.order
|
|
548
|
-
};
|
|
549
|
-
})
|
|
550
|
-
});
|
|
551
482
|
updateItems(remainingItems);
|
|
552
483
|
message.success("\u5DF2\u5C06\"".concat(currentMoveNode.headerName, "\"\u79FB\u52A8\u5230\u65B0\u4F4D\u7F6E"));
|
|
553
484
|
handleCloseMoveModal();
|
|
@@ -663,25 +594,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
663
594
|
};
|
|
664
595
|
collectDescendants(draggedItem.id);
|
|
665
596
|
}
|
|
666
|
-
console.log('[ColumnConfigTable] 拖动排序:', {
|
|
667
|
-
dragIndex: dragIndex,
|
|
668
|
-
hoverIndex: hoverIndex,
|
|
669
|
-
realDragIndex: realDragIndex,
|
|
670
|
-
realHoverIndex: realHoverIndex,
|
|
671
|
-
draggedItem: {
|
|
672
|
-
id: draggedItem.id,
|
|
673
|
-
headerName: draggedItem.headerName,
|
|
674
|
-
type: draggedItem.type
|
|
675
|
-
},
|
|
676
|
-
nodesToMoveCount: nodesToMove.length,
|
|
677
|
-
nodesToMove: nodesToMove.map(function (n) {
|
|
678
|
-
return {
|
|
679
|
-
id: n.id,
|
|
680
|
-
headerName: n.headerName,
|
|
681
|
-
parentId: n.parentId
|
|
682
|
-
};
|
|
683
|
-
})
|
|
684
|
-
});
|
|
685
597
|
|
|
686
598
|
// 从原数组中移除所有要移动的节点
|
|
687
599
|
var remainingItems = newItems.filter(function (item) {
|
|
@@ -700,20 +612,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
|
|
|
700
612
|
|
|
701
613
|
// 在新位置插入所有节点
|
|
702
614
|
remainingItems.splice.apply(remainingItems, [adjustedHoverIndex, 0].concat(nodesToMove));
|
|
703
|
-
console.log('[ColumnConfigTable] 拖动完成,准备更新:', {
|
|
704
|
-
remainingItemsCount: remainingItems.length,
|
|
705
|
-
items: remainingItems.map(function (item, idx) {
|
|
706
|
-
return {
|
|
707
|
-
index: idx,
|
|
708
|
-
id: item.id,
|
|
709
|
-
type: item.type,
|
|
710
|
-
headerName: item.headerName,
|
|
711
|
-
field: item.field,
|
|
712
|
-
order: item.order,
|
|
713
|
-
parentId: item.parentId
|
|
714
|
-
};
|
|
715
|
-
})
|
|
716
|
-
});
|
|
717
615
|
|
|
718
616
|
// 使用 updateItems 来同时更新本地状态和通知父组件
|
|
719
617
|
updateItems(remainingItems);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnSetting.d.ts","sourceRoot":"","sources":["ColumnSetting.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAiBzE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAgB,MAAM,kBAAkB,CAAC;AAe7E,UAAU,kBAAkB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ColumnSetting.d.ts","sourceRoot":"","sources":["ColumnSetting.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAiBzE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAgB,MAAM,kBAAkB,CAAC;AAe7E,UAAU,kBAAkB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA0tB/C,CAAC;AAEF,eAAe,aAAa,CAAC"}
|