Skip to content

Commit 4e23cdf

Browse files
committed
Merge branch 'feat/MultipleObjectTree' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into feat/MultipleObjectTree
2 parents 0d4e3d7 + a1708d5 commit 4e23cdf

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

app/components/Viewer/ObjectTree/Layout.vue

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ watch(
3131
() => additionalViews.value.length,
3232
(newLength) => {
3333
if (newLength > 0 && rowHeights.value.length !== newLength) {
34-
rowHeights.value = Array.from({ length: newLength }).fill(
35-
PERCENT_100 / newLength,
36-
);
34+
rowHeights.value = Array.from({ length: newLength }).fill(PERCENT_100 / newLength);
3735
}
3836
},
3937
{ immediate: true },
@@ -149,11 +147,7 @@ function onVerticalResizeStart(event, index) {
149147
</TreeBox>
150148
</div>
151149

152-
<div
153-
v-if="additionalViews.length > 0"
154-
class="column-separator"
155-
@mousedown="onResizeStart"
156-
/>
150+
<div v-if="additionalViews.length > 0" class="column-separator" @mousedown="onResizeStart" />
157151

158152
<div
159153
v-if="additionalViews.length > 0"
@@ -166,8 +160,7 @@ function onVerticalResizeStart(event, index) {
166160
<div
167161
class="view-wrapper"
168162
:class="{
169-
'drag-over':
170-
draggedIndex !== undefined && draggedIndex !== index + 1,
163+
'drag-over': draggedIndex !== undefined && draggedIndex !== index + 1,
171164
}"
172165
:style="{ flex: `0 0 ${rowHeights[index]}%` }"
173166
@dragover="onDragOver"
@@ -180,10 +173,7 @@ function onVerticalResizeStart(event, index) {
180173
@close="treeviewStore.closeView(index + 1)"
181174
@dragstart="onDragStart(index + 1)"
182175
>
183-
<ModelComponentsView
184-
:id="view.id"
185-
@show-menu="emit('show-menu', $event)"
186-
/>
176+
<ModelComponentsView :id="view.id" @show-menu="emit('show-menu', $event)" />
187177
</TreeBox>
188178
</div>
189179
<div
@@ -196,9 +186,7 @@ function onVerticalResizeStart(event, index) {
196186
<div
197187
class="total-resizer"
198188
@mousedown="
199-
additionalViews.length > 0
200-
? onAdditionalResizeStart($event)
201-
: onResizeStart($event)
189+
additionalViews.length > 0 ? onAdditionalResizeStart($event) : onResizeStart($event)
202190
"
203191
/>
204192
</div>

app/components/Viewer/ObjectTree/Views/ModelComponentsView.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ const dataStyleStore = useDataStyleStore();
1515
const hybridViewerStore = useHybridViewerStore();
1616
1717
const items = dataStore.refFormatedMeshComponents(toRef(() => id));
18-
const mesh_components_selection = dataStyleStore.visibleMeshComponents(
19-
toRef(() => id),
20-
);
18+
const mesh_components_selection = dataStyleStore.visibleMeshComponents(toRef(() => id));
2119
2220
const {
2321
search,

0 commit comments

Comments
 (0)