bfg-common 1.4.54 → 1.4.55

package/components/atoms/modal/bySteps/BySteps.vue

@@ -1,253 +1,253 @@
-<template>
-  <div v-if="props.show" class="modal clr-wizard wizard-xl">
-    <div class="modal-dialog modal-xl relative" :data-id="props.testId">
-      <div class="modal-content-wrapper">
-        <nav class="modal-nav clr-wizard-stepnav-wrapper">
-          <h1 class="clr-wizard-title">
-            {{ props.title }}
-          </h1>
-          <atoms-step-vertical-step
-            :test-id="props.testId"
-            :items="props.stepItems"
-            :step-position="props.stepPosition"
-            @change="changeStep"
-          />
-        </nav>
-        <div class="modal-content">
-          <div class="modal-header--accessible">
-            <slot name="contentHeading">
-              <div class="modal-title-wrapper">
-                <h2 class="modal-title">
-                  <span class="modal-title-text">{{ heading }}</span>
-                </h2>
-              </div>
-            </slot>
-            <button
-              :id="`${props.testId}-close-icon`"
-              class="close"
-              :data-id="`${props.testId}-close-button`"
-              @click="hide"
-            >
-              <atoms-the-icon class="close-icon" name="close" />
-            </button>
-          </div>
-          <div class="modal-body">
-            <slot
-              name="modalBody"
-              :title="heading"
-              :description="stepDescription"
-            />
-          </div>
-          <div class="modal-footer">
-            <slot name="modalFooter">
-              <button
-                :id="`${props.testId}-cancel-button`"
-                class="btn btn-link"
-                :data-id="`${props.testId}-cancel-button`"
-                @click="hide"
-              >
-                {{ localization.common.cancel }}
-              </button>
-              <button
-                v-show="props.stepPosition > 0"
-                :id="`${props.testId}-back-button`"
-                class="btn btn-outline"
-                :data-id="`${props.testId}-back-button`"
-                @click="back"
-              >
-                {{ localization.common.back }}
-              </button>
-              <button
-                v-if="props.stepPosition === props.stepItems.length - 1"
-                :id="`${props.testId}-finish-button`"
-                class="btn btn-success"
-                :data-id="`${props.testId}-finish-button`"
-                @click="finish"
-              >
-                {{ localization.common.finish }}
-              </button>
-              <button
-                v-else
-                :id="`${props.testId}-next-button`"
-                :disabled="props.disabledNext"
-                class="btn btn-primary"
-                :data-id="`${props.testId}-next-button`"
-                @click="next"
-              >
-                {{ localization.common.next }}
-              </button>
-            </slot>
-          </div>
-        </div>
-      </div>
-
-      <div v-show="props.loading" class="loader">
-        <i class="fa clr-tree-node-caret-icon spinner spinner" />
-      </div>
-    </div>
-    <div class="modal-backdrop" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    show: boolean
-    title: string
-    stepItems: UI_I_VerticalStepItem[]
-    stepPosition: number
-    secondTitle?: string
-    testId?: string
-    loading?: boolean
-    disabledNext?: boolean
-  }>(),
-  {
-    testId: 'ui-modal-by-steps',
-    disabledNext: false,
-  }
-)
-const emits = defineEmits<{
-  (event: 'finish'): void
-  (event: 'next'): void
-  (event: 'back'): void
-  (event: 'hide'): void
-  (event: 'change-step', num: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const heading = ref<string | null>(null)
-const stepDescription = ref<string | null>(null)
-
-const hide = (): void => {
-  emits('hide')
-}
-const finish = (): void => {
-  emits('finish')
-}
-const next = (): void => {
-  emits('next')
-}
-const back = (): void => {
-  emits('back')
-}
-const changeStep = (key: number): void => {
-  emits('change-step', key)
-}
-
-watch(
-  () => props.stepPosition,
-  (value) => {
-    const { stepItems, secondTitle } = props
-    if (secondTitle) {
-      heading.value = secondTitle
-      return
-    }
-
-    heading.value = stepItems[value].text
-    stepDescription.value = stepItems[value]?.description || ''
-  },
-  { immediate: true }
-)
-</script>
-
-<style scoped lang="scss">
-.modal {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  z-index: 1050;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  padding: 48px;
-  overflow-y: auto;
-
-  .modal-nav {
-    background-color: var(--block-view-bg-color4);
-    .clr-wizard-title {
-      color: var(--main-color-mode);
-      font-size: 22px;
-      padding: 24px 12px 24px 24px;
-      //line-height: 1.2rem;
-    }
-  }
-
-  .modal-content-wrapper {
-    position: relative;
-    -webkit-animation-name: animateTop;
-    -webkit-animation-duration: 0.4s;
-    animation-name: animateTop;
-    animation-duration: 0.4s;
-  }
-
-  .modal-content {
-    background-color: var(--modal-bg-color);
-
-    .modal-header--accessible {
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      width: 100%;
-      padding: 24px 19px 6px 24px;
-
-      .modal-title-text {
-        color: var(--main-color-mode);
-        font-size: 22px;
-      }
-
-      .close-icon {
-        fill: var(--close-icon);
-        width: 24px;
-        height: 24px;
-      }
-    }
-
-    .modal-body {
-      padding: 0 3px;
-    }
-
-    .modal-footer {
-      display: flex;
-      justify-content: flex-end;
-      padding: 24px;
-      flex: unset;
-      min-height: 0;
-      height: auto;
-    }
-  }
-
-  .loader {
-    position: absolute;
-    z-index: 1000;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    top: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color: rgba(0, 0, 0, 0.3);
-
-    .spinner {
-      left: unset;
-    }
-  }
-
-  .modal-backdrop {
-    opacity: 1;
-    background-color: rgba(0, 0, 0, 0.6);
-  }
-}
-h1,
-h2 {
-  // просмотреть если нигде не ломается переместит глобально
-  line-height: inherit;
-}
-</style>
+<template>
+  <div v-if="props.show" class="modal clr-wizard wizard-xl">
+    <div class="modal-dialog modal-xl relative" :data-id="props.testId">
+      <div class="modal-content-wrapper">
+        <nav class="modal-nav clr-wizard-stepnav-wrapper">
+          <h1 class="clr-wizard-title">
+            {{ props.title }}
+          </h1>
+          <atoms-step-vertical-step
+            :test-id="props.testId"
+            :items="props.stepItems"
+            :step-position="props.stepPosition"
+            @change="changeStep"
+          />
+        </nav>
+        <div class="modal-content">
+          <div class="modal-header--accessible">
+            <slot name="contentHeading">
+              <div class="modal-title-wrapper">
+                <h2 class="modal-title">
+                  <span class="modal-title-text">{{ heading }}</span>
+                </h2>
+              </div>
+            </slot>
+            <button
+              :id="`${props.testId}-close-icon`"
+              class="close"
+              :data-id="`${props.testId}-close-button`"
+              @click="hide"
+            >
+              <atoms-the-icon class="close-icon" name="close" />
+            </button>
+          </div>
+          <div class="modal-body">
+            <slot
+              name="modalBody"
+              :title="heading"
+              :description="stepDescription"
+            />
+          </div>
+          <div class="modal-footer">
+            <slot name="modalFooter">
+              <button
+                :id="`${props.testId}-cancel-button`"
+                class="btn btn-link"
+                :data-id="`${props.testId}-cancel-button`"
+                @click="hide"
+              >
+                {{ localization.common.cancel }}
+              </button>
+              <button
+                v-show="props.stepPosition > 0"
+                :id="`${props.testId}-back-button`"
+                class="btn btn-outline"
+                :data-id="`${props.testId}-back-button`"
+                @click="back"
+              >
+                {{ localization.common.back }}
+              </button>
+              <button
+                v-if="props.stepPosition === props.stepItems.length - 1"
+                :id="`${props.testId}-finish-button`"
+                class="btn btn-success"
+                :data-id="`${props.testId}-finish-button`"
+                @click="finish"
+              >
+                {{ localization.common.finish }}
+              </button>
+              <button
+                v-else
+                :id="`${props.testId}-next-button`"
+                :disabled="props.disabledNext"
+                class="btn btn-primary"
+                :data-id="`${props.testId}-next-button`"
+                @click="next"
+              >
+                {{ localization.common.next }}
+              </button>
+            </slot>
+          </div>
+        </div>
+      </div>
+
+      <div v-show="props.loading" class="loader">
+        <i class="fa clr-tree-node-caret-icon spinner spinner" />
+      </div>
+    </div>
+    <div class="modal-backdrop" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    show: boolean
+    title: string
+    stepItems: UI_I_VerticalStepItem[]
+    stepPosition: number
+    secondTitle?: string
+    testId?: string
+    loading?: boolean
+    disabledNext?: boolean
+  }>(),
+  {
+    testId: 'ui-modal-by-steps',
+    disabledNext: false,
+  }
+)
+const emits = defineEmits<{
+  (event: 'finish'): void
+  (event: 'next'): void
+  (event: 'back'): void
+  (event: 'hide'): void
+  (event: 'change-step', num: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const heading = ref<string | null>(null)
+const stepDescription = ref<string | null>(null)
+
+const hide = (): void => {
+  emits('hide')
+}
+const finish = (): void => {
+  emits('finish')
+}
+const next = (): void => {
+  emits('next')
+}
+const back = (): void => {
+  emits('back')
+}
+const changeStep = (key: number): void => {
+  emits('change-step', key)
+}
+
+watch(
+  () => props.stepPosition,
+  (value) => {
+    const { stepItems, secondTitle } = props
+    if (secondTitle) {
+      heading.value = secondTitle
+      return
+    }
+
+    heading.value = stepItems[value].text
+    stepDescription.value = stepItems[value]?.description || ''
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss">
+.modal {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  z-index: 1050;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 48px;
+  overflow-y: auto;
+
+  .modal-nav {
+    background-color: var(--block-view-bg-color4);
+    .clr-wizard-title {
+      color: var(--main-color-mode);
+      font-size: 22px;
+      padding: 24px 12px 24px 24px;
+      //line-height: 1.2rem;
+    }
+  }
+
+  .modal-content-wrapper {
+    position: relative;
+    -webkit-animation-name: animateTop;
+    -webkit-animation-duration: 0.4s;
+    animation-name: animateTop;
+    animation-duration: 0.4s;
+  }
+
+  .modal-content {
+    background-color: var(--modal-bg-color);
+
+    .modal-header--accessible {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      width: 100%;
+      padding: 24px 19px 6px 24px;
+
+      .modal-title-text {
+        color: var(--main-color-mode);
+        font-size: 22px;
+      }
+
+      .close-icon {
+        fill: var(--close-icon);
+        width: 24px;
+        height: 24px;
+      }
+    }
+
+    .modal-body {
+      padding: 0 3px;
+    }
+
+    .modal-footer {
+      display: flex;
+      justify-content: flex-end;
+      padding: 24px;
+      flex: unset;
+      min-height: 0;
+      height: auto;
+    }
+  }
+
+  .loader {
+    position: absolute;
+    z-index: 1000;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: rgba(0, 0, 0, 0.3);
+
+    .spinner {
+      left: unset;
+    }
+  }
+
+  .modal-backdrop {
+    opacity: 1;
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+}
+h1,
+h2 {
+  // просмотреть если нигде не ломается переместит глобально
+  line-height: inherit;
+}
+</style>

package/components/atoms/table/dataGrid/lib/config/settingsTable.ts

@@ -1,4 +1,3 @@
-import type { UI_ColumnSettingsStrategy } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type {
   UI_I_ColumnKey,
   UI_I_HeadItem,
@@ -9,51 +8,25 @@ import {
 } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 
 export const defaultColumnKeys = (
-  items: [string, boolean, string, string][],
-  strategy?: UI_ColumnSettingsStrategy
+  items: [string, boolean, string, string][]
 ): UI_I_ColumnKey[] => {
   const result: UI_I_ColumnKey[] = []
   items.forEach((item, i) => {
-    let col: string = `col${i}` // Стандартное значение по умолчанию
-
-    if (strategy) {
-      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
-      for (const key in strategy) {
-        if (strategy[key].includes(i)) {
-          col = key
-          break
-        }
-      }
-    }
-
     result.push(
-      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
+      constructColumnKey(`col${i}`, item[0], item[1], `show-column-${item[3]}`)
     )
   })
   return result
 }
 
 export const defaultHeadItems = (
-  items: [string, boolean, string, string][],
-  strategy?: UI_ColumnSettingsStrategy
+  items: [string, boolean, string, string][]
 ): UI_I_HeadItem[] => {
   const result: UI_I_HeadItem[] = []
   items.forEach((item, i) => {
-    let col: string = `col${i}` // Стандартное значение по умолчанию
-
-    if (strategy) {
-      // Проходим по ключам объекта и ищем соответствие индекса i в значениях
-      for (const key in strategy) {
-        if (strategy[key].includes(i)) {
-          col = key
-          break
-        }
-      }
-    }
-
     result.push(
       constructHeadItem(
-        col,
+        `col${i}`,
         item[0],
         item[3],
         false,

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

@@ -1,5 +1,3 @@
-import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
-
 export interface UI_I_BodyItem {
   key: string
   text: string | number
@@ -36,6 +34,3 @@ export interface UI_I_ColumnKey {
   id?: number
   testId?: string
 }
-
-export interface UI_ColumnSettingsStrategy
-  extends UI_I_ArbitraryObject<number[]> {}