Skip to content

Commit f2e2f94

Browse files
committed
refactor ResultModal.vue for improved readability and structure; enhance DxfViewerComponent integration with dynamic keys
1 parent 4f16db7 commit f2e2f94

File tree

1 file changed

+33
-8
lines changed

1 file changed

+33
-8
lines changed

components/ResultModal.vue

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,18 @@
3535
</div>
3636

3737
<div class="modal__wrapper">
38-
<div v-if="isHaveError" :class="placeholderClasses" class="modal__placeholder">
38+
<div
39+
v-if="isHaveError"
40+
:class="placeholderClasses"
41+
class="modal__placeholder"
42+
>
3943
Err
4044
</div>
4145
<template v-else-if="resultModalData.isMultiSheet">
4246
<DxfViewerComponent
47+
:key="`dxf-${activePart}-${isFullScreen}`"
4348
:dxfUrl="resultModalData.dxfs[activePart]"
49+
:isFullScreen="isFullScreen"
4450
:class="displayClasses"
4551
class="modal__display"
4652
/>
@@ -57,13 +63,22 @@
5763
</template>
5864
<DxfViewerComponent
5965
v-else
66+
:key="`dxf-0-${isFullScreen}`"
6067
:dxfUrl="resultModalData.dxfs[0]"
68+
:isFullScreen="isFullScreen"
6169
:class="displayClasses"
6270
class="modal__display"
6371
/>
64-
<MainButton v-if="!isHaveError" label="fullscreen" :size="sizeType.s" :theme="themeType.primary"
65-
:isLabelShow="false" :icon="iconType.fullscreen" @click="updateFullScreen"
66-
class="modal__fullscreen" />
72+
<MainButton
73+
v-if="!isHaveError"
74+
label="fullscreen"
75+
:size="sizeType.s"
76+
:theme="themeType.primary"
77+
:isLabelShow="false"
78+
:icon="iconType.fullscreen"
79+
@click="updateFullScreen"
80+
class="modal__fullscreen"
81+
/>
6782
</div>
6883
<div class="modal__name modal__info info">
6984
<template v-if="isHaveError">
@@ -83,8 +98,14 @@
8398
{{ name }}
8499
</template>
85100
</div>
86-
<div v-if="!isHaveError" class="modal__info info">
87-
<span v-if="resultModalData.requested === resultModalData.placed" class="info__label">
101+
<div
102+
v-if="!isHaveError"
103+
class="modal__info info"
104+
>
105+
<span
106+
v-if="resultModalData.requested === resultModalData.placed"
107+
class="info__label"
108+
>
88109
All details are placed
89110
</span>
90111
<template v-else>
@@ -116,8 +137,12 @@
116137
:size="sizeType.s"
117138
:theme="themeType.primary"
118139
/>
119-
<MainButton label="Try again" :size="sizeType.s" :theme="themeType.secondary"
120-
@click="resultDialog = false" />
140+
<MainButton
141+
label="Try again"
142+
:size="sizeType.s"
143+
:theme="themeType.secondary"
144+
@click="resultDialog = false"
145+
/>
121146
</div>
122147
</div>
123148
</DialogWrapper>

0 commit comments

Comments
 (0)