Merge branch 'UC-204' into 'master'

[WIP] Фикс отображения символов

See merge request andrusyakka/urban-couscous!262
This commit is contained in:
Vasiliy Gavrilin
2023-01-23 15:15:39 +00:00

View File

@@ -70,9 +70,9 @@ export default {
this.setActiveButton(); this.setActiveButton();
return { return {
"--bg-color-status": this.activeButton?.color, "--bg-color-status": this.activeButton?.color,
"--text-status": !this.template.item?.label "--text-status": !this.template.item?.symbol
? this.activeButton?.text ? this.activeButton?.text
: this.template.item.symbol, : this.template.item?.symbol,
}; };
}, },
}, },
@@ -157,7 +157,7 @@ export default {
if (resStart || resMiddle || resEnd) if (resStart || resMiddle || resEnd)
return { return {
"set-template": !!this.template.item?.label, "set-template": !!this.template.item?.label,
status: !!this.activeButton && !this.template.item, status: !!this.activeButton,
"set-date": !this.activeButton, "set-date": !this.activeButton,
}; };
}, },