bfg-common 1.1.70 → 1.1.72

package/components/common/vm/actions/add/customizeHardware/virtualHardware/videoCard/VideoCard.vue

@@ -1,175 +1,177 @@
-<template>
-  <div class="hardware-cpu">
-    <atoms-stack-block :has-children="true">
-      <template #stackBlockKey>
-        <div id="vm-wizard-toggle-block-video-card" class="flex-align-center">
-          <span>{{ localization.videoCard }}: {{ videoCardModelName }}</span>
-          <atoms-the-icon
-            v-show="invalid"
-            width="24px"
-            height="24px"
-            class="is-error tooltip-trigger"
-            name="info"
-          />
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <atoms-tooltip-error
-          :has-error="!!apiError"
-          selector=".vm-wizard-video-card"
-          @remove="onRemoveValidationError"
-        >
-          <template #elem>
-            <div class="select">
-              <select
-                id="vm-wizard-video-card"
-                v-model="selectedVideoCard"
-                class="vm-wizard-video-card input-text-color"
-                :disabled="props.isEdit && props.state !== 1"
-                @click.stop
-              >
-                <option
-                  v-for="(item, key) in videoCardOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-          <template #content>{{ apiError }}</template>
-        </atoms-tooltip-error>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-number-displays
-          v-model:number-displays="numberDisplays"
-          :disabled="isDisabled"
-          :error-validation-fields="props.errorValidationFields"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-total-video-memory
-          v-model:total-video-memory="totalVideoMemory"
-          :disabled="isDisabled"
-          :is-edit="props.isEdit"
-          :error-validation-fields="props.errorValidationFields"
-          @invalid="invalid = $event"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <!--        <templates-home-vm-actions-add-customize-hardware-virtual-hardware-video-card-graphics-->
-        <!--          v-model:graphics="graphics"-->
-        <!--        />-->
-        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-model
-          v-model:video-card-model="videoCardModel"
-          :disabled="isDisabled"
-        />
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-import { videoCardModelOptionsConfig } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/videoCard/model/config/options'
-import { videoCardOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/videoCard/config/options'
-
-const props = defineProps<{
-  isEdit: boolean
-  errorValidationFields: UI_I_ErrorValidationField[]
-  videoCard?: UI_I_SendDataVideoCard
-  state?: string | number
-}>()
-const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataVideoCard): void
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedVideoCard = ref<number>(1)
-const videoCardOptions = ref<UI_I_OptionItem[]>(
-  videoCardOptionsFunc(localization.value)
-)
-
-const isDisabled = computed<boolean>(() => selectedVideoCard.value === 0 || props.isEdit && props.state !== 1)
-watch(isDisabled, (val) => {
-  if (!val) {
-    return
-  }
-
-  numberDisplays.value = '1'
-})
-const numberDisplays = ref<string>('1')
-
-const totalVideoMemory = ref<number>(8)
-const invalid = ref<boolean>(false)
-watch(
-  invalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-// const graphics = ref(false)
-
-const videoCardModel = ref<string>('qxl')
-const videoCardModelOptions = ref<UI_I_OptionItem[]>(
-  videoCardModelOptionsConfig
-)
-const videoCardModelName = computed<string>(
-  () =>
-    videoCardModelOptions.value.find(
-      (videoCard) => videoCard.value === videoCardModel.value
-    )?.text || ''
-)
-
-watch(
-  [numberDisplays, totalVideoMemory, videoCardModel],
-  () => {
-    emits('send-data', {
-      adapter: videoCardModel.value,
-      displays: +numberDisplays.value,
-      memory_mb: totalVideoMemory.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.videoCard,
-  (newValue) => {
-    if (!newValue) return
-
-    selectedVideoCard.value = 1
-    videoCardModel.value = newValue.adapter
-    numberDisplays.value = '' + newValue.displays
-    totalVideoMemory.value = newValue.memory_mb
-  },
-  { immediate: true }
-)
-
-const typeError = 'video_card.adapter'
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === typeError)
-      ?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError)
-}
-</script>
-
-<style scoped lang="scss">
-#network-connect {
-  margin-right: 4px;
-}
-</style>
+<template>
+  <div class="hardware-cpu">
+    <atoms-stack-block :has-children="true">
+      <template #stackBlockKey>
+        <div id="vm-wizard-toggle-block-video-card" class="flex-align-center">
+          <span>{{ localization.videoCard }}: {{ videoCardModelName }}</span>
+          <atoms-the-icon
+            v-show="invalid"
+            width="24px"
+            height="24px"
+            class="is-error tooltip-trigger"
+            name="info"
+          />
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <atoms-tooltip-error
+          :has-error="!!apiError"
+          selector=".vm-wizard-video-card"
+          @remove="onRemoveValidationError"
+        >
+          <template #elem>
+            <div class="select">
+              <select
+                id="vm-wizard-video-card"
+                v-model="selectedVideoCard"
+                class="vm-wizard-video-card input-text-color"
+                :disabled="props.isEdit && props.state !== 1"
+                @click.stop
+              >
+                <option
+                  v-for="(item, key) in videoCardOptions"
+                  :key="key"
+                  :value="item.value"
+                >
+                  {{ item.text }}
+                </option>
+              </select>
+            </div>
+          </template>
+          <template #content>{{ apiError }}</template>
+        </atoms-tooltip-error>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-number-displays
+          v-model:number-displays="numberDisplays"
+          :disabled="isDisabled"
+          :error-validation-fields="props.errorValidationFields"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-total-video-memory
+          v-model:total-video-memory="totalVideoMemory"
+          :disabled="isDisabled"
+          :is-edit="props.isEdit"
+          :error-validation-fields="props.errorValidationFields"
+          @invalid="invalid = $event"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <!--        <templates-home-vm-actions-add-customize-hardware-virtual-hardware-video-card-graphics-->
+        <!--          v-model:graphics="graphics"-->
+        <!--        />-->
+        <common-vm-actions-add-customize-hardware-virtual-hardware-video-card-model
+          v-model:video-card-model="videoCardModel"
+          :disabled="isDisabled"
+        />
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+import { videoCardModelOptionsConfig } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/videoCard/model/config/options'
+import { videoCardOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/videoCard/config/options'
+
+const props = defineProps<{
+  isEdit: boolean
+  errorValidationFields: UI_I_ErrorValidationField[]
+  videoCard?: UI_I_SendDataVideoCard
+  state?: string | number
+}>()
+const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataVideoCard): void
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedVideoCard = ref<number>(1)
+const videoCardOptions = ref<UI_I_OptionItem[]>(
+  videoCardOptionsFunc(localization.value)
+)
+
+const isDisabled = computed<boolean>(
+  () => selectedVideoCard.value === 0 || (props.isEdit && props.state !== 1)
+)
+watch(isDisabled, (val) => {
+  if (!val) {
+    return
+  }
+
+  numberDisplays.value = '1'
+})
+const numberDisplays = ref<string>('1')
+
+const totalVideoMemory = ref<number>(8)
+const invalid = ref<boolean>(false)
+watch(
+  invalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+// const graphics = ref(false)
+
+const videoCardModel = ref<string>('qxl')
+const videoCardModelOptions = ref<UI_I_OptionItem[]>(
+  videoCardModelOptionsConfig
+)
+const videoCardModelName = computed<string>(
+  () =>
+    videoCardModelOptions.value.find(
+      (videoCard) => videoCard.value === videoCardModel.value
+    )?.text || ''
+)
+
+watch(
+  [numberDisplays, totalVideoMemory, videoCardModel],
+  () => {
+    emits('send-data', {
+      adapter: videoCardModel.value,
+      displays: +numberDisplays.value,
+      memory_mb: totalVideoMemory.value,
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.videoCard,
+  (newValue) => {
+    if (!newValue) return
+
+    selectedVideoCard.value = 1
+    videoCardModel.value = newValue.adapter
+    numberDisplays.value = '' + newValue.displays
+    totalVideoMemory.value = newValue.memory_mb
+  },
+  { immediate: true }
+)
+
+const typeError = 'video_card.adapter'
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === typeError)
+      ?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError)
+}
+</script>
+
+<style scoped lang="scss">
+#network-connect {
+  margin-right: 4px;
+}
+</style>

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

