bfg-common 1.5.580 → 1.5.581
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/components/common/vm/actions/add/Add.vue +120 -46
- package/components/common/vm/actions/add/New.vue +54 -16
- package/components/common/vm/actions/add/Old.vue +55 -16
- package/components/common/vm/actions/clone/Clone.vue +116 -44
- package/components/common/vm/actions/clone/new/New.vue +50 -14
- package/components/common/vm/actions/clone/old/Old.vue +52 -16
- package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue +81 -14
- package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue +56 -7
- package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareOld.vue +56 -8
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue +206 -211
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue +120 -225
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareOld.vue +118 -220
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue +53 -66
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue +159 -139
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/CpuNew.vue +15 -8
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/CpuOld.vue +13 -8
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue +75 -62
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue +149 -241
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskNew.vue +4 -3
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskOld.vue +3 -2
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue +100 -62
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbController.vue +17 -6
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerNew.vue +3 -6
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerOld.vue +3 -6
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue +39 -17
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue +5 -6
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue +5 -6
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options.ts +4 -4
- package/components/common/vm/actions/common/customizeHardware/vmoptions/Vmoptions.vue +93 -6
- package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsNew.vue +60 -8
- package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsOld.vue +58 -8
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptions.vue +69 -5
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsNew.vue +32 -12
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsOld.vue +33 -12
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue +132 -114
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderNew.vue +6 -41
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderOld.vue +6 -44
- package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptions.vue +23 -8
- package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsNew.vue +31 -21
- package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsOld.vue +34 -26
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/New.vue +34 -28
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/Old.vue +30 -24
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/RemoteConsoleOptions.vue +112 -8
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/Keymap.vue +3 -3
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{New.vue → KeymapNew.vue} +6 -6
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{Old.vue → KeymapOld.vue} +5 -5
- package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/Password.vue +7 -6
- package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/Tools.vue +27 -9
- package/components/common/vm/actions/common/lib/models/interfaces.ts +25 -58
- package/components/common/vm/actions/editSettings/EditSettings.vue +90 -32
- package/components/common/vm/actions/editSettings/EditSettingsOld.vue +41 -14
- package/components/common/vm/actions/editSettings/new/New.vue +41 -14
- package/components/common/vm/actions/lib/models/interfaces.ts +29 -4
- package/components/common/vm/actions/lib/utils.ts +36 -64
- package/package.json +1 -1
- /package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/{New.vue → PasswordNew.vue} +0 -0
- /package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/{Old.vue → PasswordOld.vue} +0 -0
package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model:limit="limit"
|
|
11
11
|
v-model:limit-type="limitType"
|
|
12
12
|
v-model:limit-invalid="limitInvalid"
|
|
13
|
-
v-model:memory-hot-plug="
|
|
13
|
+
v-model:memory-hot-plug="memoryHotPlug"
|
|
14
14
|
:error-validation-fields="props.errorValidationFields"
|
|
15
15
|
:memory-invalid="memoryInvalid"
|
|
16
16
|
:error-text="memorySizeLocalAndApiErrorsTexts"
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
v-model:limit="limit"
|
|
36
36
|
v-model:limit-type="limitType"
|
|
37
37
|
v-model:limit-invalid="limitInvalid"
|
|
38
|
-
v-model:memory-hot-plug="
|
|
38
|
+
v-model:memory-hot-plug="memoryHotPlug"
|
|
39
39
|
:error-validation-fields="props.errorValidationFields"
|
|
40
40
|
:memory-invalid="memoryInvalid"
|
|
41
41
|
:error-text="memorySizeLocalAndApiErrorsTexts"
|
|
@@ -52,29 +52,31 @@
|
|
|
52
52
|
</template>
|
|
53
53
|
|
|
54
54
|
<script setup lang="ts">
|
|
55
|
+
import type { API_UI_I_VmEditMemory } from '~/lib/models/store/vm/interfaces'
|
|
56
|
+
import type { UI_I_SendDataMemory } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
|
|
55
57
|
import type { UI_I_Localization } from '~/lib/models/interfaces'
|
|
56
58
|
import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
|
|
57
59
|
import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
|
|
58
|
-
import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
|
|
59
60
|
import {
|
|
60
61
|
memoryOptionsFunc,
|
|
61
62
|
memoryTypeOptionsFunc,
|
|
62
63
|
} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
|
|
63
64
|
|
|
64
|
-
const model = defineModel<UI_I_CreateVmData>({ required: true })
|
|
65
|
-
|
|
66
65
|
const props = withDefaults(
|
|
67
66
|
defineProps<{
|
|
68
67
|
maxMemory: number
|
|
69
68
|
isEdit: boolean
|
|
70
69
|
errorValidationFields: UI_I_ErrorValidationField[]
|
|
71
70
|
state?: string | number
|
|
71
|
+
memory?: API_UI_I_VmEditMemory
|
|
72
72
|
}>(),
|
|
73
73
|
{
|
|
74
74
|
state: undefined,
|
|
75
|
+
memory: undefined,
|
|
75
76
|
}
|
|
76
77
|
)
|
|
77
78
|
const emits = defineEmits<{
|
|
79
|
+
(event: 'send-data', value: UI_I_SendDataMemory): void
|
|
78
80
|
(event: 'invalid', value: boolean): void
|
|
79
81
|
(event: 'remove-error-by-title', value: string): void
|
|
80
82
|
}>()
|
|
@@ -101,7 +103,7 @@ const isDisabled = computed<boolean>(() => {
|
|
|
101
103
|
})
|
|
102
104
|
|
|
103
105
|
const isMemoryDisabled = computed<boolean>(
|
|
104
|
-
() => isDisabled.value && !
|
|
106
|
+
() => isDisabled.value && !memoryHotPlug.value
|
|
105
107
|
)
|
|
106
108
|
|
|
107
109
|
const selectedMemory = ref<number>(4)
|
|
@@ -120,18 +122,6 @@ const memoryInMb = computed<number>(() => {
|
|
|
120
122
|
|
|
121
123
|
return $binary.universalFromTo(+selectedMemory.value, memoryType.value, 'mb')
|
|
122
124
|
})
|
|
123
|
-
watch(memoryInMb, (newValue) => {
|
|
124
|
-
model.value.memory.size_mb = newValue
|
|
125
|
-
})
|
|
126
|
-
if (model.value.memory.size_mb !== 4096) {
|
|
127
|
-
const sizeInGb = $binary.mbToGb(model.value.memory.size_mb)
|
|
128
|
-
if (sizeInGb < 1) {
|
|
129
|
-
selectedMemory.value = model.value.memory.size_mb
|
|
130
|
-
memoryType.value = 'mb'
|
|
131
|
-
} else {
|
|
132
|
-
selectedMemory.value = sizeInGb
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
125
|
|
|
136
126
|
const memoryOptions = ref<UI_I_OptionItem[]>(
|
|
137
127
|
memoryOptionsFunc(localization.value, minMemoryInMb, props.maxMemory)
|
|
@@ -221,26 +211,6 @@ watch(reservation, (newValue) => {
|
|
|
221
211
|
})
|
|
222
212
|
const reservationType = ref<string>('mb')
|
|
223
213
|
const reserveGuestMemory = ref<boolean>(false)
|
|
224
|
-
if (model.value.memory.reservation_mb !== 2) {
|
|
225
|
-
const reservationInGb = $binary.mbToGb(model.value.memory.reservation_mb)
|
|
226
|
-
if (reservationInGb < 1) {
|
|
227
|
-
reservation.value = model.value.memory.reservation_mb.toString()
|
|
228
|
-
reservationType.value = 'mb'
|
|
229
|
-
} else {
|
|
230
|
-
reservation.value = reservationInGb
|
|
231
|
-
reservationType.value = 'gb'
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
watch(
|
|
235
|
-
[reservation, reservationType],
|
|
236
|
-
() => {
|
|
237
|
-
model.value.memory.reservation_mb =
|
|
238
|
-
reservationType.value === 'gb'
|
|
239
|
-
? $binary.gbToMb(+reservation.value)
|
|
240
|
-
: +reservation.value
|
|
241
|
-
},
|
|
242
|
-
{ deep: true, immediate: true }
|
|
243
|
-
)
|
|
244
214
|
|
|
245
215
|
const limit = ref<string>('Unlimited')
|
|
246
216
|
watch(limit, (newValue) => {
|
|
@@ -250,47 +220,90 @@ watch(limit, (newValue) => {
|
|
|
250
220
|
})
|
|
251
221
|
const limitType = ref<string>('mb')
|
|
252
222
|
const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
|
|
253
|
-
if (
|
|
223
|
+
if (memoryHotPlug.value)
|
|
254
224
|
return memoryOptionsFunc(
|
|
255
225
|
localization.value,
|
|
256
226
|
memoryInMb.value,
|
|
257
227
|
props.maxMemory
|
|
258
228
|
)
|
|
259
229
|
})
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
limit.value = limitInGb
|
|
270
|
-
limitType.value = 'gb'
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
}
|
|
230
|
+
|
|
231
|
+
const memoryHotPlug = ref<boolean>(false)
|
|
232
|
+
const isDisabledMemoryHotPlug = computed<boolean>(
|
|
233
|
+
() => memoryInMb.value >= props.maxMemory || isDisabled.value
|
|
234
|
+
)
|
|
235
|
+
watch(isDisabledMemoryHotPlug, (newValue) => {
|
|
236
|
+
if (newValue) memoryHotPlug.value = false
|
|
237
|
+
})
|
|
238
|
+
|
|
274
239
|
watch(
|
|
275
|
-
[limit, limitType],
|
|
240
|
+
[memoryInMb, memoryHotPlug, reservation, reservationType, limit, limitType],
|
|
276
241
|
() => {
|
|
277
|
-
|
|
242
|
+
const reservationInMb =
|
|
243
|
+
reservationType.value === 'mb'
|
|
244
|
+
? reservation.value
|
|
245
|
+
: '' +
|
|
246
|
+
$binary.universalFromTo(
|
|
247
|
+
reservation.value,
|
|
248
|
+
reservationType.value,
|
|
249
|
+
'mb',
|
|
250
|
+
12
|
|
251
|
+
)
|
|
252
|
+
const limitInMb =
|
|
278
253
|
limit.value === 'Unlimited'
|
|
279
254
|
? limit.value
|
|
280
255
|
: limitType.value === 'gb'
|
|
281
256
|
? $binary.gbToMb(+limit.value)
|
|
282
257
|
: +limit.value
|
|
258
|
+
emits('send-data', {
|
|
259
|
+
memory: '' + memoryInMb.value,
|
|
260
|
+
hotplug: memoryHotPlug.value,
|
|
261
|
+
reservation_mb: reservationInMb,
|
|
262
|
+
limit_mb: limitInMb,
|
|
263
|
+
})
|
|
283
264
|
},
|
|
284
|
-
{
|
|
265
|
+
{ immediate: true }
|
|
285
266
|
)
|
|
286
267
|
|
|
287
|
-
//
|
|
288
|
-
|
|
289
|
-
() =>
|
|
268
|
+
// Добавляем данные для редактирования
|
|
269
|
+
watch(
|
|
270
|
+
() => props.memory,
|
|
271
|
+
(newValue) => {
|
|
272
|
+
if (!newValue) return
|
|
273
|
+
|
|
274
|
+
const sizeInGb = $binary.mbToGb(newValue.size_mb)
|
|
275
|
+
if (sizeInGb < 1) {
|
|
276
|
+
selectedMemory.value = newValue.size_mb
|
|
277
|
+
memoryType.value = 'mb'
|
|
278
|
+
} else {
|
|
279
|
+
selectedMemory.value = sizeInGb
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
const reservationInGb = $binary.mbToGb(newValue.reservation_mb)
|
|
283
|
+
if (reservationInGb < 1) {
|
|
284
|
+
reservation.value = newValue.reservation_mb
|
|
285
|
+
reservationType.value = 'mb'
|
|
286
|
+
} else {
|
|
287
|
+
reservation.value = reservationInGb
|
|
288
|
+
reservationType.value = 'gb'
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
if (typeof newValue.limit_mb === 'string') limit.value = newValue.limit_mb
|
|
292
|
+
else {
|
|
293
|
+
const limitInGb = $binary.mbToGb(newValue.limit_mb)
|
|
294
|
+
if (limitInGb < 1) {
|
|
295
|
+
limit.value = newValue.limit_mb
|
|
296
|
+
limitType.value = 'mb'
|
|
297
|
+
} else {
|
|
298
|
+
limit.value = limitInGb
|
|
299
|
+
limitType.value = 'gb'
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
memoryHotPlug.value = newValue.hotplug
|
|
304
|
+
},
|
|
305
|
+
{ immediate: true }
|
|
290
306
|
)
|
|
291
|
-
watch(isDisabledMemoryHotPlug, (newValue) => {
|
|
292
|
-
if (newValue) model.value.memory.hotplug = false
|
|
293
|
-
})
|
|
294
307
|
|
|
295
308
|
const onRemoveValidationError = (): void => {
|
|
296
309
|
emits('remove-error-by-title', 'memory.size_mb')
|