bfg-common 1.2.20 → 1.2.21

package/components/common/recursionTree/RecursionTree.vue

@@ -1,201 +1,201 @@
-<template>
-  <div class="recursion-tree">
-    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
-      <div
-        :id="`tree-node-${node.type}-${node.id}`"
-        class="clr-tree-node"
-        @click="selectNode(node)"
-      >
-        <button
-          v-if="node.hasNodes"
-          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
-          class="clr-treenode-caret"
-          @click.stop="getNodes({ node })"
-        >
-          <i
-            v-if="loading[`${node.id}_${node.type}`]"
-            class="fa clr-tree-node-caret-icon spinner spinner-sm"
-          />
-          <atoms-the-icon
-            v-else
-            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
-            name="angle"
-          />
-        </button>
-        <div
-          :class="[
-            'tree-node-text-drag',
-            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
-          ]"
-          @contextmenu="showContextMenuAndSelectNode($event, node)"
-        >
-          <div
-            :class="[
-              'clr-treenode-link tree-node-text',
-              { active: node.isActive },
-            ]"
-          >
-            <span :class="node.iconClassName" />
-            {{ node.name }}
-          </div>
-        </div>
-      </div>
-
-      <common-recursion-tree
-        v-if="node.nodesShow && node.nodes.length"
-        :nodes="node.nodes"
-        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
-        @get-nodes="getNodes($event)"
-        @select-node="selectNode($event)"
-        @contextmenu.prevent
-        @show-context-menu="showContextMenu"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
-
-const { $store } = useNuxtApp()
-
-interface UI_I_Loading {
-  [key: string]: boolean
-}
-
-const props = defineProps<{
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'get-nodes', value: any): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-context-menu', value: any): void
-}>()
-
-const loading = ref<UI_I_Loading>({})
-watch(props.nodes, (nodes) => {
-  nodes.forEach((node) => {
-    loading.value[`${node.id}_${node.type}`] = false
-  })
-})
-
-const hasDarkMode = computed<boolean>(
-  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
-)
-
-const getNodes = (data: any): void => {
-  const node: UI_I_TreeNode = data.node
-  const cb: Function | undefined = data.cb
-
-  loading.value[`${node.id}_${node.type}`] = true
-  const collBack = () => {
-    loading.value[`${node.id}_${node.type}`] = false
-  }
-  emits('get-nodes', {
-    node,
-    cb: cb || collBack,
-  })
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  emits('select-node', node)
-}
-const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
-  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
-  if (event.node && event.event) {
-    emits('show-context-menu', { ...event })
-    return
-  }
-  emits('show-context-menu', { event, node })
-}
-const showContextMenuAndSelectNode = (
-  event: any,
-  node: UI_I_TreeNode
-): void => {
-  selectNode(node)
-
-  showContextMenu(event, node)
-}
-</script>
-
-<style scoped lang="scss">
-.recursion-tree {
-  .clr-tree-node {
-    width: 100%;
-    overflow: hidden;
-    display: flex;
-    flex: 1 1 0;
-    align-items: center;
-    margin-bottom: 1px;
-
-    .clr-treenode-caret {
-      outline: none;
-
-      .clr-tree-node-caret-icon {
-        position: static;
-        transform: rotate(90deg);
-        width: 11px;
-        height: 11px;
-        fill: var(--tree-node-caret-icon);
-
-        &.down {
-          transform: rotate(180deg);
-        }
-      }
-    }
-    .tree-node-text-drag {
-      width: 100%;
-      overflow: hidden;
-      display: flex;
-      cursor: grab;
-
-      &.no-child {
-        margin-left: 30px;
-      }
-      .tree-node-text {
-        width: 100%;
-        box-sizing: border-box;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        padding: 0;
-        border-radius: 0;
-        border-bottom: 1px solid transparent;
-
-        &.active {
-          background: var(--vertical-nav-active-bg-color);
-          color: var(--vertical-nav-active-item-color);
-          border-bottom: 1px solid transparent;
-        }
-        &:hover {
-          border-color: var(--vertical-nav-hover-border-color);
-          &:not(.active) {
-            background: var(--vertical-nav-hover-bg-color);
-          }
-        }
-        span {
-          display: inline-block;
-          vertical-align: text-bottom;
-          margin: 1px 4px 0;
-        }
-      }
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --vertical-nav-active-item-color: #fff;
-  --vertical-nav-active-bg-color: #29414e;
-  --vertical-nav-hover-bg-color: #e8e8e8;
-  --vertical-nav-hover-border-color: #666;
-  --tree-node-caret-icon: #666;
-}
-:root.dark-theme {
-  --vertical-nav-active-item-color: #000;
-  --vertical-nav-active-bg-color: #d8e3e9;
-  --vertical-nav-hover-bg-color: #324f61;
-  --vertical-nav-hover-border-color: #fff;
-  --tree-node-caret-icon: #acbac3;
-}
-</style>
+<template>
+  <div class="recursion-tree">
+    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
+      <div
+        :id="`tree-node-${node.type}-${node.id}`"
+        class="clr-tree-node"
+        @click="selectNode(node)"
+      >
+        <button
+          v-if="node.hasNodes"
+          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
+          class="clr-treenode-caret"
+          @click.stop="getNodes({ node })"
+        >
+          <i
+            v-if="loading[`${node.id}_${node.type}`]"
+            class="fa clr-tree-node-caret-icon spinner spinner-sm"
+          />
+          <atoms-the-icon
+            v-else
+            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
+            name="angle"
+          />
+        </button>
+        <div
+          :class="[
+            'tree-node-text-drag',
+            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
+          ]"
+          @contextmenu="showContextMenuAndSelectNode($event, node)"
+        >
+          <div
+            :class="[
+              'clr-treenode-link tree-node-text',
+              { active: node.isActive },
+            ]"
+          >
+            <span :class="node.iconClassName" />
+            {{ node.name }}
+          </div>
+        </div>
+      </div>
+
+      <common-recursion-tree
+        v-if="node.nodesShow && node.nodes.length"
+        :nodes="node.nodes"
+        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
+        @get-nodes="getNodes($event)"
+        @select-node="selectNode($event)"
+        @contextmenu.prevent
+        @show-context-menu="showContextMenu"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
+
+const { $store } = useNuxtApp()
+
+interface UI_I_Loading {
+  [key: string]: boolean
+}
+
+const props = defineProps<{
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'get-nodes', value: any): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-context-menu', value: any): void
+}>()
+
+const loading = ref<UI_I_Loading>({})
+watch(props.nodes, (nodes) => {
+  nodes.forEach((node) => {
+    loading.value[`${node.id}_${node.type}`] = false
+  })
+})
+
+const hasDarkMode = computed<boolean>(
+  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
+)
+
+const getNodes = (data: any): void => {
+  const node: UI_I_TreeNode = data.node
+  const cb: Function | undefined = data.cb
+
+  loading.value[`${node.id}_${node.type}`] = true
+  const collBack = () => {
+    loading.value[`${node.id}_${node.type}`] = false
+  }
+  emits('get-nodes', {
+    node,
+    cb: cb || collBack,
+  })
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  emits('select-node', node)
+}
+const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
+  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
+  if (event.node && event.event) {
+    emits('show-context-menu', { ...event })
+    return
+  }
+  emits('show-context-menu', { event, node })
+}
+const showContextMenuAndSelectNode = (
+  event: any,
+  node: UI_I_TreeNode
+): void => {
+  selectNode(node)
+
+  showContextMenu(event, node)
+}
+</script>
+
+<style scoped lang="scss">
+.recursion-tree {
+  .clr-tree-node {
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex: 1 1 0;
+    align-items: center;
+    margin-bottom: 1px;
+
+    .clr-treenode-caret {
+      outline: none;
+
+      .clr-tree-node-caret-icon {
+        position: static;
+        transform: rotate(90deg);
+        width: 11px;
+        height: 11px;
+        fill: var(--tree-node-caret-icon);
+
+        &.down {
+          transform: rotate(180deg);
+        }
+      }
+    }
+    .tree-node-text-drag {
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      cursor: grab;
+
+      &.no-child {
+        margin-left: 30px;
+      }
+      .tree-node-text {
+        width: 100%;
+        box-sizing: border-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        padding: 0;
+        border-radius: 0;
+        border-bottom: 1px solid transparent;
+
+        &.active {
+          background: var(--vertical-nav-active-bg-color);
+          color: var(--vertical-nav-active-item-color);
+          border-bottom: 1px solid transparent;
+        }
+        &:hover {
+          border-color: var(--vertical-nav-hover-border-color);
+          &:not(.active) {
+            background: var(--vertical-nav-hover-bg-color);
+          }
+        }
+        span {
+          display: inline-block;
+          vertical-align: text-bottom;
+          margin: 1px 4px 0;
+        }
+      }
+    }
+  }
+}
+</style>
+
+<style>
+:root {
+  --vertical-nav-active-item-color: #fff;
+  --vertical-nav-active-bg-color: #29414e;
+  --vertical-nav-hover-bg-color: #e8e8e8;
+  --vertical-nav-hover-border-color: #666;
+  --tree-node-caret-icon: #666;
+}
+:root.dark-theme {
+  --vertical-nav-active-item-color: #000;
+  --vertical-nav-active-bg-color: #d8e3e9;
+  --vertical-nav-hover-bg-color: #324f61;
+  --vertical-nav-hover-border-color: #fff;
+  --tree-node-caret-icon: #acbac3;
+}
+</style>

