bfg-common 1.5.431 → 1.5.433

package/components/common/spiceConsole/SpiceConsole.vue

@@ -1,127 +1,127 @@
-<template>
-  <div ref="fullScreen" class="spice-console">
-    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
-    <common-spice-console-drawer
-      @toggle-fullscreen="toggle"
-      @send-alt-command="onSendAltCommand"
-    />
-  </div>
-</template>
-<script setup lang="ts">
-import { useFullscreen } from '@vueuse/core'
-import RFB from '@novnc/novnc/core/rfb.js'
-import SpiceConsole from '~/plugins/spice-console/spice.console'
-
-const props = defineProps<{
-  wsUrl: string
-  vmType: string
-  vmId: string
-  host: string
-  port: number
-}>()
-
-let rfb: any
-const vmScreen = ref<any>(null)
-const fullScreen = ref<any>(null)
-const { toggle } = useFullscreen(fullScreen)
-
-const connectWS = (): void => {
-  if (props.vmType === 'VNC') {
-    connectVNC()
-  } else if (props.vmType === 'SPICE') {
-    SpiceConsole.init(props.wsUrl)
-  }
-}
-
-const connectVNC = (): void => {
-  rfb = new RFB(vmScreen.value, props.wsUrl, {
-    protocols: {},
-  })
-}
-
-const vmDisconnect = (): void => {
-  if (props.vmType === 'VNC') {
-    if (rfb) {
-      rfb.disconnect()
-    }
-  }
-}
-
-const onSendAltCommand = (): void => {
-  // @ts-ignore
-  window.app.sendCtrlAltDelete()
-}
-
-const onConsoleScroll = (event: any): void => {
-  app.clientGui.setClientOffset(
-    app.clientGui.clientOffsetX,
-    event.target.scrollTop
-  )
-}
-
-const blockCtrlOrCmdCommands = (e): void => {
-  const blockedKeys = [
-    'e',
-    's',
-    'p',
-    'u',
-    'r',
-    'o',
-    'i',
-    'j',
-    'k',
-    'n',
-    't',
-    'w',
-    'h',
-    'd',
-  ]
-
-  const key = e.key
-  const ctrlOrCmd = e.ctrlKey || e.metaKey
-
-  // Block Ctrl+key or Cmd+key
-  if (ctrlOrCmd && blockedKeys.includes(key.toLowerCase())) {
-    e.preventDefault()
-    e.stopPropagation()
-    // console.log(`Blocked key: ${key}`);
-    return false
-  }
-
-  // Optionally block right-click menu key (context menu)
-  // if (e.key === 'ContextMenu') {
-  //   e.preventDefault();
-  //   return false;
-  // }
-
-  // Optional: block F5/Reload with Ctrl+R as fallback
-  // if (key === 'F5' || (ctrlOrCmd && key.toLowerCase() === 'r')) {
-  //   e.preventDefault();
-  //   return false;
-  // }
-}
-onMounted(() => {
-  connectWS()
-  document.addEventListener('keydown', blockCtrlOrCmdCommands)
-})
-
-onBeforeUnmount(() => {
-  vmDisconnect()
-  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
-})
-</script>
-<style scoped lang="scss">
-.spice-console {
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-  position: relative;
-}
-#vmw {
-  overflow-y: auto;
-  overflow-x: auto;
-  position: relative;
-  height: 100vh;
-  background-color: #000;
-}
-</style>
+<template>
+  <div ref="fullScreen" class="spice-console">
+    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
+    <common-spice-console-drawer
+      @toggle-fullscreen="toggle"
+      @send-alt-command="onSendAltCommand"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+import { useFullscreen } from '@vueuse/core'
+import RFB from '@novnc/novnc/core/rfb.js'
+import SpiceConsole from '~/plugins/spice-console/spice.console'
+
+const props = defineProps<{
+  wsUrl: string
+  vmType: string
+  vmId: string
+  host: string
+  port: number
+}>()
+
+let rfb: any
+const vmScreen = ref<any>(null)
+const fullScreen = ref<any>(null)
+const { toggle } = useFullscreen(fullScreen)
+
+const connectWS = (): void => {
+  if (props.vmType === 'VNC') {
+    connectVNC()
+  } else if (props.vmType === 'SPICE') {
+    SpiceConsole.init(props.wsUrl)
+  }
+}
+
+const connectVNC = (): void => {
+  rfb = new RFB(vmScreen.value, props.wsUrl, {
+    protocols: {},
+  })
+}
+
+const vmDisconnect = (): void => {
+  if (props.vmType === 'VNC') {
+    if (rfb) {
+      rfb.disconnect()
+    }
+  }
+}
+
+const onSendAltCommand = (): void => {
+  // @ts-ignore
+  window.app.sendCtrlAltDelete()
+}
+
+const onConsoleScroll = (event: any): void => {
+  app.clientGui.setClientOffset(
+    app.clientGui.clientOffsetX,
+    event.target.scrollTop
+  )
+}
+
+const blockCtrlOrCmdCommands = (e): void => {
+  const blockedKeys = [
+    'e',
+    's',
+    'p',
+    'u',
+    'r',
+    'o',
+    'i',
+    'j',
+    'k',
+    'n',
+    't',
+    'w',
+    'h',
+    'd',
+  ]
+
+  const key = e.key
+  const ctrlOrCmd = e.ctrlKey || e.metaKey
+
+  // Block Ctrl+key or Cmd+key
+  if (ctrlOrCmd && blockedKeys.includes(key.toLowerCase())) {
+    e.preventDefault()
+    e.stopPropagation()
+    // console.log(`Blocked key: ${key}`);
+    return false
+  }
+
+  // Optionally block right-click menu key (context menu)
+  // if (e.key === 'ContextMenu') {
+  //   e.preventDefault();
+  //   return false;
+  // }
+
+  // Optional: block F5/Reload with Ctrl+R as fallback
+  // if (key === 'F5' || (ctrlOrCmd && key.toLowerCase() === 'r')) {
+  //   e.preventDefault();
+  //   return false;
+  // }
+}
+onMounted(() => {
+  connectWS()
+  document.addEventListener('keydown', blockCtrlOrCmdCommands)
+})
+
+onBeforeUnmount(() => {
+  vmDisconnect()
+  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
+})
+</script>
+<style scoped lang="scss">
+.spice-console {
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  position: relative;
+}
+#vmw {
+  overflow-y: auto;
+  overflow-x: auto;
+  position: relative;
+  height: 100vh;
+  background-color: #000;
+}
+</style>

