bfg-common 1.5.689 → 1.5.690

package/components/common/spiceConsole/SpiceConsole.vue

@@ -1,184 +1,184 @@
-<template>
-  <div ref="fullScreen" class="spice-console">
-    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
-    <div
-      v-if="isWindow"
-      v-show="isShowBlocker"
-      class="blocker"
-      @click="onFocus"
-    >
-      <p class="blocker-text">{{ localization.remoteConsole.clickForUse }}</p>
-    </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'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
-
-const props = defineProps<{
-  wsUrl: string
-  vmType: string
-  vmId: string
-  host: string
-  port: number
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-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;
-  // }
-}
-
-const isWindow = computed<boolean>(() => useRoute().query.window === 'true')
-const isShowBlocker = ref<boolean>(true)
-const onFocus = (): void => {
-  document.getElementById('inputmanager')?.focus()
-  isShowBlocker.value = false
-}
-
-const inputManagerBlur = (): void => {
-  isShowBlocker.value = true
-}
-
-onMounted(() => {
-  connectWS()
-  document.addEventListener('keydown', blockCtrlOrCmdCommands)
-  window.addEventListener('blur', inputManagerBlur)
-})
-
-onBeforeUnmount(() => {
-  vmDisconnect()
-  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
-  window.removeEventListener('blur', inputManagerBlur)
-})
-
-// // TODO Этот код решает проблему когда у вм нету пароли, но окно подтверждения все равно открывается
-// const { $store }: any = useNuxtApp()
-// $store.dispatch('vm/A_GET_VM_SETTINGS', props.vmId) // Работает и для Пракуратора и для Сферы
-// const vmSettings = computed<UI_I_VmSettings | null>(
-//   () => $store.getters['vm/getVmSettings']
-// )
-// watch(
-//   vmSettings,
-//   (newValue) => {
-//     // @ts-ignore
-//     window.vmHasPassword = !!newValue?.options.remote_console.password
-//   },
-//   { deep: true, immediate: true }
-// )
-</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;
-}
-.blocker {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 9999;
-
-  .blocker-text {
-    color: #e4e4e4;
-  }
-}
-</style>
+<template>
+  <div ref="fullScreen" class="spice-console">
+    <div id="vmw" ref="vmScreen" @scroll="onConsoleScroll"></div>
+    <div
+      v-if="isWindow"
+      v-show="isShowBlocker"
+      class="blocker"
+      @click="onFocus"
+    >
+      <p class="blocker-text">{{ localization.remoteConsole.clickForUse }}</p>
+    </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'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
+
+const props = defineProps<{
+  wsUrl: string
+  vmType: string
+  vmId: string
+  host: string
+  port: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+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;
+  // }
+}
+
+const isWindow = computed<boolean>(() => useRoute().query.window === 'true')
+const isShowBlocker = ref<boolean>(true)
+const onFocus = (): void => {
+  document.getElementById('inputmanager')?.focus()
+  isShowBlocker.value = false
+}
+
+const inputManagerBlur = (): void => {
+  isShowBlocker.value = true
+}
+
+onMounted(() => {
+  connectWS()
+  document.addEventListener('keydown', blockCtrlOrCmdCommands)
+  window.addEventListener('blur', inputManagerBlur)
+})
+
+onBeforeUnmount(() => {
+  vmDisconnect()
+  document.removeEventListener('keydown', blockCtrlOrCmdCommands)
+  window.removeEventListener('blur', inputManagerBlur)
+})
+
+// // TODO Этот код решает проблему когда у вм нету пароли, но окно подтверждения все равно открывается
+// const { $store }: any = useNuxtApp()
+// $store.dispatch('vm/A_GET_VM_SETTINGS', props.vmId) // Работает и для Пракуратора и для Сферы
+// const vmSettings = computed<UI_I_VmSettings | null>(
+//   () => $store.getters['vm/getVmSettings']
+// )
+// watch(
+//   vmSettings,
+//   (newValue) => {
+//     // @ts-ignore
+//     window.vmHasPassword = !!newValue?.options.remote_console.password
+//   },
+//   { deep: true, immediate: true }
+// )
+</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;
+}
+.blocker {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+
+  .blocker-text {
+    color: #e4e4e4;
+  }
+}
+</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
+}