bfg-common 1.0.74 → 1.0.76

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/select/radio/RadioGroup.vue

@@ -1,22 +1,47 @@
 <template>
   <div class="select-option">
     <div
-      v-for="{ value, disabled, label, description } in options"
-      :key="value"
+      v-for="radio in options"
+      :key="radio.value"
       class="select-option__inner radio"
-      :class="disabled && 'disabled'"
+      :class="radio.disabled && 'disabled'"
     >
-      <input
-        :id="label"
-        v-model="selectedType"
-        type="radio"
-        :value="value"
-        :disabled="disabled"
-      />
-      <label :for="label">{{ label }}</label>
+      <div class="select-option__wrapper">
+        <input
+          :id="radio.label"
+          v-model="selectedType"
+          type="radio"
+          :value="radio.value"
+          :disabled="radio.disabled"
+        />
+        <label :for="radio.label">{{ radio.label }}</label>
 
-      <div v-if="description" class="select-option__description">
-        {{ description }}
+        <div
+          v-if="'isTooltip' in radio"
+          :id="`${radio.value}-select-tooltip-icon`"
+          class="signpost-container relative"
+        >
+          <atoms-the-icon
+            fill="#0072a3"
+            width="24px"
+            height="24px"
+            name="info-circle"
+            @click="radio.isTooltip = !radio.isTooltip"
+          />
+          <atoms-tooltip-signpost
+            v-if="radio.isTooltip"
+            :elem-id="`${radio.value}-select-tooltip-icon`"
+            @hide="radio.isTooltip = false"
+          >
+            <div class="tooltip-content-container">
+              <p>{{ radio.tooltipContent }}</p>
+            </div>
+          </atoms-tooltip-signpost>
+        </div>
+      </div>
+
+      <div v-if="radio.description" class="select-option__description">
+        {{ radio.description }}
       </div>
     </div>
   </div>
@@ -46,7 +71,19 @@ const selectedType = computed<string | number>({
 </script>
 
 <style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
 .select-option {
+  &__wrapper {
+    @include flex($align: center);
+    gap: 10px;
+    .signpost-container {
+      display: flex;
+      cursor: pointer;
+      .tooltip-content-container {
+        max-width: 350px;
+      }
+    }
+  }
   &__subtitle {
   }
   &__description {

package/components/common/select/radio/models/interfaces.ts

@@ -2,11 +2,7 @@ export interface UI_I_RadioOption {
   label: string
   value: string | number
   disabled?: boolean
+  isTooltip?: boolean
   description?: string
-}
-
-export interface UI_I_DatastoreTypeOption extends UI_I_RadioOption {
-  desc: string
-  isShowHelp?: boolean
-  helpDesc?: string
+  tooltipContent?: string
 }

package/components/common/vm/actions/add/select/name/Name.vue

@@ -131,7 +131,7 @@ const checkNameIsValid = async (name: string): Promise<boolean> => {
         switch (status) {
           case 406: // Invalid name
             showValidationErrors([
-              localization.value.vmNameValidationDescription,
+              localization.value.vmNameValidationDescription2,
             ])
             resolve(false)
             break