bfg-common 1.5.231 → 1.5.233

package/components/atoms/nav/NavBar.vue

@@ -66,6 +66,8 @@ const setTriggerElementWidth = (): void => {
       : 0
 }
 
+const spaceForCollapseBtn = ref<number>(60)
+
 let outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
@@ -78,7 +80,7 @@ let outputSize = (): void => {
   const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
   const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = 0
+  let childrenWidth = spaceForCollapseBtn.value
   let count = 0
   for (let i = 0; i < elItems.length; i++) {
     childrenWidth += elItems[i].clientWidth + childrenMarginY
@@ -94,7 +96,7 @@ let outputSize = (): void => {
   if (element) {
     element.style.paddingRight =
       collapsedItems.value.length && !props.notCollapse
-        ? `${triggerElementWidth}px`
+        ? `${spaceForCollapseBtn.value}px`
         : ''
   }
 }

package/components/atoms/table/dataGrid/DataGrid.vue

@@ -819,10 +819,11 @@ const headItemsPresent = computed<UI_I_HeadItem[]>(() => {
 const bodyItemsPresent = computed<UI_I_BodyItem[][]>(() => {
   let items: UI_I_BodyItem[][] = props.bodyItems.map((row) => {
     return row.map((item) => {
+      const text = item.text.toString()
       return {
         ...item,
         // Если текст пустой нужно поставить '--' для экспорта
-        text: item.text !== '' ? item.text : '--',
+        text: text.trim() !== '' ? text : '--',
       }
     })
   })

package/components/atoms/table/info/lib/models/interfaces.ts

@@ -1,10 +1,10 @@
-export interface UI_I_TableInfoItem {
-  label: string
-  value: any
-  isProperty?: boolean
-  key?: string
-  localization?: string
-  localizationTemplate?: string
-  isCapital?: boolean
-  iconName?: string
-}
+export interface UI_I_TableInfoItem {
+  label: string
+  value: any
+  isProperty?: boolean
+  key?: string
+  localization?: string
+  localizationTemplate?: string
+  isCapital?: boolean
+  iconName?: string
+}

package/components/atoms/tabs/Tabs.vue

@@ -1,6 +1,6 @@
 <template>
   <nav :id="id" class="btn-group">
-    <ul class="nav">
+    <ul class="nav" :style="{ paddingRight: spaceForCollapseBtn + 'px' }">
       <li
         v-for="(item, key) in props.items"
         :key="item.path"
@@ -94,6 +94,8 @@ const setTriggerElementWidth = (): void => {
   }
 }
 
+const spaceForCollapseBtn = ref<number>(60)
+
 const outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
@@ -104,7 +106,7 @@ const outputSize = (): void => {
   const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
   const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = 0
+  let childrenWidth = spaceForCollapseBtn.value
   let count = 0
   setTriggerElementWidth()
   for (let i = 0; i < elItems.length; i++) {
@@ -119,12 +121,12 @@ const outputSize = (): void => {
 
   visibleCount.value = count
 
-  const element = document.querySelector(`#${id.value} ul`)
-  if (element) {
-    element.style.paddingRight = collapsedItems.value.length
-      ? `${triggerElementWidth}px`
-      : ''
-  }
+  // const element = document.querySelector(`#${id.value} ul`)
+  // if (element) {
+  //   element.style.paddingRight = collapsedItems.value.length
+  //     ? `${triggerElementWidth}px`
+  //     : ''
+  // }
 }
 
 const id = ref<string>(`tabs-${useUniqueId()}`)

package/components/common/tools/Actions.vue

@@ -130,7 +130,7 @@ const outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
 
-  const elWidth = el.clientWidth
+  const elWidth = el.clientWidth + 1
   // const elItems = el.children
   const elItems = Array.from(el.children).filter(
     (item) => !item.classList.contains('nav-tabs')

package/package.json

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