bfg-common 1.0.61 → 1.0.63

package/assets/localization/local_ru.json

@@ -318,7 +318,7 @@
   "createHardDisk": "Создать жесткий диск",
   "createNewFolder": "Создать новую папку",
   "createNewVirtualMachine": "Создать новую виртуальную машину",
-  "createStandardSwitch": "Создание стандартного переключателя",
+  "createStandardSwitch": "Создание стандартного коммутатор",
   "createTag": "Создание Тега",
   "creationDate": "Дата создания",
   "currentDisplayLimited": "Текущий дисплей ограничен 200 записями.",
@@ -1069,7 +1069,7 @@
   "noDataProvided": "Никаких данных не предоставлено",
   "node": "Узел",
   "noDhcpEnabledVmKernelNetAdapters": "Сетевых адаптеров VMkernel с поддержкой DHCP не существует.",
-  "noFreeNetworkAdaptersAddSwitch": "Нет бесплатных сетевых адаптеров, которые можно добавить к коммутатору.",
+  "noFreeNetworkAdaptersAddSwitch": "Нет свободных сетевых адаптеров, которые можно добавить к коммутатору.",
   "noItemsDisplay": "Нет элементов для отображения",
   "noItemSelected": "Элементы не выбраны",
   "none": "Ничто",

package/components/common/accordion/Accordion.vue

@@ -29,14 +29,19 @@
 
 <script setup lang="ts">
 import { vOnClickOutside } from '@vueuse/components'
-import { UI_I_AccordionRecursion } from '~/components/common/accordion/models/interfaces'
+import type { UI_I_AccordionRecursion } from '~/components/common/accordion/models/interfaces'
+import type { UI_T_ShowType } from '~/components/common/accordion/models/types'
+import { UI_E_ShowType } from '~/components/common/accordion/models/enums'
 import { constructItems } from '~/components/common/accordion/utils/accordion'
 
-const props = defineProps<{
-  testId: string
-  accordion: UI_I_AccordionRecursion[]
-  isAllCollapsed?: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    testId: string
+    accordion: UI_I_AccordionRecursion[]
+    showType?: UI_T_ShowType
+  }>(),
+  { showType: 'default' }
+)
 
 const emits = defineEmits<{
   (event: 'change', value: UI_I_AccordionRecursion): void
@@ -44,9 +49,8 @@ const emits = defineEmits<{
 
 const parentName = ref<string>('')
 const childName = ref<string>('')
-const isAllCollapsedLocal = ref<boolean | null>(null)
 const accordionLocal = computed<UI_I_AccordionRecursion[]>(() =>
-  constructItems(props.accordion, isAllCollapsedLocal.value)
+  constructItems(props.accordion, UI_E_ShowType[props.showType])
 )
 
 const closeDropMenuMobile = (): void => {
@@ -94,13 +98,6 @@ const onSelect = (item: UI_I_AccordionRecursion): void => {
     }
   })
 }
-
-watch(
-  () => props.isAllCollapsed,
-  (newValue) => {
-    isAllCollapsedLocal.value = newValue
-  }
-)
 </script>
 
 <style lang="scss">

package/components/common/accordion/Recursion.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script setup lang="ts">
-import {
+import type {
   UI_I_AccordionRecursion,
   UI_I_HeadingClass,
 } from '~/components/common/accordion/models/interfaces'
@@ -80,6 +80,16 @@ const emits = defineEmits<{
 
 const accordionLocal = ref<UI_I_AccordionRecursion>(props.accordion)
 
+// TODO CHANGE
+watch(
+  accordionLocal,
+  () => {
+    if (accordionLocal.value.isOpen !== false)
+      accordionLocal.value.isOpen = true
+  },
+  { immediate: true }
+)
+
 const toggle = (): void => {
   if (!props.accordion.hasChild) return
 

package/components/common/accordion/models/enums.ts

@@ -0,0 +1,5 @@
+export enum UI_E_ShowType {
+  default,
+  expand,
+  collapse,
+}

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

@@ -0,0 +1 @@
+export type UI_T_ShowType = 'default' | 'expand' | 'collapse'

package/components/common/accordion/utils/accordion.ts

@@ -1,13 +1,13 @@
-import { UI_I_AccordionRecursion } from '~/components/common/accordion/models/interfaces'
+import type { UI_I_AccordionRecursion } from '~/components/common/accordion/models/interfaces'
 
 const collapseRecursion = (
   accordion: UI_I_AccordionRecursion[],
-  isOpen: boolean
+  showType: number
 ): UI_I_AccordionRecursion[] =>
   accordion.map((item) => {
-    item.isOpen = isOpen
+    item.isOpen = showType !== 1
     if (item.hasChild && item.children?.length) {
-      item.children = collapseRecursion(item.children, isOpen)
+      item.children = collapseRecursion(item.children, showType)
     }
 
     return item
@@ -24,8 +24,8 @@ const defaultShow = (
 
 export const constructItems = (
   accordion: UI_I_AccordionRecursion[],
-  isOpen: boolean | null
+  showType: number
 ): UI_I_AccordionRecursion[] =>
-  isOpen === null
+  showType === 0
     ? defaultShow(accordion)
-    : collapseRecursion(accordion, isOpen)
+    : collapseRecursion(accordion, showType)

package/package.json

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