@contrail/document-generation 2.0.24 → 2.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -21,7 +21,7 @@ class FrameGenerator {
|
|
|
21
21
|
clipContent = frameTemplate.document.clipContent;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
let frame = new frame_1.BoardFrame(dataGroup.name, util_1.ObjectUtil.cloneDeep(framePosition), frameSize, style, clipContent);
|
|
24
|
+
let frame = new frame_1.BoardFrame((frameTitle || dataGroup.name), util_1.ObjectUtil.cloneDeep(framePosition), frameSize, style, clipContent);
|
|
25
25
|
frame = this.generateFrameContentForGroup(frame, dataGroup, template, frameTemplate, frameTitle);
|
|
26
26
|
return frame;
|
|
27
27
|
}
|
|
@@ -23,6 +23,7 @@ class ShowcaseFrameGenerator {
|
|
|
23
23
|
return this.getLeafGroupsFromGroups(groupStructure.rootGroup.subGroups, groupStructure.depth, 0);
|
|
24
24
|
}
|
|
25
25
|
static getLeafGroupsFromGroups(groups, totalDepth, currentDepth, groupName = null) {
|
|
26
|
+
const currentGroupName = groupName;
|
|
26
27
|
const leafGroups = [];
|
|
27
28
|
for (let group of groups) {
|
|
28
29
|
if (currentDepth === 0) {
|
|
@@ -30,12 +31,11 @@ class ShowcaseFrameGenerator {
|
|
|
30
31
|
}
|
|
31
32
|
if (currentDepth === totalDepth) {
|
|
32
33
|
group.name = (!groupName) ? group.name : (groupName + ' / ' + group.name);
|
|
33
|
-
;
|
|
34
34
|
leafGroups.push(group);
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
37
|
if (currentDepth < totalDepth - 1)
|
|
38
|
-
groupName = (!
|
|
38
|
+
groupName = (!currentGroupName) ? group.name : (currentGroupName + ' / ' + group.name);
|
|
39
39
|
leafGroups.push(...this.getLeafGroupsFromGroups(group.subGroups, totalDepth, currentDepth + 1, groupName));
|
|
40
40
|
}
|
|
41
41
|
}
|