Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Showing name of AAS in submodel list component and autoscrolling to selected AAS #97

Merged
merged 6 commits into from
Nov 13, 2024
Merged

Showing name of AAS in submodel list component and autoscrolling to selected AAS #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29235e6
Showing name of the AAS at the top of the submodel list
seicke Nov 12, 2024
067da6a
Fix for SubmodelList
seicke Nov 13, 2024
8b40285
Fix
seicke Nov 13, 2024
2c3e218
Adds fix for mobile
aaronzi Nov 13, 2024
c72e8ab
Adds auto-scrolling to AASList
aaronzi Nov 13, 2024
b7820a5
Small fix for mobile scroll
aaronzi Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion aas-web-ui/src/components/AASTreeview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@
<v-card color="rgba(0,0,0,0)" elevation="0">
<v-card-title style="padding: 15px 16px 16px">
<!-- TODO: Add Searchfield to filter the Treeview -->
AAS Treeview
<v-row align="center">
<v-col cols="auto">
<span>AAS Treeview</span>
</v-col>
<v-col v-if="nameToDisplay(SelectedAAS)" cols="auto" class="pl-1">
<v-chip size="x-small" color="primary" label border>{{
'AAS: ' + nameToDisplay(SelectedAAS)
}}</v-chip>
</v-col>
</v-row>
</v-card-title>
<v-divider></v-divider>
<v-card-text style="overflow-y: auto; height: calc(100vh - 170px)">
Expand Down
4 changes: 2 additions & 2 deletions aas-web-ui/src/components/ComponentVisualization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<v-col cols="auto">
<span>Visualization</span>
</v-col>
<v-col v-if="SelectedAAS?.idShort" cols="auto" class="pl-1">
<v-col v-if="nameToDisplay(SelectedAAS)" cols="auto" class="pl-1">
<v-chip size="x-small" color="primary" label border>{{
'AAS: ' + SelectedAAS?.idShort
'AAS: ' + nameToDisplay(SelectedAAS)
}}</v-chip>
</v-col>
</v-row>
Expand Down
4 changes: 2 additions & 2 deletions aas-web-ui/src/components/Dashboard/DashboardElement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<v-col cols="auto" class="pr-0">
<v-card-title>{{ localDashboardData.title }}</v-card-title>
</v-col>
<v-col v-if="AASData?.idShort" cols="auto" class="pl-0">
<v-chip size="x-small" color="primary" label border>{{ 'AAS: ' + AASData?.idShort }}</v-chip>
<v-col v-if="nameToDisplay(AASData)" cols="auto" class="pl-0">
<v-chip size="x-small" color="primary" label border>{{ 'AAS: ' + nameToDisplay(AASData) }}</v-chip>
</v-col>
<v-spacer></v-spacer>
<v-col cols="auto" density="compact" justify="end" class="py-0">
Expand Down
4 changes: 2 additions & 2 deletions aas-web-ui/src/components/SubmodelList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<v-col cols="auto">
<span>Submodel List</span>
</v-col>
<v-col v-if="SelectedAAS?.idShort" cols="auto" class="pl-1">
<v-col v-if="nameToDisplay(SelectedAAS)" cols="auto" class="pl-1">
<v-chip size="x-small" color="primary" label border>{{
'AAS: ' + SelectedAAS?.idShort
'AAS: ' + nameToDisplay(SelectedAAS)
}}</v-chip>
</v-col>
</v-row>
Expand Down