@@ -23,7 +23,7 @@
           </template>
           <template
             v-for="(item, index) in bootList"
-            :key="index + 5"
+            :key="bootList.length + index"
             #[`rightSide${index}`]
           >
             <div :class="['device-icon', item.iconClassName]" />

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

@@ -131,7 +131,6 @@ const vmNameLocal = computed<string>({
 
 const guestMachineTypeLocal = computed<UI_I_OptionItem | null>({
   get() {
-    console.log(props.guestMachineType, 111);
     return props.guestMachineType
   },
   set(newValue) {
@@ -142,7 +141,6 @@ const machineTypeOptions = ref<UI_I_OptionItem[]>(capabilities.machineTypes)
 
 const guestOsFamilyLocal = computed<UI_I_OptionItem | null>({
   get() {
-    console.log(props.guestOsFamily, 2222);
     return props.guestOsFamily
   },
   set(newValue) {
@@ -156,7 +154,6 @@ const onChangeOS = (): void => {
 
 const guestOsVersionLocal = computed<UI_I_OptionItem | null>({
   get() {
-    console.log(props.guestOsVersion, 333);
     return props.guestOsVersion
   },
   set(newValue) {

package/components/common/vm/actions/add/customizeHardware/vmoptions/remoteConsoleOptions/CopyPaste.vue

@@ -1,46 +1,51 @@
-<template>
-  <div class="">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.copyPaste }}
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center">
-          <input id="copy-paste" v-model="copyPasteLocal" :disabled="props.disabled" type="checkbox" />
-          <label for="copy-paste" class="label-text-normal">{{
-            localization.enable
-          }}</label>
-        </div>
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_Localization } from '~/models/interfaces'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  copyPaste: boolean
-  disabled: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'update:copy-paste', value: boolean): void
-}>()
-
-const copyPasteLocal = computed<boolean>({
-  get() {
-    return props.copyPaste
-  },
-  set(newValue) {
-    emits('update:copy-paste', newValue)
-  },
-})
-</script>
-
-<style scoped>
-#copy-paste {
-  margin: 0 4px 4px 0;
-}
-</style>
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.copyPaste }}
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-align-center">
+          <input
+            id="copy-paste"
+            v-model="copyPasteLocal"
+            :disabled="props.disabled"
+            type="checkbox"
+          />
+          <label for="copy-paste" class="label-text-normal">{{
+            localization.enable
+          }}</label>
+        </div>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_Localization } from '~/models/interfaces'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  copyPaste: boolean
+  disabled: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'update:copy-paste', value: boolean): void
+}>()
+
+const copyPasteLocal = computed<boolean>({
+  get() {
+    return props.copyPaste
+  },
+  set(newValue) {
+    emits('update:copy-paste', newValue)
+  },
+})
+</script>
+
+<style scoped>
+#copy-paste {
+  margin: 0 4px 4px 0;
+}
+</style>

