@contrail/document-generation 2.1.22 → 2.1.23
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/lib/frames/frame-generator.js +1 -1
- package/lib/util/document-dynamic-text-element-util.d.ts +1 -1
- package/lib/util/document-dynamic-text-element-util.js +3 -3
- package/lib/util/document-text-element-util.d.ts +1 -0
- package/lib/util/document-text-element-util.js +20 -2
- package/package.json +1 -1
|
@@ -132,7 +132,7 @@ class FrameGenerator {
|
|
|
132
132
|
documentElement.text = documentElement.text.replace('{{dataGroup.name}}', dataGroup.name);
|
|
133
133
|
}
|
|
134
134
|
if (document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.isDynamicText(documentElement)) {
|
|
135
|
-
document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.handleDynamicText(documentElement, dataGroup, frameTitle);
|
|
135
|
+
document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.handleDynamicText(documentElement, dataGroup, frameTitle, element);
|
|
136
136
|
}
|
|
137
137
|
if (documentElement.elementIds) {
|
|
138
138
|
documentElement.elementIds = [elementMapping[documentElement.elementIds[0]]];
|
|
@@ -4,6 +4,6 @@ export declare class DocumentDynamicTextElementUtil {
|
|
|
4
4
|
static typeMap: any;
|
|
5
5
|
static propertyMapByType: any;
|
|
6
6
|
static isDynamicText(element: any): any;
|
|
7
|
-
static handleDynamicText(element: DocumentElement, dataGroup: DataGroup, frameTitle
|
|
7
|
+
static handleDynamicText(element: DocumentElement, dataGroup: DataGroup, frameTitle: any, templateElement: DocumentElement): void;
|
|
8
8
|
static setTypeMap(typeMap: any): void;
|
|
9
9
|
}
|
|
@@ -8,7 +8,7 @@ class DocumentDynamicTextElementUtil {
|
|
|
8
8
|
static isDynamicText(element) {
|
|
9
9
|
return element.type === 'text' && element.propertyBindings && element.propertyBindingsMetaData;
|
|
10
10
|
}
|
|
11
|
-
static handleDynamicText(element, dataGroup, frameTitle = null) {
|
|
11
|
+
static handleDynamicText(element, dataGroup, frameTitle = null, templateElement) {
|
|
12
12
|
var _a, _b, _c;
|
|
13
13
|
const propertyBindingsText = element.propertyBindings.text;
|
|
14
14
|
let propertyLevel = (_a = element.propertyBindingsMetaData) === null || _a === void 0 ? void 0 : _a.propertyLevel;
|
|
@@ -41,8 +41,8 @@ class DocumentDynamicTextElementUtil {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
let text = documents_1.DynamicTextUtil.getDynamicTextValue(element, property, propertyLevel, frame, componentModels);
|
|
44
|
-
if (((_c =
|
|
45
|
-
const styleDefinition = document_text_element_util_1.DocumentTextElementUtil.extractStyleFromInline(
|
|
44
|
+
if (((_c = templateElement.text) === null || _c === void 0 ? void 0 : _c.toString().indexOf('</')) > -1) {
|
|
45
|
+
const styleDefinition = document_text_element_util_1.DocumentTextElementUtil.extractStyleFromInline(templateElement.text);
|
|
46
46
|
text = document_text_element_util_1.DocumentTextElementUtil.applyInLineStyling(text, styleDefinition);
|
|
47
47
|
}
|
|
48
48
|
element.text = text;
|
|
@@ -9,4 +9,5 @@ export declare class DocumentTextElementUtil {
|
|
|
9
9
|
static extractFontFromHTML(text: any): any;
|
|
10
10
|
static extractTextStyleItalicFromHTML(text: any): string;
|
|
11
11
|
static extractTextStyleStrikethroughFromHTML(text: any): string;
|
|
12
|
+
static extractTextAlignFromHTML(text: any): string;
|
|
12
13
|
}
|
|
@@ -36,7 +36,7 @@ class DocumentTextElementUtil {
|
|
|
36
36
|
return element;
|
|
37
37
|
}
|
|
38
38
|
static applyInLineStyling(text, style) {
|
|
39
|
-
var _a, _b, _c, _d, _e;
|
|
39
|
+
var _a, _b, _c, _d, _e, _f;
|
|
40
40
|
let formattedText = text;
|
|
41
41
|
if ((style === null || style === void 0 ? void 0 : style.font.weight) === 'bold') {
|
|
42
42
|
formattedText = `<strong>${formattedText}</strong>`;
|
|
@@ -63,7 +63,12 @@ class DocumentTextElementUtil {
|
|
|
63
63
|
if ((_e = style === null || style === void 0 ? void 0 : style.font) === null || _e === void 0 ? void 0 : _e.italic) {
|
|
64
64
|
formattedText = `<em>${formattedText}</em>`;
|
|
65
65
|
}
|
|
66
|
-
|
|
66
|
+
if ((_f = style === null || style === void 0 ? void 0 : style.text) === null || _f === void 0 ? void 0 : _f.align) {
|
|
67
|
+
formattedText = `<p style="text-align: ${style.text.align};">${formattedText}</p>`;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
formattedText = `<p>${formattedText}</p>`;
|
|
71
|
+
}
|
|
67
72
|
return formattedText;
|
|
68
73
|
}
|
|
69
74
|
static extractStyleFromInline(text) {
|
|
@@ -98,6 +103,10 @@ class DocumentTextElementUtil {
|
|
|
98
103
|
if (font) {
|
|
99
104
|
style.font.family = font;
|
|
100
105
|
}
|
|
106
|
+
const textAlign = this.extractTextAlignFromHTML(text);
|
|
107
|
+
if (textAlign && ['left', 'right', 'center'].includes(textAlign)) {
|
|
108
|
+
style.text.align = textAlign;
|
|
109
|
+
}
|
|
101
110
|
return style;
|
|
102
111
|
}
|
|
103
112
|
static extractFontSizeFromHTML(text) {
|
|
@@ -144,5 +153,14 @@ class DocumentTextElementUtil {
|
|
|
144
153
|
return 'strikethrough';
|
|
145
154
|
}
|
|
146
155
|
}
|
|
156
|
+
static extractTextAlignFromHTML(text) {
|
|
157
|
+
let regex = /text-align:\s*(.*?);/;
|
|
158
|
+
let match = text.match(regex);
|
|
159
|
+
if (match === null || match === void 0 ? void 0 : match.length) {
|
|
160
|
+
let textAlign = match[1];
|
|
161
|
+
textAlign = textAlign.replace(/['"]+/g, '');
|
|
162
|
+
return textAlign;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
147
165
|
}
|
|
148
166
|
exports.DocumentTextElementUtil = DocumentTextElementUtil;
|