bfg-common 1.5.973 → 1.5.974
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/localization/local_be.json +0 -2
- package/assets/localization/local_en.json +0 -2
- package/assets/localization/local_hy.json +0 -2
- package/assets/localization/local_kk.json +0 -2
- package/assets/localization/local_ru.json +0 -2
- package/assets/localization/local_zh.json +0 -2
- package/components/common/adapterManager/AdapterManagerNew.vue +5 -4
- package/components/common/adapterManager/addAdapterModal/AddAdapterModalNew.vue +64 -32
- package/components/common/adapterManager/ui/secondTitle/SecondTitleNew.vue +2 -2
- package/components/common/diagramMain/modals/viewSettings/viewSettings/ViewSettingsNew.vue +19 -8
- package/components/common/monitor/advanced/Advanced.vue +0 -3
- package/components/common/monitor/advanced/AdvancedNew.vue +0 -2
- package/components/common/monitor/advanced/AdvancedOld.vue +0 -2
- package/components/common/monitor/advanced/tools/Tools.vue +0 -3
- package/components/common/monitor/advanced/tools/ToolsNew.vue +0 -2
- package/components/common/monitor/advanced/tools/ToolsOld.vue +0 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue +22 -8
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalNew.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalOld.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue +3 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersNew.vue +6 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersOld.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +0 -5
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue +3 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanNew.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanOld.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue +10 -9
- package/components/common/monitor/advanced/tools/lib/config/advancedToolbar.ts +2 -2
- package/components/common/pages/backups/modals/createBackup/configuration/backupWindow/BackupWindow.vue +29 -29
- package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/MaxBandwidth.vue +69 -69
- package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options.ts +6 -6
- package/components/common/pages/backups/modals/createBackup/configuration/strategy/Strategy.vue +38 -38
- package/components/common/pages/backups/modals/createBackup/lib/models/interfaces.ts +8 -8
- package/components/common/pages/hardwareHealth/HardwareHealth.vue +0 -1
- package/components/common/pages/hardwareHealth/HardwareHealthNew.vue +6 -12
- package/components/common/pages/hardwareHealth/HardwareHealthOld.vue +0 -2
- package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue +0 -1
- package/components/common/pages/hardwareHealth/historyTestimony/GraphNew.vue +0 -17
- package/components/common/pages/hardwareHealth/historyTestimony/GraphOld.vue +0 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue +1 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/ToolsOld.vue +0 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModal.vue +1 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalNew.vue +1 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalOld.vue +0 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/Actions.vue +6 -6
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsNew.vue +2 -26
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsOld.vue +1 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/SaveOptionsModal.vue +1 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/CountersNew.vue +2 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +3 -4
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/TimespanNew.vue +2 -10
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/alertWarningTable.ts +1 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/historyTestimonyTable.ts +1 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/systemLogTable.ts +2 -2
- package/composables/useLocalStorage.ts +1 -1
- package/package.json +1 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/saveOptionsModal/SaveOptionsModal.vue +0 -81
|
@@ -3256,8 +3256,6 @@
|
|
|
3256
3256
|
"dateTimeIsoFormat": "Дата і час знаходзяцца ў фармаце ISO 8601.",
|
|
3257
3257
|
"deleteConfirmationChartOption": "Пацвярджэнне выдалення",
|
|
3258
3258
|
"deleteConfirmationChartOptionDesc": "Вы ўпэўнены, што хочаце выдаліць параметры дыяграмы \"{0}\" з \"Па змаўчанні\".",
|
|
3259
|
-
"deleteChartOption": "Выдаліць параметр дыяграмы",
|
|
3260
|
-
"deleteChartOptionDesc": "Вы ўпэўненыя, што хочаце выдаліць параметр дыяграмы «{0}» з «{1}»?",
|
|
3261
3259
|
"from": "Ад",
|
|
3262
3260
|
"memoryUsage": "Выкарыстанне памяці",
|
|
3263
3261
|
"memoryFree": "Вольная памяць",
|
|
@@ -3260,8 +3260,6 @@
|
|
|
3260
3260
|
"dateTimeIsoFormat": "Date and time are in ISO 8601 format.",
|
|
3261
3261
|
"deleteConfirmationChartOption": "Delete Confirmation",
|
|
3262
3262
|
"deleteConfirmationChartOptionDesc": "Are you sure you want to remove chart options “{0}” from “Default”.",
|
|
3263
|
-
"deleteChartOption": "Delete Chart Option",
|
|
3264
|
-
"deleteChartOptionDesc": "Are you sure you want to delete the chart option “{0}” from “{1}”.",
|
|
3265
3263
|
"from": "From",
|
|
3266
3264
|
"memoryUsage": "Memory Usage",
|
|
3267
3265
|
"memoryFree": "Memory Free",
|
|
@@ -3260,8 +3260,6 @@
|
|
|
3260
3260
|
"dateTimeIsoFormat": "Ամսաթիվը եւ ժամը ISO 8601 ձեւաչափով են:",
|
|
3261
3261
|
"deleteConfirmationChartOption": "Ջնջել հաստատումը",
|
|
3262
3262
|
"deleteConfirmationChartOptionDesc": "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել «{0}» գծապատկերի ընտրանքները «Լռակյացից»:",
|
|
3263
|
-
"deleteChartOption": "Ջնջել գծապատկերի տարբերակը",
|
|
3264
|
-
"deleteChartOptionDesc": "Վստա՞հ եք, որ ցանկանում եք ջնջել «{0}» գրաֆիկի տարբերակը «{1}»-ից։",
|
|
3265
3263
|
"from": "Ից",
|
|
3266
3264
|
"memoryUsage": "Հիշողության օգտագործում",
|
|
3267
3265
|
"memoryFree": "Ազատ հիշողություն",
|
|
@@ -3259,8 +3259,6 @@
|
|
|
3259
3259
|
"dateTimeIsoFormat": "Күн мен уақыт ISO 8601. форматында",
|
|
3260
3260
|
"deleteConfirmationChartOption": "Растауды жою",
|
|
3261
3261
|
"deleteConfirmationChartOptionDesc": "\"{0}\" диаграмма опцияларын \"Әдепкіден\" өшіргіңіз келетініне сенімдісіз бе.",
|
|
3262
|
-
"deleteChartOption": "Диаграмма опциясын жою",
|
|
3263
|
-
"deleteChartOptionDesc": "\"{1}\" ішінен \"{0}\" диаграмма опциясын жойғыңыз келетініне сенімдісіз бе.",
|
|
3264
3262
|
"from": "Бастап",
|
|
3265
3263
|
"memoryUsage": "Жадыны пайдалану",
|
|
3266
3264
|
"memoryFree": "Бос жад",
|
|
@@ -3259,8 +3259,6 @@
|
|
|
3259
3259
|
"dateTimeIsoFormat": "Дата и время в формате ISO 8601.",
|
|
3260
3260
|
"deleteConfirmationChartOption": "Подтверждение удаления",
|
|
3261
3261
|
"deleteConfirmationChartOptionDesc": "Вы уверены, что хотите удалить параметры диаграммы «{0}» из «По умолчанию»?",
|
|
3262
|
-
"deleteChartOption": "Удалить параметр диаграммы",
|
|
3263
|
-
"deleteChartOptionDesc": "Вы уверены, что хотите удалить параметр диаграммы “{0}” с “{1}”",
|
|
3264
3262
|
"from": "С",
|
|
3265
3263
|
"memoryUsage": "Использование памяти",
|
|
3266
3264
|
"memoryFree": "Свободная память",
|
|
@@ -3257,8 +3257,6 @@
|
|
|
3257
3257
|
"dateTimeIsoFormat": "日期和时间为ISO 8601格式。",
|
|
3258
3258
|
"deleteConfirmationChartOption": "删除确认",
|
|
3259
3259
|
"deleteConfirmationChartOptionDesc": "您确定要从“默认”中删除图表选项“{0}”吗?",
|
|
3260
|
-
"deleteChartOption": "删除图表选项",
|
|
3261
|
-
"deleteChartOptionDesc": "您确定要从“{1}”中删除图表选项“{0}”吗?",
|
|
3262
3260
|
"from": "从",
|
|
3263
3261
|
"memoryUsage": "内存使用情况",
|
|
3264
3262
|
"memoryFree": "可用内存",
|
|
@@ -190,7 +190,7 @@ const onShowAddAdapterModal = (): void => {
|
|
|
190
190
|
.add-adapter-view {
|
|
191
191
|
.manager-wrapper {
|
|
192
192
|
height: 100%;
|
|
193
|
-
max-height: 504px;
|
|
193
|
+
//max-height: 504px;
|
|
194
194
|
min-width: 240px;
|
|
195
195
|
width: 100%;
|
|
196
196
|
}
|
|
@@ -200,8 +200,9 @@ const onShowAddAdapterModal = (): void => {
|
|
|
200
200
|
}
|
|
201
201
|
|
|
202
202
|
:deep(.table-fixed-height) {
|
|
203
|
-
min-height:
|
|
204
|
-
|
|
203
|
+
min-height: 30px !important;
|
|
204
|
+
height: calc(100% - 37px) !important;
|
|
205
|
+
max-height: unset !important;
|
|
205
206
|
|
|
206
207
|
//.info-block-container {
|
|
207
208
|
// padding-right: 19px !important;
|
|
@@ -331,4 +332,4 @@ const onShowAddAdapterModal = (): void => {
|
|
|
331
332
|
margin-bottom: 6px;
|
|
332
333
|
}
|
|
333
334
|
}
|
|
334
|
-
</style>
|
|
335
|
+
</style>
|
|
@@ -1,34 +1,35 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
2
|
+
<div>
|
|
3
|
+
<ui-modal
|
|
4
|
+
v-if="props.show"
|
|
5
|
+
show
|
|
6
|
+
:title="localization.common.addPhysicalAdaptersToSwitch"
|
|
7
|
+
:texts="modalTextsLocal"
|
|
8
|
+
test-id="add-adapter"
|
|
9
|
+
size="md"
|
|
10
|
+
:is-disabled-accept="!props.selectedAddAdapterId"
|
|
11
|
+
@hide="onHideAddAdapterModal"
|
|
12
|
+
@submit="onAddSelectedAdapters"
|
|
13
|
+
>
|
|
14
|
+
<template #content>
|
|
15
|
+
<div class="add-adapter-modal-content">
|
|
16
|
+
<common-adapter-manager
|
|
17
|
+
:is-active="true"
|
|
18
|
+
:is-dark-mode="props.isDarkMode"
|
|
19
|
+
:full-mode="false"
|
|
20
|
+
:is-add-modal="true"
|
|
21
|
+
:adapters="props.adapters"
|
|
22
|
+
:existing-adapters-for-adding="props.existingAdaptersAsText"
|
|
23
|
+
:selected-add-adapter-id="props.selectedAddAdapterId"
|
|
24
|
+
test-id="adapter-manager"
|
|
25
|
+
class="free-adapters"
|
|
26
|
+
@select-add-adapter="onSelectAddAdapter"
|
|
27
|
+
/>
|
|
28
|
+
</div>
|
|
29
|
+
</template>
|
|
30
|
+
<template #footerLeftContent><span></span></template>
|
|
31
|
+
</ui-modal>
|
|
32
|
+
</div>
|
|
32
33
|
</template>
|
|
33
34
|
|
|
34
35
|
<script setup lang="ts">
|
|
@@ -72,7 +73,38 @@ const onAddSelectedAdapters = (): void => {
|
|
|
72
73
|
|
|
73
74
|
<style scoped lang="scss">
|
|
74
75
|
.add-adapter-modal-content {
|
|
75
|
-
padding:
|
|
76
|
-
height:
|
|
76
|
+
padding: 8px 0 8px 32px;
|
|
77
|
+
height: 100%;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
:deep(.modal-inner) {
|
|
81
|
+
max-width: 880px;
|
|
82
|
+
|
|
83
|
+
.modal-header {
|
|
84
|
+
padding-bottom: 24px;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
.modal-body {
|
|
88
|
+
max-height: 520px;
|
|
89
|
+
overflow-y: auto;
|
|
90
|
+
height: calc(100vh - 300px);
|
|
91
|
+
min-height: 120px;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
.modal-footer-transparent-block {
|
|
95
|
+
display: block !important;
|
|
96
|
+
top: -24px;
|
|
97
|
+
width: calc(100% - 294px);
|
|
98
|
+
right: 16px;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
@media (max-width: 650px) {
|
|
102
|
+
.modal-footer-transparent-block {
|
|
103
|
+
display: block !important;
|
|
104
|
+
top: -16px;
|
|
105
|
+
width: calc(100% - 16px);
|
|
106
|
+
right: 16px;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
77
109
|
}
|
|
78
110
|
</style>
|
|
@@ -27,7 +27,7 @@ const secondaryTitle = computed<string>(() =>
|
|
|
27
27
|
margin-bottom: 16px;
|
|
28
28
|
font-weight: 500;
|
|
29
29
|
font-size: 16px;
|
|
30
|
-
line-height:
|
|
30
|
+
line-height: 20px;
|
|
31
31
|
letter-spacing: 0;
|
|
32
32
|
color: var(--table-text-first);
|
|
33
33
|
word-wrap: break-word;
|
|
@@ -35,7 +35,7 @@ const secondaryTitle = computed<string>(() =>
|
|
|
35
35
|
position: sticky;
|
|
36
36
|
top: 0;
|
|
37
37
|
background: var(--table-container-in-modal);
|
|
38
|
-
height:
|
|
38
|
+
height: 20px;
|
|
39
39
|
z-index: 100;
|
|
40
40
|
|
|
41
41
|
&::after {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<tbody>
|
|
8
8
|
<tr>
|
|
9
9
|
<td colspan="2">
|
|
10
|
-
<span>
|
|
10
|
+
<span class="row-sub-title">
|
|
11
11
|
{{ props.viewSettingsField.title }}
|
|
12
12
|
</span>
|
|
13
13
|
</td>
|
|
@@ -142,11 +142,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
|
|
|
142
142
|
|
|
143
143
|
tr:first-of-type {
|
|
144
144
|
span {
|
|
145
|
+
display: inline-block;
|
|
145
146
|
color: var(--title-form-first-color);
|
|
146
147
|
font-weight: 500;
|
|
147
148
|
font-size: 14px;
|
|
148
|
-
line-height:
|
|
149
|
-
margin: 16px 0;
|
|
149
|
+
line-height: 20px;
|
|
150
150
|
}
|
|
151
151
|
td {
|
|
152
152
|
padding-bottom: 16px;
|
|
@@ -164,17 +164,23 @@ const localization = computed<UI_I_Localization>(() => useLocal())
|
|
|
164
164
|
color: var(--diagram-info-second-text);
|
|
165
165
|
font-size: 13px;
|
|
166
166
|
font-weight: 400;
|
|
167
|
-
line-height: 16px;
|
|
168
167
|
padding-bottom: 12px;
|
|
168
|
+
|
|
169
|
+
span {
|
|
170
|
+
line-height: 16px;
|
|
171
|
+
}
|
|
169
172
|
}
|
|
170
173
|
&.row-value-container {
|
|
171
174
|
padding-bottom: 12px;
|
|
175
|
+
|
|
176
|
+
span {
|
|
177
|
+
line-height: 16px;
|
|
178
|
+
}
|
|
172
179
|
}
|
|
173
180
|
|
|
174
181
|
//width: 240px;
|
|
175
182
|
white-space: normal;
|
|
176
183
|
padding: 0;
|
|
177
|
-
line-height: 18px;
|
|
178
184
|
|
|
179
185
|
.settings-table {
|
|
180
186
|
&__values {
|
|
@@ -233,11 +239,16 @@ const localization = computed<UI_I_Localization>(() => useLocal())
|
|
|
233
239
|
color: var(--diagram-info-second-text);
|
|
234
240
|
font-size: 13px;
|
|
235
241
|
font-weight: 400;
|
|
236
|
-
line-height:
|
|
242
|
+
line-height: 16px;
|
|
237
243
|
display: flex;
|
|
238
244
|
|
|
239
|
-
span
|
|
240
|
-
|
|
245
|
+
span {
|
|
246
|
+
line-height: 16px;
|
|
247
|
+
|
|
248
|
+
&:first-of-type {
|
|
249
|
+
margin-right: 8px;
|
|
250
|
+
height: 16px;
|
|
251
|
+
}
|
|
241
252
|
}
|
|
242
253
|
}
|
|
243
254
|
|
|
@@ -23,7 +23,6 @@
|
|
|
23
23
|
:custom-time-to="props.customTimeTo"
|
|
24
24
|
:total-cores="totalCores"
|
|
25
25
|
:host-id="props.hostId"
|
|
26
|
-
:selected-objects="props.selectedObjects"
|
|
27
26
|
:objects-loading="props.objectsLoading"
|
|
28
27
|
:objects-data="props.objectsData"
|
|
29
28
|
:valid-date-end="props.validDateEnd"
|
|
@@ -71,7 +70,6 @@
|
|
|
71
70
|
:custom-time-to="props.customTimeTo"
|
|
72
71
|
:total-cores="totalCores"
|
|
73
72
|
:host-id="props.hostId"
|
|
74
|
-
:selected-objects="props.selectedObjects"
|
|
75
73
|
:objects-loading="props.objectsLoading"
|
|
76
74
|
:objects-data="props.objectsData"
|
|
77
75
|
:valid-date-end="props.validDateEnd"
|
|
@@ -133,7 +131,6 @@ const props = withDefaults(
|
|
|
133
131
|
customTimeFrom: string
|
|
134
132
|
customTimeTo: string
|
|
135
133
|
hostId: string
|
|
136
|
-
selectedObjects: string
|
|
137
134
|
project: UI_T_Project
|
|
138
135
|
objectsLoading: boolean
|
|
139
136
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
:custom-time-to="props.customTimeTo"
|
|
37
37
|
:total-cores="props.totalCores"
|
|
38
38
|
:host-id="props.hostId"
|
|
39
|
-
:selected-objects="props.selectedObjects"
|
|
40
39
|
:project="props.project"
|
|
41
40
|
:objects-loading="props.objectsLoading"
|
|
42
41
|
:objects-data="props.objectsData"
|
|
@@ -119,7 +118,6 @@ const props = withDefaults(
|
|
|
119
118
|
customTimeTo: string
|
|
120
119
|
totalCores: number
|
|
121
120
|
hostId: string
|
|
122
|
-
selectedObjects: string
|
|
123
121
|
project: UI_T_Project
|
|
124
122
|
objectsLoading: boolean
|
|
125
123
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -33,7 +33,6 @@
|
|
|
33
33
|
:custom-time-to="props.customTimeTo"
|
|
34
34
|
:total-cores="props.totalCores"
|
|
35
35
|
:host-id="props.hostId"
|
|
36
|
-
:selected-objects="props.selectedObjects"
|
|
37
36
|
:project="props.project"
|
|
38
37
|
:objects-loading="props.objectsLoading"
|
|
39
38
|
:objects-data="props.objectsData"
|
|
@@ -129,7 +128,6 @@ const props = withDefaults(
|
|
|
129
128
|
customTimeTo: string
|
|
130
129
|
totalCores: number
|
|
131
130
|
hostId: string
|
|
132
|
-
selectedObjects: string
|
|
133
131
|
project: UI_T_Project
|
|
134
132
|
objectsLoading: boolean
|
|
135
133
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -23,7 +23,6 @@
|
|
|
23
23
|
:custom-time-to="props.customTimeTo"
|
|
24
24
|
:total-cores="totalCores"
|
|
25
25
|
:host-id="props.hostId"
|
|
26
|
-
:selected-objects="props.selectedObjects"
|
|
27
26
|
:project="props.project"
|
|
28
27
|
:objects-loading="props.objectsLoading"
|
|
29
28
|
:objects-data="props.objectsData"
|
|
@@ -72,7 +71,6 @@
|
|
|
72
71
|
:custom-time-to="props.customTimeTo"
|
|
73
72
|
:total-cores="totalCores"
|
|
74
73
|
:host-id="props.hostId"
|
|
75
|
-
:selected-objects="props.selectedObjects"
|
|
76
74
|
:project="props.project"
|
|
77
75
|
:objects-loading="props.objectsLoading"
|
|
78
76
|
:objects-data="props.objectsData"
|
|
@@ -141,7 +139,6 @@ const props = withDefaults(
|
|
|
141
139
|
customTimeTo: string
|
|
142
140
|
totalCores: number
|
|
143
141
|
hostId: string
|
|
144
|
-
selectedObjects: string
|
|
145
142
|
project: UI_T_Project
|
|
146
143
|
objectsLoading: boolean
|
|
147
144
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -67,7 +67,6 @@
|
|
|
67
67
|
:custom-time-to="props.customTimeTo"
|
|
68
68
|
:total-cores="props.totalCores"
|
|
69
69
|
:host-id="props.hostId"
|
|
70
|
-
:selected-objects="props.selectedObjects"
|
|
71
70
|
:project="props.project"
|
|
72
71
|
:objects-loading="props.objectsLoading"
|
|
73
72
|
:objects-data="props.objectsData"
|
|
@@ -122,7 +121,6 @@ const props = withDefaults(
|
|
|
122
121
|
customTimeTo: string
|
|
123
122
|
totalCores: number
|
|
124
123
|
hostId: string
|
|
125
|
-
selectedObjects: string
|
|
126
124
|
project: UI_T_Project
|
|
127
125
|
objectsLoading: boolean
|
|
128
126
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -112,7 +112,6 @@
|
|
|
112
112
|
:custom-time-to="props.customTimeTo"
|
|
113
113
|
:total-cores="props.totalCores"
|
|
114
114
|
:host-id="props.hostId"
|
|
115
|
-
:selected-objects="props.selectedObjects"
|
|
116
115
|
:project="props.project"
|
|
117
116
|
:objects-loading="props.objectsLoading"
|
|
118
117
|
:objects-data="props.objectsData"
|
|
@@ -169,7 +168,6 @@ const props = withDefaults(
|
|
|
169
168
|
customTimeTo: string
|
|
170
169
|
totalCores: number
|
|
171
170
|
hostId: string
|
|
172
|
-
selectedObjects: string
|
|
173
171
|
project: UI_T_Project
|
|
174
172
|
objectsLoading: boolean
|
|
175
173
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -18,7 +18,6 @@
|
|
|
18
18
|
:custom-time-to="props.customTimeTo"
|
|
19
19
|
:total-cores="props.totalCores"
|
|
20
20
|
:hostId="props.hostId"
|
|
21
|
-
:selected-objects="props.selectedObjects"
|
|
22
21
|
:objects-loading="props.objectsLoading"
|
|
23
22
|
:objects-data="props.objectsData"
|
|
24
23
|
:valid-date-end="props.validDateEnd"
|
|
@@ -40,6 +39,7 @@
|
|
|
40
39
|
:project="props.project"
|
|
41
40
|
:power-data="props.powerData"
|
|
42
41
|
:temperature-data="props.temperatureData"
|
|
42
|
+
:current-selected-objects="localSelectedObjects"
|
|
43
43
|
@hide-main-modal="onHideMainModal"
|
|
44
44
|
@submit-main-modal="onSubmitMainModal"
|
|
45
45
|
@remove-alerts="onRemoveAlerts"
|
|
@@ -72,7 +72,6 @@
|
|
|
72
72
|
:custom-time-to="props.customTimeTo"
|
|
73
73
|
:total-cores="props.totalCores"
|
|
74
74
|
:hostId="props.hostId"
|
|
75
|
-
:selected-objects="props.selectedObjects"
|
|
76
75
|
:objects-loading="props.objectsLoading"
|
|
77
76
|
:objects-data="props.objectsData"
|
|
78
77
|
:valid-date-end="props.validDateEnd"
|
|
@@ -88,6 +87,7 @@
|
|
|
88
87
|
:project="props.project"
|
|
89
88
|
:power-data="props.powerData"
|
|
90
89
|
:temperature-data="props.temperatureData"
|
|
90
|
+
:current-selected-objects="localSelectedObjects"
|
|
91
91
|
@hide-main-modal="onHideMainModal"
|
|
92
92
|
@submit-main-modal="onSubmitMainModal"
|
|
93
93
|
@remove-alerts="onRemoveAlerts"
|
|
@@ -120,6 +120,7 @@ import { getCurrentOptionsStorageFunc } from '~/components/common/monitor/advanc
|
|
|
120
120
|
import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
|
|
121
121
|
import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
|
|
122
122
|
import { checkIsDisabledSubmit } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit'
|
|
123
|
+
import { getLocalStoragePrefix } from '~/composables/useLocalStorage'
|
|
123
124
|
|
|
124
125
|
const props = withDefaults(
|
|
125
126
|
defineProps<{
|
|
@@ -139,7 +140,6 @@ const props = withDefaults(
|
|
|
139
140
|
customTimeTo: string
|
|
140
141
|
totalCores: number
|
|
141
142
|
hostId: string
|
|
142
|
-
selectedObjects: string
|
|
143
143
|
project: UI_T_Project
|
|
144
144
|
objectsLoading: boolean
|
|
145
145
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -446,6 +446,7 @@ const onSaveOptions = (name: string): void => {
|
|
|
446
446
|
chartType,
|
|
447
447
|
counters,
|
|
448
448
|
metric: selectedMetricLocal.value,
|
|
449
|
+
objects: localSelectedObjects.value,
|
|
449
450
|
timespan: {
|
|
450
451
|
periodType: localPeriodType.value,
|
|
451
452
|
units: localCustomTime.value,
|
|
@@ -482,11 +483,18 @@ const setDefaultOptions = (): void => {
|
|
|
482
483
|
}
|
|
483
484
|
|
|
484
485
|
const setCustomOptions = (name: string): void => {
|
|
485
|
-
|
|
486
|
+
let currentStorageOptionName = name + 'ChartOptions'
|
|
487
|
+
|
|
488
|
+
if (props.project === 'sphere') {
|
|
489
|
+
currentStorageOptionName =
|
|
490
|
+
name.slice(0, name.indexOf(getLocalStoragePrefix())) +
|
|
491
|
+
'ChartOptions' +
|
|
492
|
+
name.slice(name.indexOf(getLocalStoragePrefix()))
|
|
493
|
+
}
|
|
486
494
|
const selectedValue = useLocalStorage(
|
|
487
|
-
|
|
495
|
+
currentStorageOptionName,
|
|
488
496
|
undefined,
|
|
489
|
-
|
|
497
|
+
false
|
|
490
498
|
)
|
|
491
499
|
|
|
492
500
|
if (selectedValue.routeType !== routeType) return
|
|
@@ -505,14 +513,20 @@ const setCustomOptions = (name: string): void => {
|
|
|
505
513
|
localUnitsCount.value = selectedValue.timespan.unitsCount
|
|
506
514
|
localPeriodType.value = selectedValue.timespan.periodType
|
|
507
515
|
localCustomTime.value = selectedValue.timespan.units
|
|
516
|
+
localSelectedObjects.value = selectedValue.objects
|
|
508
517
|
}
|
|
509
518
|
|
|
510
519
|
const onSelectLocalOptionName = (name: string): void => {
|
|
511
520
|
selectedLocalOptionName.value = name
|
|
512
521
|
|
|
513
522
|
if (optionsNames.value.includes(name)) setCustomOptions(name)
|
|
514
|
-
else if (name === 'default')
|
|
515
|
-
|
|
523
|
+
else if (name === 'default') {
|
|
524
|
+
localSelectedObjects.value = ''
|
|
525
|
+
setDefaultOptions()
|
|
526
|
+
} else if (name === 'select_options') {
|
|
527
|
+
localSelectedObjects.value = ''
|
|
528
|
+
setSelectOptions()
|
|
529
|
+
}
|
|
516
530
|
}
|
|
517
531
|
|
|
518
532
|
watch(
|
|
@@ -55,7 +55,6 @@
|
|
|
55
55
|
:total-cores="props.totalCores"
|
|
56
56
|
:host-id="props.hostId"
|
|
57
57
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
58
|
-
:selected-objects="props.selectedObjects"
|
|
59
58
|
:objects-loading="props.objectsLoading"
|
|
60
59
|
:objects-data="props.objectsData"
|
|
61
60
|
:valid-date-end="props.validDateEnd"
|
|
@@ -67,6 +66,7 @@
|
|
|
67
66
|
:project="props.project"
|
|
68
67
|
:power-data="props.powerData"
|
|
69
68
|
:temperature-data="props.temperatureData"
|
|
69
|
+
:current-selected-objects="props.currentSelectedObjects"
|
|
70
70
|
@select-row="selectedRowsLocal = $event"
|
|
71
71
|
@update-chart-type="localSelectedChartTypeLocal = $event"
|
|
72
72
|
@update-custom-time="customTimeLocal = $event"
|
|
@@ -116,7 +116,6 @@ const props = withDefaults(
|
|
|
116
116
|
customTimeTo: string
|
|
117
117
|
totalCores: number
|
|
118
118
|
hostId: string
|
|
119
|
-
selectedObjects: string
|
|
120
119
|
objectsLoading: boolean
|
|
121
120
|
objectsData: UI_I_ObjectItem[]
|
|
122
121
|
validDateEnd: number
|
|
@@ -132,6 +131,7 @@ const props = withDefaults(
|
|
|
132
131
|
project: UI_T_Project
|
|
133
132
|
powerData: UI_I_AdvancedCounterItem[]
|
|
134
133
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
134
|
+
currentSelectedObjects: string
|
|
135
135
|
selectedNodeName?: string
|
|
136
136
|
errorLastInput?: string
|
|
137
137
|
errorDateFrom?: string
|
|
@@ -49,13 +49,13 @@
|
|
|
49
49
|
:total-cores="props.totalCores"
|
|
50
50
|
:host-id="props.hostId"
|
|
51
51
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
52
|
-
:selected-objects="props.selectedObjects"
|
|
53
52
|
:objects-loading="props.objectsLoading"
|
|
54
53
|
:objects-data="props.objectsData"
|
|
55
54
|
:valid-date-end="props.validDateEnd"
|
|
56
55
|
:project="props.project"
|
|
57
56
|
:power-data="props.powerData"
|
|
58
57
|
:temperature-data="props.temperatureData"
|
|
58
|
+
:current-selected-objects="props.currentSelectedObjects"
|
|
59
59
|
@select-row="selectedRowsLocal = $event"
|
|
60
60
|
@update-chart-type="localSelectedChartTypeLocal = $event"
|
|
61
61
|
@update-custom-time="customTimeLocal = $event"
|
|
@@ -102,7 +102,6 @@ const props = defineProps<{
|
|
|
102
102
|
customTimeTo: string
|
|
103
103
|
totalCores: number
|
|
104
104
|
hostId: string
|
|
105
|
-
selectedObjects: string
|
|
106
105
|
objectsLoading: boolean
|
|
107
106
|
objectsData: UI_I_ObjectItem[]
|
|
108
107
|
validDateEnd: number
|
|
@@ -118,6 +117,7 @@ const props = defineProps<{
|
|
|
118
117
|
project: UI_T_Project
|
|
119
118
|
powerData: UI_I_AdvancedCounterItem[]
|
|
120
119
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
120
|
+
currentSelectedObjects: string
|
|
121
121
|
}>()
|
|
122
122
|
|
|
123
123
|
const selectedRowsLocal = defineModel<UI_I_AdvancedCounterItem[]>(
|
|
@@ -18,7 +18,6 @@
|
|
|
18
18
|
:total-cores="props.totalCores"
|
|
19
19
|
:host-id="props.hostId"
|
|
20
20
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
21
|
-
:selected-objects="props.selectedObjects"
|
|
22
21
|
:objects-loading="props.objectsLoading"
|
|
23
22
|
:objects-data="props.objectsData"
|
|
24
23
|
:valid-date-end="props.validDateEnd"
|
|
@@ -30,6 +29,7 @@
|
|
|
30
29
|
:project="props.project"
|
|
31
30
|
:power-data="props.powerData"
|
|
32
31
|
:temperature-data="props.temperatureData"
|
|
32
|
+
:current-selected-objects="props.currentSelectedObjects"
|
|
33
33
|
@select-row="emits('select-row', $event)"
|
|
34
34
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
35
35
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
@@ -61,13 +61,13 @@
|
|
|
61
61
|
:total-cores="props.totalCores"
|
|
62
62
|
:host-id="props.hostId"
|
|
63
63
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
64
|
-
:selected-objects="props.selectedObjects"
|
|
65
64
|
:objects-loading="props.objectsLoading"
|
|
66
65
|
:objects-data="props.objectsData"
|
|
67
66
|
:valid-date-end="props.validDateEnd"
|
|
68
67
|
:project="props.project"
|
|
69
68
|
:power-data="props.powerData"
|
|
70
69
|
:temperature-data="props.temperatureData"
|
|
70
|
+
:current-selected-objects="props.currentSelectedObjects"
|
|
71
71
|
@select-row="emits('select-row', $event)"
|
|
72
72
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
73
73
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
@@ -110,13 +110,13 @@ const props = withDefaults(
|
|
|
110
110
|
totalCores: number
|
|
111
111
|
hostId: string
|
|
112
112
|
selectedMetricsKeys: number[]
|
|
113
|
-
selectedObjects: string
|
|
114
113
|
objectsLoading: boolean
|
|
115
114
|
objectsData: UI_I_ObjectItem[]
|
|
116
115
|
validDateEnd: number
|
|
117
116
|
project: UI_T_Project
|
|
118
117
|
powerData: UI_I_AdvancedCounterItem[]
|
|
119
118
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
119
|
+
currentSelectedObjects: string
|
|
120
120
|
errorLastInput?: string
|
|
121
121
|
errorDateFrom?: string
|
|
122
122
|
errorTimeFrom?: string
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div
|
|
3
3
|
ref="chartOptionsBottomBlock"
|
|
4
|
-
:class="[
|
|
4
|
+
:class="[
|
|
5
|
+
'chart-options-bottom-right-container',
|
|
6
|
+
{ 'is-scrolled': isScrolledBlock },
|
|
7
|
+
]"
|
|
5
8
|
>
|
|
6
9
|
<div v-show="isScrolledBlock" class="border-block"></div>
|
|
7
10
|
<common-monitor-advanced-tools-chart-options-modal-counters-table
|
|
@@ -32,7 +35,6 @@
|
|
|
32
35
|
:host-id="props.hostId"
|
|
33
36
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
34
37
|
:total-metric-items="totalMetricItemsLocal"
|
|
35
|
-
:selected-objects="props.selectedObjects"
|
|
36
38
|
:objects-loading="props.objectsLoading"
|
|
37
39
|
:objects-data="props.objectsData"
|
|
38
40
|
:valid-date-end="props.validDateEnd"
|
|
@@ -41,6 +43,7 @@
|
|
|
41
43
|
:error-time-from="props.errorTimeFrom"
|
|
42
44
|
:error-date-to="props.errorDateTo"
|
|
43
45
|
:error-time-to="props.errorTimeTo"
|
|
46
|
+
:current-selected-objects="props.currentSelectedObjects"
|
|
44
47
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
45
48
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
46
49
|
@update-timespan-type="emits('update-timespan-type', $event)"
|
|
@@ -88,13 +91,13 @@ const props = withDefaults(
|
|
|
88
91
|
totalCores: number
|
|
89
92
|
hostId: string
|
|
90
93
|
selectedMetricsKeys: number[]
|
|
91
|
-
selectedObjects: string
|
|
92
94
|
objectsLoading: boolean
|
|
93
95
|
objectsData: UI_I_ObjectItem[]
|
|
94
96
|
validDateEnd: number
|
|
95
97
|
project: UI_T_Project
|
|
96
98
|
powerData: UI_I_AdvancedCounterItem[]
|
|
97
99
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
100
|
+
currentSelectedObjects: string
|
|
98
101
|
errorLastInput?: string
|
|
99
102
|
errorDateFrom?: string
|
|
100
103
|
errorTimeFrom?: string
|