package/components/common/recursionTree/models/interfaces.ts

@@ -1,19 +1,19 @@
-interface UI_I_TreeNodeDuplicate extends UI_I_TreeNode {}
-
-export interface UI_I_TreeNodeShort<T = string> {
-  id: string | number
-  type: T
-}
-export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string> extends UI_I_TreeNodeShort<T> {
-  state: string | number // TODO только number
-  name: string
-  iconClassName: string
-  isActive: boolean
-  hasNodes: boolean
-  nodesShow: boolean
-  nodes: N[]
-  parent?:N
-  capacity?: number
-  available?: number
-  modified?: number
-}
+interface UI_I_TreeNodeDuplicate extends UI_I_TreeNode {}
+
+export interface UI_I_TreeNodeShort<T = string> {
+  id: string | number
+  type: T
+}
+export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string> extends UI_I_TreeNodeShort<T> {
+  state: string | number // TODO только number
+  name: string
+  iconClassName: string
+  isActive: boolean
+  hasNodes: boolean
+  nodesShow: boolean
+  nodes: N[]
+  parent?:N
+  capacity?: number
+  available?: number
+  modified?: number
+}

package/components/common/resource/models/interfaces.ts

@@ -1,9 +1,9 @@
-import { UI_I_ItemView } from '~/models/interfaces'
-import { UI_T_ResourceType } from '~/components/common/resource/models/types'
-
-export interface UI_I_Resources<T = UI_I_ItemView> {
-  type: UI_T_ResourceType
-  capacity: T
-  free: T
-  used: T
-}
+import { UI_I_ItemView } from '~/models/interfaces'
+import { UI_T_ResourceType } from '~/components/common/resource/models/types'
+
+export interface UI_I_Resources<T = UI_I_ItemView> {
+  type: UI_T_ResourceType
+  capacity: T
+  free: T
+  used: T
+}