package/components/common/spiceConsole/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-export interface UI_I_DeviceOption {
-  label: string
-  value: any
-  disabled?: boolean
-}
+export interface UI_I_DeviceOption {
+  label: string
+  value: any
+  disabled?: boolean
+}

package/components/common/tools/Actions.vue

@@ -1,207 +1,207 @@
-<template>
-  <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
-  <div
-    :id="id"
-    :style="{ paddingRight: spaceForCollapseBtn + 'px' }"
-    class="btn-group"
-  >
-    <div v-for="(button, key) in props.actions" :key="button.type">
-      <label
-        v-if="button.uploaded"
-        v-development="button.development"
-        v-permission="button.permission"
-        >
-        <span
-          :class="[`btn btn-link ${props.size}`]"
-          :data-id="`${button.testId}-text`"
-        >
-          <slot name="icon" :data="button" />
-          {{ button.text }}
-        </span>
-        <input
-          :id="`select-file-button-${key}`"
-          :data-id="button.testId"
-          :disabled="button.disabled"
-          :multiple="button?.multiple || false"
-          type="file"
-          class="btn-group__file"
-          @change="(event) => onSelectFiles(event, button.type, key)"
-        />
-      </label>
-
-      <button
-        v-else
-        :id="`actions-button-${key}`"
-        v-development="button.development"
-        v-permission="button.permission"
-        :data-id="button.testId"
-        :class="[`btn btn-link ${props.size}`]"
-        :disabled="button.disabled"
-        @click="onClickButton(button.type)"
-      >
-        <slot name="icon" :data="button" />
-        {{ button.text }}
-      </button>
-    </div>
-    <atoms-collapse-nav
-      v-show="collapsedItems.length"
-      :test-id="`${props.testId}-item`"
-      :items="collapsedItems"
-      class="nav-tabs"
-      close-after-click
-      @change="onClickButton"
-      @select-file="onSelectFiles"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Button } from '~/components/common/tools/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    actions: UI_I_Button[]
-    testId: string
-    size?: 'btn-sm' | ''
-  }>(),
-  {
-    size: 'btn-sm',
-  }
-)
-const emits = defineEmits<{
-  (event: 'click', value1: string, value2?: Event | null): void
-}>()
-
-const onClickButton = (type: string): void => {
-  emits('click', type)
-}
-
-const onSelectFiles = (event: Event, type: string, key: number): void => {
-  emits('click', type, event)
-
-  const input = document.getElementById(
-    `select-file-button-${key}`
-  ) as HTMLInputElement | null
-  input && (input.value = '')
-}
-
-const visibleCount = ref<number>(props.actions.length)
-const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
-  return props.actions
-    .filter((_, index) => {
-      return index >= visibleCount.value
-    })
-    .map((item) => {
-      return {
-        text: item.text,
-        value: item.type,
-        disabled: item.disabled,
-        development: item.development,
-        permission: item.permission,
-        uploaded: item.uploaded,
-        testId: item.testId,
-      }
-    })
-})
-watch(
-  () => props.actions,
-  () => {
-    // visibleCount.value = newValue.length
-    outputSize()
-  },
-  { deep: true }
-)
-
-// const rightSpace = ref<number>(0)
-// watch(
-//   collapsedItems,
-//   (newValue) => {
-//     let space = 0
-//     const element: any = document.getElementById(id.value)
-//     if (!element || !newValue.length) space = 0
-//     else if (element.lastChild?.className?.includes('tabs-overflow')) {
-//       space =
-//         element.getBoundingClientRect().right -
-//         element.lastChild.getBoundingClientRect().left
-//     }
-//
-//     rightSpace.value = space
-//   },
-//   { deep: true }
-// )
-
-const spaceForCollapseBtn = ref<number>(65)
-const outputSize = (): void => {
-  const el = document.getElementById(id.value)
-  if (!el) return
-
-  const elWidth = el.clientWidth + 1
-  // const elItems = el.children
-  const elItems = Array.from(el.children).filter(
-    (item) => !item.classList.contains('nav-tabs')
-  )
-  // const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
-  // const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
-  // const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
-
-  // let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
-  let childrenWidth = spaceForCollapseBtn.value // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
-  let count = 0
-  for (let i = 0; i < elItems.length; i++) {
-    const elItemsMarginLeft = parseInt(getComputedStyle(elItems[i]).marginLeft)
-    const elItemsMarginRight = parseInt(
-      getComputedStyle(elItems[i]).marginRight
-    )
-    const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
-
-    childrenWidth += elItems[i].clientWidth + childrenMarginX
-    // const isWrap = elWidth - rightSpace.value < childrenWidth
-    const isWrap = elWidth < childrenWidth
-
-    if (isWrap) break
-    count++
-  }
-
-  visibleCount.value = count
-}
-
-const setResizeObserve = (): void => {
-  const el = document.getElementById(id.value)
-
-  if (!el) {
-    setTimeout(setResizeObserve, 0)
-    return
-  }
-
-  new ResizeObserver(outputSize).observe(el)
-}
-const id = ref<string>('')
-onMounted(() => {
-  id.value = `tool-actions-${useUniqueId()}`
-  setResizeObserve()
-})
-</script>
-
-<style lang="scss" scoped>
-.btn {
-  &:disabled {
-    color: var(--btn-link-disabled);
-  }
-  &-group {
-    margin-top: 10px;
-    box-shadow: none;
-    position: relative;
-    overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    min-height: 25px;
-    height: 25px;
-    box-sizing: content-box;
-
-    &__file {
-      display: none;
-    }
-  }
-}
-</style>
+<template>
+  <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
+  <div
+    :id="id"
+    :style="{ paddingRight: spaceForCollapseBtn + 'px' }"
+    class="btn-group"
+  >
+    <div v-for="(button, key) in props.actions" :key="button.type">
+      <label
+        v-if="button.uploaded"
+        v-development="button.development"
+        v-permission="button.permission"
+        >
+        <span
+          :class="[`btn btn-link ${props.size}`]"
+          :data-id="`${button.testId}-text`"
+        >
+          <slot name="icon" :data="button" />
+          {{ button.text }}
+        </span>
+        <input
+          :id="`select-file-button-${key}`"
+          :data-id="button.testId"
+          :disabled="button.disabled"
+          :multiple="button?.multiple || false"
+          type="file"
+          class="btn-group__file"
+          @change="(event) => onSelectFiles(event, button.type, key)"
+        />
+      </label>
+
+      <button
+        v-else
+        :id="`actions-button-${key}`"
+        v-development="button.development"
+        v-permission="button.permission"
+        :data-id="button.testId"
+        :class="[`btn btn-link ${props.size}`]"
+        :disabled="button.disabled"
+        @click="onClickButton(button.type)"
+      >
+        <slot name="icon" :data="button" />
+        {{ button.text }}
+      </button>
+    </div>
+    <atoms-collapse-nav
+      v-show="collapsedItems.length"
+      :test-id="`${props.testId}-item`"
+      :items="collapsedItems"
+      class="nav-tabs"
+      close-after-click
+      @change="onClickButton"
+      @select-file="onSelectFiles"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Button } from '~/components/common/tools/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    actions: UI_I_Button[]
+    testId: string
+    size?: 'btn-sm' | ''
+  }>(),
+  {
+    size: 'btn-sm',
+  }
+)
+const emits = defineEmits<{
+  (event: 'click', value1: string, value2?: Event | null): void
+}>()
+
+const onClickButton = (type: string): void => {
+  emits('click', type)
+}
+
+const onSelectFiles = (event: Event, type: string, key: number): void => {
+  emits('click', type, event)
+
+  const input = document.getElementById(
+    `select-file-button-${key}`
+  ) as HTMLInputElement | null
+  input && (input.value = '')
+}
+
+const visibleCount = ref<number>(props.actions.length)
+const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
+  return props.actions
+    .filter((_, index) => {
+      return index >= visibleCount.value
+    })
+    .map((item) => {
+      return {
+        text: item.text,
+        value: item.type,
+        disabled: item.disabled,
+        development: item.development,
+        permission: item.permission,
+        uploaded: item.uploaded,
+        testId: item.testId,
+      }
+    })
+})
+watch(
+  () => props.actions,
+  () => {
+    // visibleCount.value = newValue.length
+    outputSize()
+  },
+  { deep: true }
+)
+
+// const rightSpace = ref<number>(0)
+// watch(
+//   collapsedItems,
+//   (newValue) => {
+//     let space = 0
+//     const element: any = document.getElementById(id.value)
+//     if (!element || !newValue.length) space = 0
+//     else if (element.lastChild?.className?.includes('tabs-overflow')) {
+//       space =
+//         element.getBoundingClientRect().right -
+//         element.lastChild.getBoundingClientRect().left
+//     }
+//
+//     rightSpace.value = space
+//   },
+//   { deep: true }
+// )
+
+const spaceForCollapseBtn = ref<number>(65)
+const outputSize = (): void => {
+  const el = document.getElementById(id.value)
+  if (!el) return
+
+  const elWidth = el.clientWidth + 1
+  // const elItems = el.children
+  const elItems = Array.from(el.children).filter(
+    (item) => !item.classList.contains('nav-tabs')
+  )
+  // const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
+  // const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
+  // const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
+
+  // let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  let childrenWidth = spaceForCollapseBtn.value // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  let count = 0
+  for (let i = 0; i < elItems.length; i++) {
+    const elItemsMarginLeft = parseInt(getComputedStyle(elItems[i]).marginLeft)
+    const elItemsMarginRight = parseInt(
+      getComputedStyle(elItems[i]).marginRight
+    )
+    const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
+
+    childrenWidth += elItems[i].clientWidth + childrenMarginX
+    // const isWrap = elWidth - rightSpace.value < childrenWidth
+    const isWrap = elWidth < childrenWidth
+
+    if (isWrap) break
+    count++
+  }
+
+  visibleCount.value = count
+}
+
+const setResizeObserve = (): void => {
+  const el = document.getElementById(id.value)
+
+  if (!el) {
+    setTimeout(setResizeObserve, 0)
+    return
+  }
+
+  new ResizeObserver(outputSize).observe(el)
+}
+const id = ref<string>('')
+onMounted(() => {
+  id.value = `tool-actions-${useUniqueId()}`
+  setResizeObserve()
+})
+</script>
+
+<style lang="scss" scoped>
+.btn {
+  &:disabled {
+    color: var(--btn-link-disabled);
+  }
+  &-group {
+    margin-top: 10px;
+    box-shadow: none;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: wrap;
+    min-height: 25px;
+    height: 25px;
+    box-sizing: content-box;
+
+    &__file {
+      display: none;
+    }
+  }
+}
+</style>