bfg-common 1.5.591 → 1.5.592

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/menu/Menu.vue

@@ -1,26 +1,25 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu-new
-    v-if="isNewView"
-    v-model:boot-menu="bootMenu"
-    :is-disabled="props.isDisabled"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu-old
-    v-else
-    v-model:boot-menu="bootMenu"
-    :is-disabled="props.isDisabled"
-  />
-</template>
-
-<script setup lang="ts">
-const bootMenu = defineModel<boolean>('bootMenu', {required: true})
-
-const props = defineProps<{
-  isDisabled: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style scoped>
-</style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model:boot-menu="bootMenu"
+    :is-disabled="props.isDisabled"
+  />
+</template>
+
+<script setup lang="ts">
+const bootMenu = defineModel<boolean>('bootMenu', { required: true })
+
+const props = defineProps<{
+  isDisabled: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+</script>
+
+<style scoped></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue

@@ -1,156 +1,155 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-new
-    v-if="isNewView"
-    :boot-list="bootList"
-    :is-disabled="props.isDisabled"
-    @change-order="onChangeOrder"
-    @update:boot-list="onBootListUpdate"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-old
-    v-else
-    :boot-list="bootList"
-    :is-disabled="props.isDisabled"
-    @change-order="onChangeOrder"
-    @update:boot-list="onBootListUpdate"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_BootItem } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/lib/models/interfaces'
-import type { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/lib/config/events'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
-
-const props = defineProps<{
-  isDisabled: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const bootList = ref<UI_I_BootItem[]>([])
-
-// Используем computed для автоматического обновления bootList при изменении модели
-const hardDisksAndNetworks = computed(() => [
-  model.value.disk_devices?.filter((disk) => disk.device_type !== 'cdrom') ||
-    [],
-  model.value.disk_devices?.filter((disk) => disk.device_type === 'cdrom') ||
-    [],
-  model.value.network_devices || [],
-])
-
-// Watcher для обновления bootList при изменении модели
-watch(
-  hardDisksAndNetworks,
-  ([hardDisks, cdDvdDrives, networks]) => {
-    const hardDiskItems: UI_I_BootItem[] = hardDisks.map((item, index) => {
-      const order = item.boot_order || 0
-      return {
-        order,
-        isChecked: !!order,
-        text: `disk${index}`,
-        iconClassName: 'icon-disk',
-        type: 'disk' as const,
-        name: `${item.source}_${index}`,
-        testId: `select-disk-value-${index + 1}`,
-      }
-    })
-
-    const cdDvdDriveItems: UI_I_BootItem[] = cdDvdDrives.map((item, index) => {
-      const order = item.boot_order || 0
-      return {
-        order,
-        isChecked: !!order,
-        text: `cdrom${index}`,
-        iconClassName: 'icon-disk',
-        type: 'cdDvd' as const,
-        name: `${item.source}_${hardDisks.length + index}`,
-        testId: `select-cd-dvd-value-${index + 1}`,
-      }
-    })
-
-    const networkItems: UI_I_BootItem[] = networks.map((item, index) => {
-      const order = item.boot_order || 0
-      return {
-        order,
-        isChecked: !!order,
-        text: item.mac || 'undefined',
-        iconClassName: 'vsphere-icon-network',
-        type: 'nic' as const,
-        name: `${item.network}_${index}`,
-        testId: `select-nic-value-${index + 1}`,
-      }
-    })
-
-    bootList.value = [...hardDiskItems, ...cdDvdDriveItems, ...networkItems]
-      .filter((item) => item.order >= 0)
-      .sort((a, b) => a.order - b.order)
-  },
-  { deep: true, immediate: true }
-)
-
-// Обработчик изменения порядка через drag & drop
-const onChangeOrder = (event: UI_I_DropEvent): void => {
-  const updatedList = [...bootList.value]
-  const movedItem = updatedList.find((item) => item.name === event.target.name)
-
-  if (!movedItem) return
-
-  // Удаляем элемент из текущей позиции
-  const fromIndex = updatedList.indexOf(movedItem)
-  updatedList.splice(fromIndex, 1)
-
-  // Вставляем элемент в новую позицию
-  updatedList.splice(event.toPosition, 0, movedItem)
-
-  // Обновляем порядок всех элементов
-  updatedList.forEach((item, index) => {
-    item.order = index + 1
-  })
-
-  bootList.value = updatedList
-  updateModelFromBootList(updatedList)
-}
-
-// Обработчик обновления bootList (при изменении чекбоксов)
-const onBootListUpdate = (updatedBootList: UI_I_BootItem[]): void => {
-  bootList.value = updatedBootList
-  updateModelFromBootList(updatedBootList)
-}
-
-// Функция для обновления модели на основе bootList
-const updateModelFromBootList = (bootItems: UI_I_BootItem[]): void => {
-  // Сначала сбрасываем все boot_order
-  model.value.disk_devices?.forEach((disk) => {
-    disk.boot_order = 0
-  })
-  model.value.network_devices?.forEach((network) => {
-    network.boot_order = 0
-  })
-
-  // Затем устанавливаем boot_order только для выбранных элементов
-  let currentOrder = 1
-  bootItems.forEach((bootItem) => {
-    if (!bootItem.isChecked) return
-
-    if (bootItem.type === 'nic') {
-      const [networkName, indexStr] = bootItem.name.split('_')
-      const index = parseInt(indexStr, 10)
-      const network = model.value.network_devices?.[index]
-      if (network && network.network === networkName) {
-        network.boot_order = currentOrder++
-      }
-    } else {
-      const [source, indexStr] = bootItem.name.split('_')
-      const index = parseInt(indexStr, 10)
-      const disk = model.value.disk_devices?.[index]
-      if (disk && disk.source === source) {
-        disk.boot_order = currentOrder++
-      }
-    }
-  })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-if="isNewView"
+    :boot-list="bootList"
+    :is-disabled="props.isDisabled"
+    @change-order="onChangeOrder"
+    @update:boot-list="onBootListUpdate"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_BootItem } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/lib/models/interfaces'
+import type { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/lib/config/events'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
+const props = defineProps<{
+  isDisabled: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const bootList = ref<UI_I_BootItem[]>([])
+
+// Используем computed для автоматического обновления bootList при изменении модели
+const hardDisksAndNetworks = computed(() => [
+  model.value.disk_devices?.filter((disk) => disk.device_type !== 'cdrom') ||
+    [],
+  model.value.disk_devices?.filter((disk) => disk.device_type === 'cdrom') ||
+    [],
+  model.value.network_devices || [],
+])
+
+// Watcher для обновления bootList при изменении модели
+watch(
+  hardDisksAndNetworks,
+  ([hardDisks, cdDvdDrives, networks]) => {
+    const hardDiskItems: UI_I_BootItem[] = hardDisks.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: `disk${index}`,
+        iconClassName: 'icon-disk',
+        type: 'disk' as const,
+        name: `${item.source}_${index}`,
+        testId: `select-disk-value-${index + 1}`,
+      }
+    })
+
+    const cdDvdDriveItems: UI_I_BootItem[] = cdDvdDrives.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: `cdrom${index}`,
+        iconClassName: 'icon-disk',
+        type: 'cdDvd' as const,
+        name: `${item.source}_${hardDisks.length + index}`,
+        testId: `select-cd-dvd-value-${index + 1}`,
+      }
+    })
+
+    const networkItems: UI_I_BootItem[] = networks.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: item.mac || 'undefined',
+        iconClassName: 'vsphere-icon-network',
+        type: 'nic' as const,
+        name: `${item.network}_${index}`,
+        testId: `select-nic-value-${index + 1}`,
+      }
+    })
+
+    bootList.value = [...hardDiskItems, ...cdDvdDriveItems, ...networkItems]
+      .filter((item) => item.order >= 0)
+      .sort((a, b) => a.order - b.order)
+  },
+  { deep: true, immediate: true }
+)
+
+// Обработчик изменения порядка через drag & drop
+const onChangeOrder = (event: UI_I_DropEvent): void => {
+  const updatedList = [...bootList.value]
+  const movedItem = updatedList.find((item) => item.name === event.target.name)
+
+  if (!movedItem) return
+
+  // Удаляем элемент из текущей позиции
+  const fromIndex = updatedList.indexOf(movedItem)
+  updatedList.splice(fromIndex, 1)
+
+  // Вставляем элемент в новую позицию
+  updatedList.splice(event.toPosition, 0, movedItem)
+
+  // Обновляем порядок всех элементов
+  updatedList.forEach((item, index) => {
+    item.order = index + 1
+  })
+
+  bootList.value = updatedList
+  updateModelFromBootList(updatedList)
+}
+
+// Обработчик обновления bootList (при изменении чекбоксов)
+const onBootListUpdate = (updatedBootList: UI_I_BootItem[]): void => {
+  bootList.value = updatedBootList
+  updateModelFromBootList(updatedBootList)
+}
+
+// Функция для обновления модели на основе bootList
+const updateModelFromBootList = (bootItems: UI_I_BootItem[]): void => {
+  // Сначала сбрасываем все boot_order
+  model.value.disk_devices?.forEach((disk) => {
+    disk.boot_order = 0
+  })
+  model.value.network_devices?.forEach((network) => {
+    network.boot_order = 0
+  })
+
+  // Затем устанавливаем boot_order только для выбранных элементов
+  let currentOrder = 1
+  bootItems.forEach((bootItem) => {
+    if (!bootItem.isChecked) return
+
+    if (bootItem.type === 'nic') {
+      const [networkName, indexStr] = bootItem.name.split('_')
+      const index = parseInt(indexStr, 10)
+      const network = model.value.network_devices?.[index]
+      if (network && network.network === networkName) {
+        network.boot_order = currentOrder++
+      }
+    } else {
+      const [source, indexStr] = bootItem.name.split('_')
+      const index = parseInt(indexStr, 10)
+      const disk = model.value.disk_devices?.[index]
+      if (disk && disk.source === source) {
+        disk.boot_order = currentOrder++
+      }
+    }
+  })
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptions.vue

@@ -1,86 +1,82 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-general-options-new
-    v-if="isNewView"
-    v-model="model"
-    v-model:block-is-open="blockIsOpen"
-    :name-label="nameLabel"
-    :is-disabled="isDisabled"
-    :machine-type-options="machineTypeOptions"
-    :os-options="osOptions"
-    :versions-options="versionsOptions"
-    @change-os="onChangeOS"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-general-options-old
-    v-else
-    v-model="model"
-    v-model:block-is-open="blockIsOpen"
-    :name-label="nameLabel"
-    :is-disabled="isDisabled"
-    :machine-type-options="machineTypeOptions"
-    :os-options="osOptions"
-    :versions-options="versionsOptions"
-    @change-os="onChangeOS"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
-
-const props = withDefaults(
-  defineProps<{
-    isEdit: boolean
-    isClone: boolean
-    state?: string | number
-    isVmt?: boolean
-  }>(),
-  {
-    state: undefined,
-    isVmt: undefined,
-  }
-)
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isDisabled = computed<boolean>(
-  () => (!props.isEdit && !props.isClone) || (props.isEdit && props.state !== 1)
-)
-const machineTypeOptions = ref<UI_I_OptionItem[]>(
-  capabilities.value.machineTypes
-)
-
-const osOptions = ref<UI_I_OptionItem[]>(capabilities.value.guestOsFamilies)
-const onChangeOS = (): void => {
-  model.value.guest_os_version = versionsOptions.value[0].value
-}
-
-const versionsOptions = computed<UI_I_OptionItem[]>(() => {
-  if (!model.value.guest_os_family) return []
-
-  return capabilities.value.guestOsVersions[model.value.guest_os_family.value] || []
-})
-watch(
-  versionsOptions,
-  () => {
-    model.value.guest_os_version = versionsOptions.value[0].value
-  }
-  // { immediate: true }
-)
-
-const blockIsOpen = ref<boolean>(false)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const nameLabel = computed<string>(() => {
-  return props.isVmt
-    ? localization.value.common.vmtName
-    : localization.value.common.vmName
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model="model"
+    v-model:block-is-open="blockIsOpen"
+    :name-label="nameLabel"
+    :is-disabled="isDisabled"
+    :machine-type-options="machineTypeOptions"
+    :os-options="osOptions"
+    :versions-options="versionsOptions"
+    @change-os="onChangeOS"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
+const props = withDefaults(
+  defineProps<{
+    isEdit: boolean
+    isClone: boolean
+    state?: string | number
+    isVmt?: boolean
+  }>(),
+  {
+    state: undefined,
+    isVmt: undefined,
+  }
+)
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const isDisabled = computed<boolean>(
+  () => (!props.isEdit && !props.isClone) || (props.isEdit && props.state !== 1)
+)
+const machineTypeOptions = ref<UI_I_OptionItem[]>(
+  capabilities.value.machineTypes
+)
+
+const osOptions = ref<UI_I_OptionItem[]>(capabilities.value.guestOsFamilies)
+const onChangeOS = (): void => {
+  model.value.guest_os_version = versionsOptions.value[0].value
+}
+
+const versionsOptions = computed<UI_I_OptionItem[]>(() => {
+  if (!model.value.guest_os_family) return []
+
+  return (
+    capabilities.value.guestOsVersions[model.value.guest_os_family.value] || []
+  )
+})
+watch(
+  versionsOptions,
+  () => {
+    model.value.guest_os_version = versionsOptions.value[0].value
+  }
+  // { immediate: true }
+)
+
+const blockIsOpen = ref<boolean>(false)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const nameLabel = computed<string>(() => {
+  return props.isVmt
+    ? localization.value.common.vmtName
+    : localization.value.common.vmName
+})
+</script>
+
+<style scoped lang="scss"></style>