@touchpoll/tp-survey 0.0.4 → 0.0.6
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/esm2022/lib/component/answer/answer.additional/answer.additional.component.mjs +3 -3
- package/esm2022/lib/component/answer/answer.ms/answer.ms.component.mjs +3 -3
- package/esm2022/lib/component/answer/answer.ol/answer.ol.component.mjs +6 -5
- package/esm2022/lib/component/answer/answer.sl/answer.sl.component.mjs +3 -3
- package/esm2022/lib/component/answer/answer.ss/answer.ss.component.mjs +3 -3
- package/esm2022/lib/component/answer/container.answer/container.answer.component.mjs +4 -4
- package/esm2022/lib/component/answer/container.answer/container.answer.validator.mjs +8 -2
- package/esm2022/lib/component/question.caption/question.caption.component.mjs +3 -3
- package/esm2022/lib/component/survey.play/survey.play.component.mjs +3 -3
- package/esm2022/lib/component/survey.question.preview/survey.question.preview.component.mjs +3 -3
- package/esm2022/lib/pipe/multi.lang.object.to.html/multi.lang.object.to.html.pipe.mjs +8 -2
- package/fesm2022/touchpoll-tp-survey.mjs +36 -23
- package/fesm2022/touchpoll-tp-survey.mjs.map +1 -1
- package/lib/component/answer/container.answer/container.answer.validator.d.ts +1 -1
- package/package.json +1 -1
- package/styles/survey.mixins.scss +6 -0
|
@@ -8,15 +8,21 @@ export class MultiLangObjectToHtmlPipe {
|
|
|
8
8
|
this._logic = _logic;
|
|
9
9
|
}
|
|
10
10
|
transform(caption, language, logicCaptions) {
|
|
11
|
+
//сначала проверим есть ли текст у которого выполняется Expression.
|
|
11
12
|
if (Array.isArray(logicCaptions)) {
|
|
12
13
|
const correctLogicCaption = logicCaptions.find(logicCaption => this._logic.executeLogic(logicCaption.Expression));
|
|
13
14
|
const correctLogicCaptionLangObj = correctLogicCaption?.MultiLangCaptions.find(capt => capt.lang === language);
|
|
14
15
|
const text = correctLogicCaptionLangObj?._SYS_CaptionHTML ?? correctLogicCaptionLangObj?.CaptionHtml ?? '';
|
|
15
|
-
|
|
16
|
+
//если есть хоть какой-то текст - показываем его
|
|
17
|
+
if ((text ?? '').trim().length > 0) {
|
|
18
|
+
return this._sanitizer.bypassSecurityTrustHtml(text);
|
|
19
|
+
}
|
|
16
20
|
}
|
|
21
|
+
//если основой текст не указан, выходим
|
|
17
22
|
if (!Array.isArray(caption)) {
|
|
18
23
|
return '';
|
|
19
24
|
}
|
|
25
|
+
//ищем основной текс с нужным языком
|
|
20
26
|
const langObj = caption.find(capt => capt.lang === language);
|
|
21
27
|
const text = langObj?._SYS_CaptionHTML ?? langObj?.CaptionHtml ?? '';
|
|
22
28
|
return this._sanitizer.bypassSecurityTrustHtml(text);
|
|
@@ -31,4 +37,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.6", ngImpor
|
|
|
31
37
|
standalone: true
|
|
32
38
|
}]
|
|
33
39
|
}], ctorParameters: () => [{ type: i1.DomSanitizer }, { type: i2.TpSurveyLogicService }] });
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGkubGFuZy5vYmplY3QudG8uaHRtbC5waXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHAuc3VydmV5L3NyYy9saWIvcGlwZS9tdWx0aS5sYW5nLm9iamVjdC50by5odG1sL211bHRpLmxhbmcub2JqZWN0LnRvLmh0bWwucGlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsSUFBSSxFQUFnQixNQUFNLGVBQWUsQ0FBQzs7OztBQVNsRCxNQUFNLE9BQU8seUJBQXlCO0lBRXBDLFlBQTZCLFVBQXdCLEVBQW1CLE1BQTRCO1FBQXZFLGVBQVUsR0FBVixVQUFVLENBQWM7UUFBbUIsV0FBTSxHQUFOLE1BQU0sQ0FBc0I7SUFDcEcsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUFrQyxFQUFFLFFBQWdCLEVBQUUsYUFBNEM7UUFDMUcsbUVBQW1FO1FBQ25FLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsRUFBQyxDQUFDO1lBQ2hDLE1BQU0sbUJBQW1CLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2xILE1BQU0sMEJBQTBCLEdBQUcsbUJBQW1CLEVBQUUsaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxRQUFRLENBQUMsQ0FBQztZQUMvRyxNQUFNLElBQUksR0FBSSwwQkFBMEIsRUFBRSxnQkFBZ0IsSUFBSSwwQkFBMEIsRUFBRSxXQUFXLElBQUksRUFBRSxDQUFDO1lBRTVHLGdEQUFnRDtZQUNoRCxJQUFJLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUMsQ0FBQztnQkFDbEMsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3ZELENBQUM7UUFDSCxDQUFDO1FBRUQsdUNBQXVDO1FBQ3ZDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDNUIsT0FBTyxFQUFFLENBQUE7UUFDWCxDQUFDO1FBRUQsb0NBQW9DO1FBQ3BDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLFFBQVEsQ0FBQyxDQUFDO1FBQzdELE1BQU0sSUFBSSxHQUFJLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxPQUFPLEVBQUUsV0FBVyxJQUFJLEVBQUUsQ0FBQztRQUN0RSxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkQsQ0FBQzs4R0EzQlUseUJBQXlCOzRHQUF6Qix5QkFBeUI7OzJGQUF6Qix5QkFBeUI7a0JBSnJDLElBQUk7bUJBQUM7b0JBQ0osSUFBSSxFQUFFLHVCQUF1QjtvQkFDN0IsVUFBVSxFQUFFLElBQUk7aUJBQ2pCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtQaXBlLCBQaXBlVHJhbnNmb3JtfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtEb21TYW5pdGl6ZXIsIFNhZmVIdG1sfSBmcm9tICdAYW5ndWxhci9wbGF0Zm9ybS1icm93c2VyJztcclxuaW1wb3J0IHtJZGJMb2dpY0NhcHRpb25PYmplY3QsIElkYk11bHRpbGFuZ09iamVjdH0gZnJvbSAnLi4vLi4vdHAuc3VydmV5LmludGVyZmFjZSc7XHJcbmltcG9ydCB7VHBTdXJ2ZXlMb2dpY1NlcnZpY2V9IGZyb20gJy4uLy4uL2NvcmUvdHAuc3VydmV5LmxvZ2ljL3RwLnN1cnZleS5sb2dpYy5zZXJ2aWNlJztcclxuXHJcbkBQaXBlKHtcclxuICBuYW1lOiAnbXVsdGlMYW5nT2JqZWN0VG9IdG1sJyxcclxuICBzdGFuZGFsb25lOiB0cnVlXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBNdWx0aUxhbmdPYmplY3RUb0h0bWxQaXBlIGltcGxlbWVudHMgUGlwZVRyYW5zZm9ybSB7XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgX3Nhbml0aXplcjogRG9tU2FuaXRpemVyLCBwcml2YXRlIHJlYWRvbmx5IF9sb2dpYzogVHBTdXJ2ZXlMb2dpY1NlcnZpY2UpIHtcclxuICB9XHJcblxyXG4gIHRyYW5zZm9ybShjYXB0aW9uOiBBcnJheTxJZGJNdWx0aWxhbmdPYmplY3Q+LCBsYW5ndWFnZTogbnVtYmVyLCBsb2dpY0NhcHRpb25zPzogQXJyYXk8SWRiTG9naWNDYXB0aW9uT2JqZWN0Pik6IFNhZmVIdG1sIHtcclxuICAgIC8v0YHQvdCw0YfQsNC70LAg0L/RgNC+0LLQtdGA0LjQvCDQtdGB0YLRjCDQu9C4INGC0LXQutGB0YIg0YMg0LrQvtGC0L7RgNC+0LPQviDQstGL0L/QvtC70L3Rj9C10YLRgdGPIEV4cHJlc3Npb24uXHJcbiAgICBpZiAoQXJyYXkuaXNBcnJheShsb2dpY0NhcHRpb25zKSl7XHJcbiAgICAgIGNvbnN0IGNvcnJlY3RMb2dpY0NhcHRpb24gPSBsb2dpY0NhcHRpb25zLmZpbmQobG9naWNDYXB0aW9uID0+IHRoaXMuX2xvZ2ljLmV4ZWN1dGVMb2dpYyhsb2dpY0NhcHRpb24uRXhwcmVzc2lvbikpO1xyXG4gICAgICBjb25zdCBjb3JyZWN0TG9naWNDYXB0aW9uTGFuZ09iaiA9IGNvcnJlY3RMb2dpY0NhcHRpb24/Lk11bHRpTGFuZ0NhcHRpb25zLmZpbmQoY2FwdCA9PiBjYXB0LmxhbmcgPT09IGxhbmd1YWdlKTtcclxuICAgICAgY29uc3QgdGV4dCAgPSBjb3JyZWN0TG9naWNDYXB0aW9uTGFuZ09iaj8uX1NZU19DYXB0aW9uSFRNTCA/PyBjb3JyZWN0TG9naWNDYXB0aW9uTGFuZ09iaj8uQ2FwdGlvbkh0bWwgPz8gJyc7XHJcblxyXG4gICAgICAvL9C10YHQu9C4INC10YHRgtGMINGF0L7RgtGMINC60LDQutC+0Lkt0YLQviDRgtC10LrRgdGCIC0g0L/QvtC60LDQt9GL0LLQsNC10Lwg0LXQs9C+XHJcbiAgICAgIGlmICgodGV4dCA/PyAnJykudHJpbSgpLmxlbmd0aCA+IDApe1xyXG4gICAgICAgIHJldHVybiB0aGlzLl9zYW5pdGl6ZXIuYnlwYXNzU2VjdXJpdHlUcnVzdEh0bWwodGV4dCk7XHJcbiAgICAgIH1cclxuICAgIH1cclxuXHJcbiAgICAvL9C10YHQu9C4INC+0YHQvdC+0LLQvtC5INGC0LXQutGB0YIg0L3QtSDRg9C60LDQt9Cw0L0sINCy0YvRhdC+0LTQuNC8XHJcbiAgICBpZiAoIUFycmF5LmlzQXJyYXkoY2FwdGlvbikpIHtcclxuICAgICAgcmV0dXJuICcnXHJcbiAgICB9XHJcblxyXG4gICAgLy/QuNGJ0LXQvCDQvtGB0L3QvtCy0L3QvtC5INGC0LXQutGBINGBINC90YPQttC90YvQvCDRj9C30YvQutC+0LxcclxuICAgIGNvbnN0IGxhbmdPYmogPSBjYXB0aW9uLmZpbmQoY2FwdCA9PiBjYXB0LmxhbmcgPT09IGxhbmd1YWdlKTtcclxuICAgIGNvbnN0IHRleHQgID0gbGFuZ09iaj8uX1NZU19DYXB0aW9uSFRNTCA/PyBsYW5nT2JqPy5DYXB0aW9uSHRtbCA/PyAnJztcclxuICAgIHJldHVybiB0aGlzLl9zYW5pdGl6ZXIuYnlwYXNzU2VjdXJpdHlUcnVzdEh0bWwodGV4dCk7XHJcbiAgfVxyXG5cclxufVxyXG4iXX0=
|