bfg-common 1.5.43 → 1.5.45

package/components/atoms/stack/StackBlock.vue

@@ -1,185 +1,185 @@
-<template>
-  <div
-    :class="[
-      'stack-block',
-      open ? 'stack-block-expanded' : 'stack-block-expandable',
-      { 'not-children': !props.hasChildren },
-    ]"
-  >
-    <div
-      :id="`${props.testId}-toggle`"
-      :data-id="`${props.testId}-toggle`"
-      class="stack-block-label"
-      @click="onToggle"
-    >
-      <atoms-the-icon name="angle" class="angle-icon" fill="#565656" />
-
-      <div class="stack-view-key">
-        <slot name="stackBlockKey" />
-      </div>
-      <div class="stack-block-content">
-        <slot name="stackBlockContent" />
-      </div>
-
-      <span
-        v-if="props.removable && props.isRollBack"
-        class="icon-roll-back"
-        :data-id="`${props.testId}-roll-back`"
-        @mousedown="onRollBack"
-        @click.stop
-      />
-      <atoms-the-icon
-        v-else-if="props.removable"
-        :data-id="`${props.testId}-remove`"
-        class="remove-icon"
-        name="close-circle"
-        @mousedown="onRemove"
-        @click.stop
-      />
-      <span v-else class="empty-icon"></span>
-    </div>
-
-    <div v-show="open" class="stack-children">
-      <div style="height: auto">
-        <slot name="stackChildren" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-const props = withDefaults(
-  defineProps<{
-    hasChildren: boolean
-    removable?: boolean
-    testId?: string
-    openByDefault?: boolean
-    isRollBack?: boolean
-  }>(),
-  { testId: 'ui-stack-block', openByDefault: false }
-)
-const emits = defineEmits<{
-  (event: 'toggle', value: boolean): void
-  (event: 'remove'): void
-  (event: 'roll-back'): void
-}>()
-
-const open = ref<boolean>(props.openByDefault || false)
-const onToggle = (): void => {
-  if (!props.hasChildren) return
-  setTimeout(() => {
-    open.value = !open.value
-    emits('toggle', open.value)
-  }, 0)
-}
-
-const onRemove = (): void => {
-  emits('remove')
-}
-const onRollBack = (): void => {
-  emits('roll-back')
-}
-</script>
-
-<style scoped lang="scss">
-.stack-block {
-  cursor: pointer;
-  background-color: var(--block-view-bg-color);
-  border-color: var(--global-border-color);
-
-  &.stack-block-expandable:hover {
-    border-bottom: 1px solid #666;
-
-    .stack-block-label {
-      background-color: var(--block-view-bg-color);
-      border-color: var(--global-border-color);
-    }
-  }
-
-  .stack-block-label {
-    padding: 6px 12px;
-    flex: 1 1 auto;
-    max-width: unset;
-    display: flex;
-    background-color: var(--block-view-bg-color);
-    border-color: var(--global-border-color);
-
-    &:hover {
-      .remove-icon {
-        opacity: 1;
-      }
-    }
-
-    &::before {
-      display: none;
-    }
-
-    .angle-icon {
-      width: 14px;
-      height: 14px;
-      margin-right: 4px;
-      transform: rotate(90deg);
-      align-self: center;
-    }
-
-    .remove-icon {
-      width: 18px;
-      height: 18px;
-      opacity: 0;
-      cursor: pointer;
-    }
-
-    .stack-view-key {
-      flex: 0 0 40%;
-      max-width: 40%;
-    }
-
-    .stack-block-content {
-      padding: 0;
-      flex: 1 1 auto;
-      width: 60%;
-      background-color: transparent;
-      word-break: break-all;
-    }
-
-    .empty-icon {
-      width: 18px;
-      height: 18px;
-    }
-  }
-
-  &.stack-block-expanded {
-    .stack-block-label {
-      color: #ffffff;
-      background-color: #29414e;
-
-      .angle-icon {
-        fill: #ffffff;
-        transform: rotate(180deg);
-      }
-
-      .remove-icon {
-        fill: #ffffff;
-      }
-    }
-  }
-
-  &.not-children {
-    cursor: default;
-    .stack-block-label {
-      background-color: transparent;
-      color: #333333;
-
-      &:hover {
-        cursor: default;
-        background-color: transparent;
-        border-bottom: none;
-      }
-
-      .angle-icon {
-        opacity: 0;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div
+    :class="[
+      'stack-block',
+      open ? 'stack-block-expanded' : 'stack-block-expandable',
+      { 'not-children': !props.hasChildren },
+    ]"
+  >
+    <div
+      :id="`${props.testId}-toggle`"
+      :data-id="`${props.testId}-toggle`"
+      class="stack-block-label"
+      @click="onToggle"
+    >
+      <atoms-the-icon name="angle" class="angle-icon" fill="#565656" />
+
+      <div class="stack-view-key">
+        <slot name="stackBlockKey" />
+      </div>
+      <div class="stack-block-content">
+        <slot name="stackBlockContent" />
+      </div>
+
+      <span
+        v-if="props.removable && props.isRollBack"
+        class="icon-roll-back"
+        :data-id="`${props.testId}-roll-back`"
+        @mousedown="onRollBack"
+        @click.stop
+      />
+      <atoms-the-icon
+        v-else-if="props.removable"
+        :data-id="`${props.testId}-remove`"
+        class="remove-icon"
+        name="close-circle"
+        @mousedown="onRemove"
+        @click.stop
+      />
+      <span v-else class="empty-icon"></span>
+    </div>
+
+    <div v-show="open" class="stack-children">
+      <div style="height: auto">
+        <slot name="stackChildren" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    hasChildren: boolean
+    removable?: boolean
+    testId?: string
+    openByDefault?: boolean
+    isRollBack?: boolean
+  }>(),
+  { testId: 'ui-stack-block', openByDefault: false }
+)
+const emits = defineEmits<{
+  (event: 'toggle', value: boolean): void
+  (event: 'remove'): void
+  (event: 'roll-back'): void
+}>()
+
+const open = ref<boolean>(props.openByDefault || false)
+const onToggle = (): void => {
+  if (!props.hasChildren) return
+  setTimeout(() => {
+    open.value = !open.value
+    emits('toggle', open.value)
+  }, 0)
+}
+
+const onRemove = (): void => {
+  emits('remove')
+}
+const onRollBack = (): void => {
+  emits('roll-back')
+}
+</script>
+
+<style scoped lang="scss">
+.stack-block {
+  cursor: pointer;
+  background-color: var(--block-view-bg-color);
+  border-color: var(--global-border-color);
+
+  &.stack-block-expandable:hover {
+    border-bottom: 1px solid #666;
+
+    .stack-block-label {
+      background-color: var(--block-view-bg-color);
+      border-color: var(--global-border-color);
+    }
+  }
+
+  .stack-block-label {
+    padding: 6px 12px;
+    flex: 1 1 auto;
+    max-width: unset;
+    display: flex;
+    background-color: var(--block-view-bg-color);
+    border-color: var(--global-border-color);
+
+    &:hover {
+      .remove-icon {
+        opacity: 1;
+      }
+    }
+
+    &::before {
+      display: none;
+    }
+
+    .angle-icon {
+      width: 14px;
+      height: 14px;
+      margin-right: 4px;
+      transform: rotate(90deg);
+      align-self: center;
+    }
+
+    .remove-icon {
+      width: 18px;
+      height: 18px;
+      opacity: 0;
+      cursor: pointer;
+    }
+
+    .stack-view-key {
+      flex: 0 0 40%;
+      max-width: 40%;
+    }
+
+    .stack-block-content {
+      padding: 0;
+      flex: 1 1 auto;
+      width: 60%;
+      background-color: transparent;
+      word-break: break-all;
+    }
+
+    .empty-icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &.stack-block-expanded {
+    .stack-block-label {
+      color: #ffffff;
+      background-color: #29414e;
+
+      .angle-icon {
+        fill: #ffffff;
+        transform: rotate(180deg);
+      }
+
+      .remove-icon {
+        fill: #ffffff;
+      }
+    }
+  }
+
+  &.not-children {
+    cursor: default;
+    .stack-block-label {
+      background-color: transparent;
+      color: #333333;
+
+      &:hover {
+        cursor: default;
+        background-color: transparent;
+        border-bottom: none;
+      }
+
+      .angle-icon {
+        opacity: 0;
+      }
+    }
+  }
+}
+</style>

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

@@ -819,7 +819,7 @@ const bodyItemsPresent = computed<UI_I_BodyItem[][]>(() => {
       return {
         ...item,
         // Если текст пустой нужно поставить '--' для экспорта
-        text: item.text || '--'
+        text: item.text !== '' ? item.text :  '--'
       }
     })
   })