package/components/common/resource/models/types.ts

@@ -1 +1 @@
-export type UI_T_ResourceType = 'cpu' | 'memory' | 'storage'
+export type UI_T_ResourceType = 'cpu' | 'memory' | 'storage'

package/components/common/resource/progressBlock/ProgressBlock.vue

@@ -1,105 +1,105 @@
-<template>
-  <div class="summary-meters-block meters-block">
-    <ul class="summary-items-list">
-      <li
-        v-for="(resource, key) in progressPresent"
-        :key="key"
-        class="resource-meter"
-      >
-        <div class="meters-block__flex">
-          <span class="title" tabindex="0" aria-label="CPU">
-            {{ resource.blockTitle }}
-          </span>
-          <span class="resource-meter-top-right-info">
-            {{ localization.free }}: {{ resource.free.text }}
-          </span>
-        </div>
-        <div class="progress">
-          <progress
-            :max="resource.capacity.value"
-            :value="resource.used.value"
-          />
-        </div>
-        <div class="meters-block__flex">
-          <span class="resource-meter-bottom-left-info">
-            {{ localization.used }}: {{ resource.used.text }}
-          </span>
-          <span class="resource-meter-bottom-right-info">
-            {{ localization.capacity }}: {{ resource.capacity.text }}
-          </span>
-        </div>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_Localization} from "~/models/interfaces";
-import { UI_I_Resources} from "~/components/common/resource/models/interfaces";
-
-
-
-const props = defineProps<{
-  progress: UI_I_Resources[]
-}>()
-
-const progressPresent = computed<UI_I_Resources[]>(() => {
-  return props.progress.map( progress => {
-    return {
-      ...progress,
-      blockTitle: progress.type === 'cpu' ? localization.value.latinCpu : localization.value[progress.type]
-    }
-  })
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-$bar-graph-width: 256px;
-.meters-block {
-  &__flex {
-    @include flex($just: space-between, $dir: row, $align: center);
-  }
-}
-.summary-meters-block {
-  min-width: $bar-graph-width;
-  .summary-items-list {
-    margin-bottom: 10px;
-    .resource-meter {
-      list-style-type: none;
-      margin-bottom: 6px;
-      line-height: 16px;
-      span {
-        font-size: 10px;
-      }
-      .progress {
-        border-radius: 3px;
-        progress {
-          &::-webkit-progress-value {
-            background: var(--progress-color);
-          }
-          &::-webkit-progress-bar {
-            background: var(--progress-bg-color);
-          }
-        }
-      }
-    }
-  }
-  .global-refresh-content {
-    text-align: right;
-
-    .btn-global-refresh {
-      border: unset;
-      background: unset;
-      color: var(--link-visited-color);
-      cursor: pointer;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="summary-meters-block meters-block">
+    <ul class="summary-items-list">
+      <li
+        v-for="(resource, key) in progressPresent"
+        :key="key"
+        class="resource-meter"
+      >
+        <div class="meters-block__flex">
+          <span class="title" tabindex="0" aria-label="CPU">
+            {{ resource.blockTitle }}
+          </span>
+          <span class="resource-meter-top-right-info">
+            {{ localization.free }}: {{ resource.free.text }}
+          </span>
+        </div>
+        <div class="progress">
+          <progress
+            :max="resource.capacity.value"
+            :value="resource.used.value"
+          />
+        </div>
+        <div class="meters-block__flex">
+          <span class="resource-meter-bottom-left-info">
+            {{ localization.used }}: {{ resource.used.text }}
+          </span>
+          <span class="resource-meter-bottom-right-info">
+            {{ localization.capacity }}: {{ resource.capacity.text }}
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_Localization} from "~/models/interfaces";
+import { UI_I_Resources} from "~/components/common/resource/models/interfaces";
+
+
+
+const props = defineProps<{
+  progress: UI_I_Resources[]
+}>()
+
+const progressPresent = computed<UI_I_Resources[]>(() => {
+  return props.progress.map( progress => {
+    return {
+      ...progress,
+      blockTitle: progress.type === 'cpu' ? localization.value.latinCpu : localization.value[progress.type]
+    }
+  })
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+$bar-graph-width: 256px;
+.meters-block {
+  &__flex {
+    @include flex($just: space-between, $dir: row, $align: center);
+  }
+}
+.summary-meters-block {
+  min-width: $bar-graph-width;
+  .summary-items-list {
+    margin-bottom: 10px;
+    .resource-meter {
+      list-style-type: none;
+      margin-bottom: 6px;
+      line-height: 16px;
+      span {
+        font-size: 10px;
+      }
+      .progress {
+        border-radius: 3px;
+        progress {
+          &::-webkit-progress-value {
+            background: var(--progress-color);
+          }
+          &::-webkit-progress-bar {
+            background: var(--progress-bg-color);
+          }
+        }
+      }
+    }
+  }
+  .global-refresh-content {
+    text-align: right;
+
+    .btn-global-refresh {
+      border: unset;
+      background: unset;
+      color: var(--link-visited-color);
+      cursor: pointer;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>