pds-dev-kit-web-test 2.5.238 → 2.5.240
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.
|
@@ -116,7 +116,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
116
116
|
var newblock = bulkBlockIds.length > 0
|
|
117
117
|
? (0, group_1.addBulkToTarget)(pedigreeState, editingGroupBlock, bulkBlockIds)
|
|
118
118
|
: pedigreeState;
|
|
119
|
-
console.log('bulkBlockIds', bulkBlockIds);
|
|
120
119
|
(0, react_1.useImperativeHandle)(ref, function () {
|
|
121
120
|
return {
|
|
122
121
|
selectCB: function (blockId) {
|
|
@@ -259,6 +258,8 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
259
258
|
return;
|
|
260
259
|
}
|
|
261
260
|
var bulks_1 = getCollisionGroupIds(selectedCBId);
|
|
261
|
+
var newBulksSet = new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), bulks_1, true));
|
|
262
|
+
var newBulks = Array.from(newBulksSet);
|
|
262
263
|
if (selectedBlockId) {
|
|
263
264
|
bulks_1.push(selectedBlockId);
|
|
264
265
|
}
|
|
@@ -293,7 +294,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
293
294
|
});
|
|
294
295
|
return;
|
|
295
296
|
}
|
|
296
|
-
}, [selectedBlockId, shortcutKeyMode, sectionActionHandler, setSelectedBlockId]);
|
|
297
|
+
}, [selectedBlockId, shortcutKeyMode, sectionActionHandler, bulkBlockIds, setSelectedBlockId]);
|
|
297
298
|
var makeAllInOneGroup = function () {
|
|
298
299
|
var _a, _b, _c, _d, _e;
|
|
299
300
|
var allRootChildIds = (0, group_1.findDirectChildrenBlockIds)(pedigreeState, editingGroupBlock);
|
|
@@ -392,7 +393,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
392
393
|
};
|
|
393
394
|
var breakpoint = device === 'MOBILE' ? 'sm' : 'lg';
|
|
394
395
|
var onClickCB = function (id) {
|
|
395
|
-
var _a, _b, _c, _d, _e, _f;
|
|
396
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
396
397
|
var blockId = (0, group_1.formatCbIdToBlockId)(id);
|
|
397
398
|
if (!isEditMode) {
|
|
398
399
|
return;
|
|
@@ -401,6 +402,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
401
402
|
if (selectedBlockId === editingGroupBlock) {
|
|
402
403
|
return [blockId];
|
|
403
404
|
}
|
|
405
|
+
if (selectedBlockId === 'BULK') {
|
|
406
|
+
return [blockId];
|
|
407
|
+
}
|
|
404
408
|
return selectedBlockId ? [selectedBlockId, blockId] : [blockId];
|
|
405
409
|
})();
|
|
406
410
|
if (shortcutKeyMode === 'BULK_SELECT') {
|
|
@@ -440,6 +444,24 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
440
444
|
var bulks = getCollisionGroupIds(id);
|
|
441
445
|
var newBulksSet = new Set(__spreadArray(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true), bulks, true));
|
|
442
446
|
var newBulks = Array.from(newBulksSet);
|
|
447
|
+
if (newBulks.length === 1) {
|
|
448
|
+
var blockId_1 = newBulks[0];
|
|
449
|
+
setSelectedBlockId(blockId_1);
|
|
450
|
+
setBulkBlockIds([]);
|
|
451
|
+
sectionActionHandler &&
|
|
452
|
+
sectionActionHandler({
|
|
453
|
+
type: '@CUSTOMSECTION/BLOCK_CLICKED',
|
|
454
|
+
payload: {
|
|
455
|
+
block: {
|
|
456
|
+
type: 'COMPONENT_BLOCK',
|
|
457
|
+
blockId: blockId_1,
|
|
458
|
+
cbId: id,
|
|
459
|
+
workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _b !== void 0 ? _b : 'NOT-FOUND'
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
});
|
|
463
|
+
return;
|
|
464
|
+
}
|
|
443
465
|
setBulkBlockIds(newBulks);
|
|
444
466
|
setSelectedBlockId(null);
|
|
445
467
|
var newBulkCBIds = newBulks
|
|
@@ -461,7 +483,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
461
483
|
type: 'BULK',
|
|
462
484
|
blockId: 'BULK',
|
|
463
485
|
childrenBlockIds: newBulks,
|
|
464
|
-
workDir: (
|
|
486
|
+
workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _c !== void 0 ? _c : 'NOT-FOUND',
|
|
465
487
|
childrenCBIds: childrenCBIds
|
|
466
488
|
}
|
|
467
489
|
}
|
|
@@ -480,12 +502,13 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
480
502
|
blockId: blockId,
|
|
481
503
|
type: blockType,
|
|
482
504
|
cbId: id,
|
|
483
|
-
workDir: (
|
|
505
|
+
workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _d !== void 0 ? _d : 'NOT-FOUND'
|
|
484
506
|
}
|
|
485
507
|
}
|
|
486
508
|
});
|
|
487
509
|
return;
|
|
488
510
|
}
|
|
511
|
+
// NOTE: 아래 케이스 없을듯 함수 분리되어서,
|
|
489
512
|
if (blockType === 'GROUP_BLOCK') {
|
|
490
513
|
sectionActionHandler &&
|
|
491
514
|
sectionActionHandler({
|
|
@@ -494,9 +517,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
494
517
|
block: {
|
|
495
518
|
blockId: blockId,
|
|
496
519
|
type: 'GROUP_BLOCK',
|
|
497
|
-
workDir: (
|
|
498
|
-
childrenBlockIds: (
|
|
499
|
-
childrenCBIds: (
|
|
520
|
+
workDir: (_e = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _e !== void 0 ? _e : 'NOT-FOUND',
|
|
521
|
+
childrenBlockIds: (_f = (0, group_1.findDirectChildrenBlockIds)(newblock, blockId)) !== null && _f !== void 0 ? _f : [],
|
|
522
|
+
childrenCBIds: (_g = (0, group_1.findDirectChildrenCbIds)(newblock, blockId)) !== null && _g !== void 0 ? _g : []
|
|
500
523
|
}
|
|
501
524
|
}
|
|
502
525
|
});
|
|
@@ -508,11 +531,14 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
|
508
531
|
if (!isEditMode) {
|
|
509
532
|
return;
|
|
510
533
|
}
|
|
511
|
-
if (
|
|
512
|
-
|
|
513
|
-
setBulkBlockIds([]);
|
|
514
|
-
}
|
|
534
|
+
if (selectedBlockId === 'BULK' && blockId !== selectedBlockId) {
|
|
535
|
+
setBulkBlockIds([]);
|
|
515
536
|
}
|
|
537
|
+
// if (!['COLLISION_SELECT', 'BULK_SELECT'].includes(shortcutKeyMode ?? '')) {
|
|
538
|
+
// if (blockId !== selectedBlockId) {
|
|
539
|
+
// setBulkBlockIds([]);
|
|
540
|
+
// }
|
|
541
|
+
// }
|
|
516
542
|
setSelectedBlockId(blockId);
|
|
517
543
|
if (sectionActionHandler) {
|
|
518
544
|
sectionActionHandler({
|