dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
1 changed files with 12 additions and 5 deletions
Showing only changes of commit 6afed2d73e - Show all commits

View File

@ -189,7 +189,8 @@ const calc_table = computed(() => {
<DropdownPicker type="color" :cb="setLamelleColor" name="lamelle_color"
:goto_target="new Vector3(0, lamelles_count * lamelle_height * 0.75, 0)"
:goto_cam="new Vector3(0.75, 0.75, 0.75)">
<span :style="[{ color: lamelle_text, backgroundColor: getColorHexFromRal(lamelle_color) ?? 'transparent' }]">
<span
:style="[{ color: lamelle_text, backgroundColor: getColorHexFromRal(lamelle_color) ?? 'transparent' }]">
{{ getColorNameFromRal(lamelle_color) }}
</span>
</DropdownPicker>
@ -201,7 +202,8 @@ const calc_table = computed(() => {
<DropdownPicker type="color" :cb="setPillarColor" name="pillar_color"
:goto_target="new Vector3(-fence_section * 0.5, lamelles_count * lamelle_height, 0)"
:goto_cam="new Vector3(-1, -1, 1)">
<span :style="[{ color: pillar_text, backgroundColor: getColorHexFromRal(pillar_color) ?? 'transparent' }]">
<span
:style="[{ color: pillar_text, backgroundColor: getColorHexFromRal(pillar_color) ?? 'transparent' }]">
{{ getColorNameFromRal(pillar_color) }}
</span>
</DropdownPicker>
@ -213,9 +215,14 @@ const calc_table = computed(() => {
<DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :disabled="remove_pillar"
:goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)"
:goto_cam="new Vector3(1, 2, -1)">
<input id="pillar_pattern" type="text" readonly :value="pillar_pattern" :style="{
backgroundImage: `url(${getFilename(pillar_pattern)})`
}" />
<span
:style="getFilename(pillar_pattern) ? [{
backgroundImage: `url(${getFilename(pillar_pattern)})`,
backgroundSize: 'contain',
color: 'transparent'
}] : []">
{{ pillar_pattern }}
</span>
</DropdownPicker>
</div>
</div>