bfg-common 1.5.970 → 1.5.973
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 +2 -0
- package/assets/localization/local_en.json +2 -0
- package/assets/localization/local_hy.json +2 -0
- package/assets/localization/local_kk.json +2 -0
- package/assets/localization/local_ru.json +2 -0
- package/assets/localization/local_zh.json +2 -0
- package/components/common/monitor/advanced/Advanced.vue +3 -0
- package/components/common/monitor/advanced/AdvancedNew.vue +2 -0
- package/components/common/monitor/advanced/AdvancedOld.vue +2 -0
- package/components/common/monitor/advanced/tools/Tools.vue +3 -0
- package/components/common/monitor/advanced/tools/ToolsNew.vue +2 -0
- package/components/common/monitor/advanced/tools/ToolsOld.vue +2 -0
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue +8 -22
- 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 +3 -6
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersOld.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +5 -0
- 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 +9 -10
- 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 +1 -0
- package/components/common/pages/hardwareHealth/HardwareHealthNew.vue +12 -6
- package/components/common/pages/hardwareHealth/HardwareHealthOld.vue +2 -0
- package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue +1 -0
- package/components/common/pages/hardwareHealth/historyTestimony/GraphNew.vue +17 -0
- package/components/common/pages/hardwareHealth/historyTestimony/GraphOld.vue +2 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue +2 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/ToolsOld.vue +2 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModal.vue +2 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalNew.vue +2 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalOld.vue +2 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/Actions.vue +6 -6
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsNew.vue +26 -2
- 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/actions/saveOptionsModal/SaveOptionsModal.vue +81 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/CountersNew.vue +1 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +4 -3
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/TimespanNew.vue +10 -2
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/alertWarningTable.ts +0 -1
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/historyTestimonyTable.ts +0 -1
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/systemLogTable.ts +2 -2
- package/composables/useLocalStorage.ts +1 -1
- package/package.json +1 -1
|
@@ -3256,6 +3256,8 @@
|
|
|
3256
3256
|
"dateTimeIsoFormat": "Дата і час знаходзяцца ў фармаце ISO 8601.",
|
|
3257
3257
|
"deleteConfirmationChartOption": "Пацвярджэнне выдалення",
|
|
3258
3258
|
"deleteConfirmationChartOptionDesc": "Вы ўпэўнены, што хочаце выдаліць параметры дыяграмы \"{0}\" з \"Па змаўчанні\".",
|
|
3259
|
+
"deleteChartOption": "Выдаліць параметр дыяграмы",
|
|
3260
|
+
"deleteChartOptionDesc": "Вы ўпэўненыя, што хочаце выдаліць параметр дыяграмы «{0}» з «{1}»?",
|
|
3259
3261
|
"from": "Ад",
|
|
3260
3262
|
"memoryUsage": "Выкарыстанне памяці",
|
|
3261
3263
|
"memoryFree": "Вольная памяць",
|
|
@@ -3260,6 +3260,8 @@
|
|
|
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}”.",
|
|
3263
3265
|
"from": "From",
|
|
3264
3266
|
"memoryUsage": "Memory Usage",
|
|
3265
3267
|
"memoryFree": "Memory Free",
|
|
@@ -3260,6 +3260,8 @@
|
|
|
3260
3260
|
"dateTimeIsoFormat": "Ամսաթիվը եւ ժամը ISO 8601 ձեւաչափով են:",
|
|
3261
3261
|
"deleteConfirmationChartOption": "Ջնջել հաստատումը",
|
|
3262
3262
|
"deleteConfirmationChartOptionDesc": "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել «{0}» գծապատկերի ընտրանքները «Լռակյացից»:",
|
|
3263
|
+
"deleteChartOption": "Ջնջել գծապատկերի տարբերակը",
|
|
3264
|
+
"deleteChartOptionDesc": "Վստա՞հ եք, որ ցանկանում եք ջնջել «{0}» գրաֆիկի տարբերակը «{1}»-ից։",
|
|
3263
3265
|
"from": "Ից",
|
|
3264
3266
|
"memoryUsage": "Հիշողության օգտագործում",
|
|
3265
3267
|
"memoryFree": "Ազատ հիշողություն",
|
|
@@ -3259,6 +3259,8 @@
|
|
|
3259
3259
|
"dateTimeIsoFormat": "Күн мен уақыт ISO 8601. форматында",
|
|
3260
3260
|
"deleteConfirmationChartOption": "Растауды жою",
|
|
3261
3261
|
"deleteConfirmationChartOptionDesc": "\"{0}\" диаграмма опцияларын \"Әдепкіден\" өшіргіңіз келетініне сенімдісіз бе.",
|
|
3262
|
+
"deleteChartOption": "Диаграмма опциясын жою",
|
|
3263
|
+
"deleteChartOptionDesc": "\"{1}\" ішінен \"{0}\" диаграмма опциясын жойғыңыз келетініне сенімдісіз бе.",
|
|
3262
3264
|
"from": "Бастап",
|
|
3263
3265
|
"memoryUsage": "Жадыны пайдалану",
|
|
3264
3266
|
"memoryFree": "Бос жад",
|
|
@@ -3259,6 +3259,8 @@
|
|
|
3259
3259
|
"dateTimeIsoFormat": "Дата и время в формате ISO 8601.",
|
|
3260
3260
|
"deleteConfirmationChartOption": "Подтверждение удаления",
|
|
3261
3261
|
"deleteConfirmationChartOptionDesc": "Вы уверены, что хотите удалить параметры диаграммы «{0}» из «По умолчанию»?",
|
|
3262
|
+
"deleteChartOption": "Удалить параметр диаграммы",
|
|
3263
|
+
"deleteChartOptionDesc": "Вы уверены, что хотите удалить параметр диаграммы “{0}” с “{1}”",
|
|
3262
3264
|
"from": "С",
|
|
3263
3265
|
"memoryUsage": "Использование памяти",
|
|
3264
3266
|
"memoryFree": "Свободная память",
|
|
@@ -3257,6 +3257,8 @@
|
|
|
3257
3257
|
"dateTimeIsoFormat": "日期和时间为ISO 8601格式。",
|
|
3258
3258
|
"deleteConfirmationChartOption": "删除确认",
|
|
3259
3259
|
"deleteConfirmationChartOptionDesc": "您确定要从“默认”中删除图表选项“{0}”吗?",
|
|
3260
|
+
"deleteChartOption": "删除图表选项",
|
|
3261
|
+
"deleteChartOptionDesc": "您确定要从“{1}”中删除图表选项“{0}”吗?",
|
|
3260
3262
|
"from": "从",
|
|
3261
3263
|
"memoryUsage": "内存使用情况",
|
|
3262
3264
|
"memoryFree": "可用内存",
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
:custom-time-to="props.customTimeTo"
|
|
24
24
|
:total-cores="totalCores"
|
|
25
25
|
:host-id="props.hostId"
|
|
26
|
+
:selected-objects="props.selectedObjects"
|
|
26
27
|
:objects-loading="props.objectsLoading"
|
|
27
28
|
:objects-data="props.objectsData"
|
|
28
29
|
:valid-date-end="props.validDateEnd"
|
|
@@ -70,6 +71,7 @@
|
|
|
70
71
|
:custom-time-to="props.customTimeTo"
|
|
71
72
|
:total-cores="totalCores"
|
|
72
73
|
:host-id="props.hostId"
|
|
74
|
+
:selected-objects="props.selectedObjects"
|
|
73
75
|
:objects-loading="props.objectsLoading"
|
|
74
76
|
:objects-data="props.objectsData"
|
|
75
77
|
:valid-date-end="props.validDateEnd"
|
|
@@ -131,6 +133,7 @@ const props = withDefaults(
|
|
|
131
133
|
customTimeFrom: string
|
|
132
134
|
customTimeTo: string
|
|
133
135
|
hostId: string
|
|
136
|
+
selectedObjects: string
|
|
134
137
|
project: UI_T_Project
|
|
135
138
|
objectsLoading: boolean
|
|
136
139
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
:custom-time-to="props.customTimeTo"
|
|
37
37
|
:total-cores="props.totalCores"
|
|
38
38
|
:host-id="props.hostId"
|
|
39
|
+
:selected-objects="props.selectedObjects"
|
|
39
40
|
:project="props.project"
|
|
40
41
|
:objects-loading="props.objectsLoading"
|
|
41
42
|
:objects-data="props.objectsData"
|
|
@@ -118,6 +119,7 @@ const props = withDefaults(
|
|
|
118
119
|
customTimeTo: string
|
|
119
120
|
totalCores: number
|
|
120
121
|
hostId: string
|
|
122
|
+
selectedObjects: string
|
|
121
123
|
project: UI_T_Project
|
|
122
124
|
objectsLoading: boolean
|
|
123
125
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
:custom-time-to="props.customTimeTo"
|
|
34
34
|
:total-cores="props.totalCores"
|
|
35
35
|
:host-id="props.hostId"
|
|
36
|
+
:selected-objects="props.selectedObjects"
|
|
36
37
|
:project="props.project"
|
|
37
38
|
:objects-loading="props.objectsLoading"
|
|
38
39
|
:objects-data="props.objectsData"
|
|
@@ -128,6 +129,7 @@ const props = withDefaults(
|
|
|
128
129
|
customTimeTo: string
|
|
129
130
|
totalCores: number
|
|
130
131
|
hostId: string
|
|
132
|
+
selectedObjects: string
|
|
131
133
|
project: UI_T_Project
|
|
132
134
|
objectsLoading: boolean
|
|
133
135
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
:custom-time-to="props.customTimeTo"
|
|
24
24
|
:total-cores="totalCores"
|
|
25
25
|
:host-id="props.hostId"
|
|
26
|
+
:selected-objects="props.selectedObjects"
|
|
26
27
|
:project="props.project"
|
|
27
28
|
:objects-loading="props.objectsLoading"
|
|
28
29
|
:objects-data="props.objectsData"
|
|
@@ -71,6 +72,7 @@
|
|
|
71
72
|
:custom-time-to="props.customTimeTo"
|
|
72
73
|
:total-cores="totalCores"
|
|
73
74
|
:host-id="props.hostId"
|
|
75
|
+
:selected-objects="props.selectedObjects"
|
|
74
76
|
:project="props.project"
|
|
75
77
|
:objects-loading="props.objectsLoading"
|
|
76
78
|
:objects-data="props.objectsData"
|
|
@@ -139,6 +141,7 @@ const props = withDefaults(
|
|
|
139
141
|
customTimeTo: string
|
|
140
142
|
totalCores: number
|
|
141
143
|
hostId: string
|
|
144
|
+
selectedObjects: string
|
|
142
145
|
project: UI_T_Project
|
|
143
146
|
objectsLoading: boolean
|
|
144
147
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -67,6 +67,7 @@
|
|
|
67
67
|
:custom-time-to="props.customTimeTo"
|
|
68
68
|
:total-cores="props.totalCores"
|
|
69
69
|
:host-id="props.hostId"
|
|
70
|
+
:selected-objects="props.selectedObjects"
|
|
70
71
|
:project="props.project"
|
|
71
72
|
:objects-loading="props.objectsLoading"
|
|
72
73
|
:objects-data="props.objectsData"
|
|
@@ -121,6 +122,7 @@ const props = withDefaults(
|
|
|
121
122
|
customTimeTo: string
|
|
122
123
|
totalCores: number
|
|
123
124
|
hostId: string
|
|
125
|
+
selectedObjects: string
|
|
124
126
|
project: UI_T_Project
|
|
125
127
|
objectsLoading: boolean
|
|
126
128
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -112,6 +112,7 @@
|
|
|
112
112
|
:custom-time-to="props.customTimeTo"
|
|
113
113
|
:total-cores="props.totalCores"
|
|
114
114
|
:host-id="props.hostId"
|
|
115
|
+
:selected-objects="props.selectedObjects"
|
|
115
116
|
:project="props.project"
|
|
116
117
|
:objects-loading="props.objectsLoading"
|
|
117
118
|
:objects-data="props.objectsData"
|
|
@@ -168,6 +169,7 @@ const props = withDefaults(
|
|
|
168
169
|
customTimeTo: string
|
|
169
170
|
totalCores: number
|
|
170
171
|
hostId: string
|
|
172
|
+
selectedObjects: string
|
|
171
173
|
project: UI_T_Project
|
|
172
174
|
objectsLoading: boolean
|
|
173
175
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
:custom-time-to="props.customTimeTo"
|
|
19
19
|
:total-cores="props.totalCores"
|
|
20
20
|
:hostId="props.hostId"
|
|
21
|
+
:selected-objects="props.selectedObjects"
|
|
21
22
|
:objects-loading="props.objectsLoading"
|
|
22
23
|
:objects-data="props.objectsData"
|
|
23
24
|
:valid-date-end="props.validDateEnd"
|
|
@@ -39,7 +40,6 @@
|
|
|
39
40
|
:project="props.project"
|
|
40
41
|
:power-data="props.powerData"
|
|
41
42
|
: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,6 +72,7 @@
|
|
|
72
72
|
:custom-time-to="props.customTimeTo"
|
|
73
73
|
:total-cores="props.totalCores"
|
|
74
74
|
:hostId="props.hostId"
|
|
75
|
+
:selected-objects="props.selectedObjects"
|
|
75
76
|
:objects-loading="props.objectsLoading"
|
|
76
77
|
:objects-data="props.objectsData"
|
|
77
78
|
:valid-date-end="props.validDateEnd"
|
|
@@ -87,7 +88,6 @@
|
|
|
87
88
|
:project="props.project"
|
|
88
89
|
:power-data="props.powerData"
|
|
89
90
|
: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,7 +120,6 @@ 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'
|
|
124
123
|
|
|
125
124
|
const props = withDefaults(
|
|
126
125
|
defineProps<{
|
|
@@ -140,6 +139,7 @@ const props = withDefaults(
|
|
|
140
139
|
customTimeTo: string
|
|
141
140
|
totalCores: number
|
|
142
141
|
hostId: string
|
|
142
|
+
selectedObjects: string
|
|
143
143
|
project: UI_T_Project
|
|
144
144
|
objectsLoading: boolean
|
|
145
145
|
objectsData: UI_I_ObjectItem[]
|
|
@@ -446,7 +446,6 @@ const onSaveOptions = (name: string): void => {
|
|
|
446
446
|
chartType,
|
|
447
447
|
counters,
|
|
448
448
|
metric: selectedMetricLocal.value,
|
|
449
|
-
objects: localSelectedObjects.value,
|
|
450
449
|
timespan: {
|
|
451
450
|
periodType: localPeriodType.value,
|
|
452
451
|
units: localCustomTime.value,
|
|
@@ -483,18 +482,11 @@ const setDefaultOptions = (): void => {
|
|
|
483
482
|
}
|
|
484
483
|
|
|
485
484
|
const setCustomOptions = (name: string): void => {
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
if (props.project === 'sphere') {
|
|
489
|
-
currentStorageOptionName =
|
|
490
|
-
name.slice(0, name.indexOf(getLocalStoragePrefix())) +
|
|
491
|
-
'ChartOptions' +
|
|
492
|
-
name.slice(name.indexOf(getLocalStoragePrefix()))
|
|
493
|
-
}
|
|
485
|
+
const prefix = props.project === 'sphere'
|
|
494
486
|
const selectedValue = useLocalStorage(
|
|
495
|
-
|
|
487
|
+
name + 'ChartOptions',
|
|
496
488
|
undefined,
|
|
497
|
-
|
|
489
|
+
prefix
|
|
498
490
|
)
|
|
499
491
|
|
|
500
492
|
if (selectedValue.routeType !== routeType) return
|
|
@@ -513,20 +505,14 @@ const setCustomOptions = (name: string): void => {
|
|
|
513
505
|
localUnitsCount.value = selectedValue.timespan.unitsCount
|
|
514
506
|
localPeriodType.value = selectedValue.timespan.periodType
|
|
515
507
|
localCustomTime.value = selectedValue.timespan.units
|
|
516
|
-
localSelectedObjects.value = selectedValue.objects
|
|
517
508
|
}
|
|
518
509
|
|
|
519
510
|
const onSelectLocalOptionName = (name: string): void => {
|
|
520
511
|
selectedLocalOptionName.value = name
|
|
521
512
|
|
|
522
513
|
if (optionsNames.value.includes(name)) setCustomOptions(name)
|
|
523
|
-
else if (name === 'default')
|
|
524
|
-
|
|
525
|
-
setDefaultOptions()
|
|
526
|
-
} else if (name === 'select_options') {
|
|
527
|
-
localSelectedObjects.value = ''
|
|
528
|
-
setSelectOptions()
|
|
529
|
-
}
|
|
514
|
+
else if (name === 'default') setDefaultOptions()
|
|
515
|
+
else if (name === 'select_options') setSelectOptions()
|
|
530
516
|
}
|
|
531
517
|
|
|
532
518
|
watch(
|
|
@@ -55,6 +55,7 @@
|
|
|
55
55
|
:total-cores="props.totalCores"
|
|
56
56
|
:host-id="props.hostId"
|
|
57
57
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
58
|
+
:selected-objects="props.selectedObjects"
|
|
58
59
|
:objects-loading="props.objectsLoading"
|
|
59
60
|
:objects-data="props.objectsData"
|
|
60
61
|
:valid-date-end="props.validDateEnd"
|
|
@@ -66,7 +67,6 @@
|
|
|
66
67
|
:project="props.project"
|
|
67
68
|
:power-data="props.powerData"
|
|
68
69
|
: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,6 +116,7 @@ const props = withDefaults(
|
|
|
116
116
|
customTimeTo: string
|
|
117
117
|
totalCores: number
|
|
118
118
|
hostId: string
|
|
119
|
+
selectedObjects: string
|
|
119
120
|
objectsLoading: boolean
|
|
120
121
|
objectsData: UI_I_ObjectItem[]
|
|
121
122
|
validDateEnd: number
|
|
@@ -131,7 +132,6 @@ const props = withDefaults(
|
|
|
131
132
|
project: UI_T_Project
|
|
132
133
|
powerData: UI_I_AdvancedCounterItem[]
|
|
133
134
|
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"
|
|
52
53
|
:objects-loading="props.objectsLoading"
|
|
53
54
|
:objects-data="props.objectsData"
|
|
54
55
|
:valid-date-end="props.validDateEnd"
|
|
55
56
|
:project="props.project"
|
|
56
57
|
:power-data="props.powerData"
|
|
57
58
|
: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,6 +102,7 @@ const props = defineProps<{
|
|
|
102
102
|
customTimeTo: string
|
|
103
103
|
totalCores: number
|
|
104
104
|
hostId: string
|
|
105
|
+
selectedObjects: string
|
|
105
106
|
objectsLoading: boolean
|
|
106
107
|
objectsData: UI_I_ObjectItem[]
|
|
107
108
|
validDateEnd: number
|
|
@@ -117,7 +118,6 @@ const props = defineProps<{
|
|
|
117
118
|
project: UI_T_Project
|
|
118
119
|
powerData: UI_I_AdvancedCounterItem[]
|
|
119
120
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
120
|
-
currentSelectedObjects: string
|
|
121
121
|
}>()
|
|
122
122
|
|
|
123
123
|
const selectedRowsLocal = defineModel<UI_I_AdvancedCounterItem[]>(
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
:total-cores="props.totalCores"
|
|
19
19
|
:host-id="props.hostId"
|
|
20
20
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
21
|
+
:selected-objects="props.selectedObjects"
|
|
21
22
|
:objects-loading="props.objectsLoading"
|
|
22
23
|
:objects-data="props.objectsData"
|
|
23
24
|
:valid-date-end="props.validDateEnd"
|
|
@@ -29,7 +30,6 @@
|
|
|
29
30
|
:project="props.project"
|
|
30
31
|
:power-data="props.powerData"
|
|
31
32
|
: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"
|
|
64
65
|
:objects-loading="props.objectsLoading"
|
|
65
66
|
:objects-data="props.objectsData"
|
|
66
67
|
:valid-date-end="props.validDateEnd"
|
|
67
68
|
:project="props.project"
|
|
68
69
|
:power-data="props.powerData"
|
|
69
70
|
: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
|
|
113
114
|
objectsLoading: boolean
|
|
114
115
|
objectsData: UI_I_ObjectItem[]
|
|
115
116
|
validDateEnd: number
|
|
116
117
|
project: UI_T_Project
|
|
117
118
|
powerData: UI_I_AdvancedCounterItem[]
|
|
118
119
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
119
|
-
currentSelectedObjects: string
|
|
120
120
|
errorLastInput?: string
|
|
121
121
|
errorDateFrom?: string
|
|
122
122
|
errorTimeFrom?: string
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div
|
|
3
3
|
ref="chartOptionsBottomBlock"
|
|
4
|
-
:class="[
|
|
5
|
-
'chart-options-bottom-right-container',
|
|
6
|
-
{ 'is-scrolled': isScrolledBlock },
|
|
7
|
-
]"
|
|
4
|
+
:class="['chart-options-bottom-right-container', { 'is-scrolled' :isScrolledBlock }]"
|
|
8
5
|
>
|
|
9
6
|
<div v-show="isScrolledBlock" class="border-block"></div>
|
|
10
7
|
<common-monitor-advanced-tools-chart-options-modal-counters-table
|
|
@@ -35,6 +32,7 @@
|
|
|
35
32
|
:host-id="props.hostId"
|
|
36
33
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
37
34
|
:total-metric-items="totalMetricItemsLocal"
|
|
35
|
+
:selected-objects="props.selectedObjects"
|
|
38
36
|
:objects-loading="props.objectsLoading"
|
|
39
37
|
:objects-data="props.objectsData"
|
|
40
38
|
:valid-date-end="props.validDateEnd"
|
|
@@ -43,7 +41,6 @@
|
|
|
43
41
|
:error-time-from="props.errorTimeFrom"
|
|
44
42
|
:error-date-to="props.errorDateTo"
|
|
45
43
|
:error-time-to="props.errorTimeTo"
|
|
46
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
47
44
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
48
45
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
49
46
|
@update-timespan-type="emits('update-timespan-type', $event)"
|
|
@@ -91,13 +88,13 @@ const props = withDefaults(
|
|
|
91
88
|
totalCores: number
|
|
92
89
|
hostId: string
|
|
93
90
|
selectedMetricsKeys: number[]
|
|
91
|
+
selectedObjects: string
|
|
94
92
|
objectsLoading: boolean
|
|
95
93
|
objectsData: UI_I_ObjectItem[]
|
|
96
94
|
validDateEnd: number
|
|
97
95
|
project: UI_T_Project
|
|
98
96
|
powerData: UI_I_AdvancedCounterItem[]
|
|
99
97
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
100
|
-
currentSelectedObjects: string
|
|
101
98
|
errorLastInput?: string
|
|
102
99
|
errorDateFrom?: string
|
|
103
100
|
errorTimeFrom?: string
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
:host-id="props.hostId"
|
|
29
29
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
30
30
|
:total-metric-items="totalMetricItemsLocal"
|
|
31
|
+
:selected-objects="props.selectedObjects"
|
|
31
32
|
:objects-loading="props.objectsLoading"
|
|
32
33
|
:objects-data="props.objectsData"
|
|
33
34
|
:valid-date-end="props.validDateEnd"
|
|
34
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
35
35
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
36
36
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
37
37
|
@update-timespan-type="emits('update-timespan-type', $event)"
|
|
@@ -77,13 +77,13 @@ const props = defineProps<{
|
|
|
77
77
|
totalCores: number
|
|
78
78
|
hostId: string
|
|
79
79
|
selectedMetricsKeys: number[]
|
|
80
|
+
selectedObjects: string
|
|
80
81
|
objectsLoading: boolean
|
|
81
82
|
objectsData: UI_I_ObjectItem[]
|
|
82
83
|
validDateEnd: number
|
|
83
84
|
project: UI_T_Project
|
|
84
85
|
powerData: UI_I_AdvancedCounterItem[]
|
|
85
86
|
temperatureData: UI_I_AdvancedCounterItem[]
|
|
86
|
-
currentSelectedObjects: string
|
|
87
87
|
}>()
|
|
88
88
|
|
|
89
89
|
const emits = defineEmits<{
|
package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
:host-id="props.hostId"
|
|
18
18
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
19
19
|
:total-metric-items="props.totalMetricItems"
|
|
20
|
+
:selected-objects="props.selectedObjects"
|
|
20
21
|
:objects-loading="props.objectsLoading"
|
|
21
22
|
:objects-data="props.objectsData"
|
|
22
23
|
:valid-date-end="props.validDateEnd"
|
|
@@ -25,7 +26,6 @@
|
|
|
25
26
|
:error-time-from="props.errorTimeFrom"
|
|
26
27
|
:error-date-to="props.errorDateTo"
|
|
27
28
|
:error-time-to="props.errorTimeTo"
|
|
28
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
29
29
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
30
30
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
31
31
|
@update-timespan-type="emits('update-timespan-type', $event)"
|
|
@@ -55,10 +55,10 @@
|
|
|
55
55
|
:host-id="props.hostId"
|
|
56
56
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
57
57
|
:total-metric-items="props.totalMetricItems"
|
|
58
|
+
:selected-objects="props.selectedObjects"
|
|
58
59
|
:objects-loading="props.objectsLoading"
|
|
59
60
|
:objects-data="props.objectsData"
|
|
60
61
|
:valid-date-end="props.validDateEnd"
|
|
61
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
62
62
|
@update-chart-type="emits('update-chart-type', $event)"
|
|
63
63
|
@update-custom-time="emits('update-custom-time', $event)"
|
|
64
64
|
@update-timespan-type="emits('update-timespan-type', $event)"
|
|
@@ -98,10 +98,10 @@ const props = withDefaults(
|
|
|
98
98
|
hostId: string
|
|
99
99
|
selectedMetricsKeys: number[]
|
|
100
100
|
totalMetricItems: number
|
|
101
|
+
selectedObjects: string
|
|
101
102
|
objectsLoading: boolean
|
|
102
103
|
objectsData: UI_I_ObjectItem[]
|
|
103
104
|
validDateEnd: number
|
|
104
|
-
currentSelectedObjects: string
|
|
105
105
|
errorLastInput?: string
|
|
106
106
|
errorDateFrom?: string
|
|
107
107
|
errorTimeFrom?: string
|
package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanNew.vue
CHANGED
|
@@ -58,9 +58,9 @@
|
|
|
58
58
|
:host-id="props.hostId"
|
|
59
59
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
60
60
|
:total-metric-items="props.totalMetricItems"
|
|
61
|
+
:selected-objects="props.selectedObjects"
|
|
61
62
|
:loading="props.objectsLoading"
|
|
62
63
|
:current-items="props.objectsData"
|
|
63
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
64
64
|
@select-objects="emits('select-objects', $event)"
|
|
65
65
|
/>
|
|
66
66
|
</div>
|
|
@@ -94,10 +94,10 @@ const props = withDefaults(
|
|
|
94
94
|
hostId: string
|
|
95
95
|
selectedMetricsKeys: number[]
|
|
96
96
|
totalMetricItems: number
|
|
97
|
+
selectedObjects: string
|
|
97
98
|
objectsLoading: boolean
|
|
98
99
|
objectsData: UI_I_ObjectItem[]
|
|
99
100
|
validDateEnd: number
|
|
100
|
-
currentSelectedObjects: string
|
|
101
101
|
errorLastInput?: string
|
|
102
102
|
errorDateFrom?: string
|
|
103
103
|
errorTimeFrom?: string
|
package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanOld.vue
CHANGED
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
:host-id="props.hostId"
|
|
30
30
|
:selected-metrics-keys="props.selectedMetricsKeys"
|
|
31
31
|
:total-metric-items="props.totalMetricItems"
|
|
32
|
+
:selected-objects="props.selectedObjects"
|
|
32
33
|
:loading="props.objectsLoading"
|
|
33
34
|
:current-items="props.objectsData"
|
|
34
|
-
:current-selected-objects="props.currentSelectedObjects"
|
|
35
35
|
@select-objects="emits('select-objects', $event)"
|
|
36
36
|
/>
|
|
37
37
|
</div>
|
|
@@ -62,10 +62,10 @@ const props = defineProps<{
|
|
|
62
62
|
hostId: string
|
|
63
63
|
selectedMetricsKeys: number[]
|
|
64
64
|
totalMetricItems: number
|
|
65
|
+
selectedObjects: string
|
|
65
66
|
objectsLoading: boolean
|
|
66
67
|
objectsData: UI_I_ObjectItem[]
|
|
67
68
|
validDateEnd: number
|
|
68
|
-
currentSelectedObjects: string
|
|
69
69
|
}>()
|
|
70
70
|
|
|
71
71
|
const emits = defineEmits<{
|
|
@@ -43,7 +43,7 @@ const props = defineProps<{
|
|
|
43
43
|
hostId: string
|
|
44
44
|
selectedMetricsKeys: number[]
|
|
45
45
|
totalMetricItems: number
|
|
46
|
-
|
|
46
|
+
selectedObjects: string
|
|
47
47
|
loading: boolean
|
|
48
48
|
currentItems: UI_I_ObjectItem[]
|
|
49
49
|
}>()
|
|
@@ -228,21 +228,21 @@ watch(
|
|
|
228
228
|
selectedNames = 'total'
|
|
229
229
|
} */
|
|
230
230
|
|
|
231
|
-
|
|
231
|
+
emits('select-objects', selectedNames)
|
|
232
232
|
},
|
|
233
233
|
{ deep: true }
|
|
234
234
|
)
|
|
235
235
|
|
|
236
236
|
watch(
|
|
237
|
-
() => [props.
|
|
238
|
-
([
|
|
237
|
+
() => [props.selectedObjects, bodyItems.value],
|
|
238
|
+
([selected, all]) => {
|
|
239
239
|
if (!all.length) return
|
|
240
240
|
|
|
241
241
|
if (props.type === 'host' && props.chart === 'cpu') {
|
|
242
|
-
if (
|
|
242
|
+
if (selected === '*') {
|
|
243
243
|
selectedRow.value = all.map((item) => item[0].id)
|
|
244
244
|
} else {
|
|
245
|
-
const selectedNames =
|
|
245
|
+
const selectedNames = selected.split(', ')
|
|
246
246
|
const selectedKeys: number[] = []
|
|
247
247
|
all.forEach((item) => {
|
|
248
248
|
if (selectedNames.includes('total') && !selectedKeys.includes(0))
|
|
@@ -256,10 +256,9 @@ watch(
|
|
|
256
256
|
props.type === 'host' &&
|
|
257
257
|
['disk', 'network'].includes(props.chart)
|
|
258
258
|
) {
|
|
259
|
-
if (
|
|
260
|
-
const selectedId = all.find(
|
|
261
|
-
|
|
262
|
-
)?.[0]?.id
|
|
259
|
+
if (selected) {
|
|
260
|
+
const selectedId = all.find((item) => item[0].text === selected)?.[0]
|
|
261
|
+
?.id
|
|
263
262
|
typeof selectedId === 'number' && (selectedRow.value = selectedId)
|
|
264
263
|
}
|
|
265
264
|
}
|
|
@@ -162,11 +162,11 @@ export const getCurrentOptionsStorageFunc = (
|
|
|
162
162
|
routeType: string,
|
|
163
163
|
project: UI_T_Project
|
|
164
164
|
): string[] => {
|
|
165
|
-
|
|
165
|
+
const prefix = project === 'sphere'
|
|
166
166
|
const optionsNames = []
|
|
167
167
|
for (const key of Object.entries(localStorage)) {
|
|
168
168
|
if (key[0].includes('ChartOptions')) {
|
|
169
|
-
const currentOptions = useLocalStorage(key[0], undefined,
|
|
169
|
+
const currentOptions = useLocalStorage(key[0], undefined, prefix)
|
|
170
170
|
if (
|
|
171
171
|
key[0].includes('ChartOptions') &&
|
|
172
172
|
currentOptions.routeType === routeType
|