Skip to content

Commit

Permalink
fixes multiLanguageProperty in GenericDataVisu
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronzi committed Nov 1, 2024
1 parent 91a6fea commit 3597378
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
hide-details
:clearable="isEditable"
:readonly="!isEditable"
append-icon="mdi-delete"
:append-icon="isEditable ? 'mdi-delete' : undefined"
@click:append="removeEntry(i)"
@update:focused="setFocus($event, value)"
@keydown.enter="updateValue()">
<template #prepend-inner>
<!-- language -->
<v-chip label size="x-small" border>
<span>{{ value.language ? value.language : 'no-lang' }}</span>
<v-icon site="x-small" style="margin-right: -3px">mdi-chevron-down</v-icon>
<v-icon v-if="isEditable" site="x-small" style="margin-right: -3px">
mdi-chevron-down
</v-icon>
<!-- Menu to select the Language -->
<v-menu v-if="isEditable" activator="parent">
<v-list density="compact" class="pa-0">
Expand Down Expand Up @@ -69,7 +71,7 @@
</v-list>
<v-divider></v-divider>
<!-- Edit the MultiLanguageProperty -->
<v-list nav class="bg-elevatedCard py-0">
<v-list v-if="isEditable" nav class="bg-elevatedCard py-0">
<v-list-item>
<template #append>
<v-btn
Expand Down
6 changes: 5 additions & 1 deletion aas-web-ui/src/components/UIComponents/GenericDataVisu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
</v-expansion-panel-title>
<v-expansion-panel-text>
<GenericDataVisu
v-if="Array.isArray(submodelElement.value) && submodelElement.value.length > 0"
v-if="
Array.isArray(submodelElement.value) &&
submodelElement.value.length > 0 &&
submodelElement.modelType !== 'MultiLanguageProperty'
"
:submodel-element-data="submodelElement.value"></GenericDataVisu>
<v-list v-else nav class="px-4 pt-0 pb-0">
<!-- SubmodelELement Representation for different modelTypes -->
Expand Down

0 comments on commit 3597378

Please sign in to comment.