package/components/common/vm/actions/add/customizeHardware/vmoptions/remoteConsoleOptions/keymap/Keymap.vue

@@ -1,51 +1,55 @@
-<template>
-  <div class="">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.keymap }}
-      </template>
-      <template #stackBlockContent>
-        <div class="select">
-          <select v-model="remoteConsoleTypeLocal" :disabled="props.disabled" id="keymap-select">
-            <option
-              v-for="(item, key) in keymapOptions"
-              :key="key"
-              :value="item.value"
-            >
-              {{ item.text }}
-            </option>
-          </select>
-        </div>
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { keymapOptionsConfig } from '~/components/common/vm/actions/add/customizeHardware/vmoptions/remoteConsoleOptions/keymap/config/config'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  keymap: string
-  disabled: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'update:keymap', value: string): void
-}>()
-
-const keymapOptions = ref<UI_I_OptionItem[]>(keymapOptionsConfig)
-
-const remoteConsoleTypeLocal = computed<string>({
-  get() {
-    return props.keymap
-  },
-  set(newValue) {
-    emits('update:keymap', newValue)
-  },
-})
-</script>
-
-<style scoped></style>
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.keymap }}
+      </template>
+      <template #stackBlockContent>
+        <div class="select">
+          <select
+            v-model="remoteConsoleTypeLocal"
+            :disabled="props.disabled"
+            id="keymap-select"
+          >
+            <option
+              v-for="(item, key) in keymapOptions"
+              :key="key"
+              :value="item.value"
+            >
+              {{ item.text }}
+            </option>
+          </select>
+        </div>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { keymapOptionsConfig } from '~/components/common/vm/actions/add/customizeHardware/vmoptions/remoteConsoleOptions/keymap/config/config'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  keymap: string
+  disabled: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'update:keymap', value: string): void
+}>()
+
+const keymapOptions = ref<UI_I_OptionItem[]>(keymapOptionsConfig)
+
+const remoteConsoleTypeLocal = computed<string>({
+  get() {
+    return props.keymap
+  },
+  set(newValue) {
+    emits('update:keymap', newValue)
+  },
+})
+</script>
+
+<style scoped></style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.1.70",
+  "version": "1.1.72",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",