bfg-common 1.4.794 → 1.4.795

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -150,7 +150,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
   .nav-context {
     position: absolute;
-    z-index: 1001;
+    z-index: 9999999;
     height: 100%;
     display: flex;
     flex-direction: column;

package/components/common/mainNavigationPanel/MainNavigationPanelOld.vue

@@ -136,7 +136,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   }
   .nav-context {
     position: absolute;
-    z-index: 1001;
+    z-index: 9999999;
     height: 100%;
     display: flex;
     flex-direction: column;

package/components/common/pages/tasks/table/Table.vue

@@ -1,308 +1,308 @@
-<template>
-  <ui-data-table
-    test-id="task-table"
-    :data="data"
-    :options="options"
-    :loading="props.loading"
-    :total-pages="props.totalPages"
-    :total-items="props.totalItems"
-    :texts="texts"
-    class="task-table"
-    @sort="onSorting"
-    @pagination="onPagination"
-    @column-filter="onColumnFilter"
-  >
-    <template #icon="{ item }">
-      <span class="flex-align-center">
-        <span :class="['icon', item.data.icon]" />
-
-        <span
-          :data-id="`rtask-${item.data.testId}`"
-          :class="item.data.isLink && 'target-link'"
-          @click.stop="onSelectNodeOfTree(item.data)"
-        >
-          {{ item.text }}
-        </span>
-      </span>
-    </template>
-
-    <template #status="{ item }">
-      <ui-chip :test-id="item.data.testId" :color="item.data.chipColor" rounded>
-        <ui-icon
-          :name="item.data.icon"
-          width="14px"
-          height="14px"
-          class="chip-icon"
-        ></ui-icon>
-        {{ item.text }}
-      </ui-chip>
-
-      <common-pages-tasks-table-error-info
-        v-if="item.data.error"
-        :id="item.data.testId"
-        :error="item.data.error"
-        :opened-error="openedError"
-        @toggle-error="onToggleError"
-      />
-    </template>
-
-    <template #default-actions="{ item }">
-      <div class="actions">
-        <ui-button
-          variant="text"
-          :test-id="`data-table-task-action-${item.data.id}`"
-          is-without-height
-          is-without-sizes
-          @click.stop="onToggleActions(item.data.id)"
-        >
-          <span
-            :class="['action-icon', { active: actionsShowId === item.data.id }]"
-          >
-            <ui-icon name="vertical-dotes" width="20" height="20" />
-          </span>
-        </ui-button>
-        <ui-dropdown
-          :show="actionsShowId === item.data.id"
-          :test-id="`data-table-task-dropdown-${item.data.id}`"
-          :items="actions"
-          :elem-id="`data-table-task-action-${item.data.id}`"
-          left
-          width="max-content"
-          @select="onSelectAction(item.data.target, $event)"
-          @hide="onHideActionsDropdown"
-        >
-          <template #row="{ item: dropMenu }">
-            <ui-icon
-              v-if="dropMenu.iconName === 'hide'"
-              name="password-hide"
-              width="16"
-              height="16"
-            />
-            <span class="action-text">
-              {{ dropMenu.text }}
-            </span>
-          </template>
-        </ui-dropdown>
-      </div>
-    </template>
-
-    <template #expand="{ item }">
-      <common-pages-tasks-table-expand-details :data="item.data" />
-    </template>
-  </ui-data-table>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type {
-  UI_I_DataTable,
-  UI_I_DataTableHeader,
-  UI_I_DataTableBody,
-  UI_I_Pagination,
-  UI_I_TableTexts,
-} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_T_ArbitraryObject } from '~/node_modules/bfg-uikit/models/types'
-import type { UI_T_Project, UI_T_ProcuratorTypeNodes } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_TableTarget } from '~/lib/models/table/interfaces'
-import {
-  options,
-  getTargetActionsFunc,
-  getHeaderDataFunc,
-  getBodyDataFunc,
-} from '~/components/common/pages/tasks/table/lib/config/config'
-import { useDebounceFn } from '@vueuse/core'
-
-const props = defineProps<{
-  project: UI_T_Project
-  tableData: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]
-  totalPages: number
-  totalItems: number
-  loading: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'sort', value: string): void
-  (event: 'pagination', value: UI_I_Pagination): void
-  (event: 'col-search', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const texts = computed<UI_I_TableTexts>(() => ({
-  searchHere: localization.value.common.searchHere,
-  rowsPerPage: localization.value.common.rowsPerPage,
-  of: localization.value.common.of,
-  selected: localization.value.common.selected,
-  columns: localization.value.common.columns,
-  previous: localization.value.common.previous,
-  next: localization.value.common.next,
-  noItemsFound: localization.value.common.noItemsFound,
-  exportAll: localization.value.common.exportAll,
-  exportSelected: localization.value.common.exportSelected,
-  all: localization.value.common.all,
-}))
-
-const actionsShowId = ref<number>(-1)
-
-const data = computed<UI_I_DataTable>(() => ({
-  id: 'tasks-table',
-  header: taskHeadItems.value,
-  body: taskBodyItems.value,
-}))
-
-const taskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
-  getHeaderDataFunc(localization.value)
-)
-
-const taskBodyItems = ref<UI_I_DataTableBody[]>([])
-watch(
-  () => props.tableData,
-  (newValue: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]) => {
-    if (!newValue?.length) {
-      taskBodyItems.value = []
-      return
-    }
-
-    taskBodyItems.value = getBodyDataFunc(newValue, localization.value)
-  },
-  { deep: true, immediate: true }
-)
-
-const openedError = ref<string>('')
-
-const onToggleError = (value: string): void => {
-  if (!value || value === openedError.value) {
-    openedError.value = ''
-  } else {
-    openedError.value = value
-  }
-}
-
-const onSorting = (value: string): void => {
-  emits('sort', value)
-}
-const onPagination = (value: UI_I_Pagination): void => {
-  emits('pagination', value)
-}
-const sendFilter = useDebounceFn((searchText: string) => {
-  emits('col-search', searchText)
-}, 1000)
-const onColumnFilter = (obj: UI_T_ArbitraryObject<string>): void => {
-  let searchText = ''
-
-  for (const [key, value] of Object.entries(obj)) {
-    const currentFilter = searchText
-      ? ',' + key + '.' + value
-      : key + '.' + value
-
-    searchText = searchText + (value ? currentFilter : '')
-  }
-  sendFilter(searchText)
-}
-
-const actions = computed<UI_I_Dropdown[]>(() =>
-  getTargetActionsFunc(localization.value, props.project)
-)
-const onToggleActions = (id: number): void => {
-  if (actionsShowId.value === id) {
-    actionsShowId.value = -1
-  } else {
-    actionsShowId.value = id
-  }
-}
-const onSelectAction = (
-  data: UI_I_TableTarget<typeof props.project>,
-  action: 'view-target' | 'view-zone'
-): void => {
-  switch (action) {
-    case 'view-target':
-      onSelectNodeOfTree(data)
-      break
-    case 'view-zone':
-      onSelectNodeOfTree({ ...data, type: 'zone', nav: 'h' })
-      break
-  }
-  onHideActionsDropdown()
-}
-const onHideActionsDropdown = (): void => {
-  actionsShowId.value = -1
-}
-
-const onSelectNodeOfTree = (
-  data: UI_I_TableTarget<typeof props.project>
-): void => {
-  if (!data.isLink) return
-
-  const { type, id, nav } = data
-
-  const node = {
-    id,
-    type,
-  }
-
-  const path = `/inventory/type=${type};nav=${nav};id=${id}/summary`
-  navigateTo(path)
-
-  $store.dispatch('inventory/A_SELECT_NODE', { node, type })
-}
-</script>
-
-<style>
-/*TODO move up*/
-:root {
-  --actions-icon-color: #4d5d69;
-  --actions-icon-hover-color: #213444;
-  --actions-icon-icative-color: #008fd6;
-}
-:root.dark-theme {
-  --actions-icon-color: #e9eaec;
-  --actions-icon-hover-color: #ffffff;
-  --actions-icon-icative-color: #2ba2de;
-}
-</style>
-<style scoped lang="scss">
-.task-table {
-  height: inherit;
-
-  .target-link {
-    font-family: Inter, serif;
-    font-size: 13px;
-    color: var(--bottom-pannel-rtask-link-text);
-    font-weight: 400;
-    line-height: 15.73px;
-    cursor: pointer;
-    &:hover {
-      color: var(--bottom-pannel-rtask-link-hover-text);
-    }
-  }
-  .chip-icon {
-    min-width: 14px;
-  }
-  .icon {
-    margin-right: 4px;
-  }
-
-  .actions {
-    width: 100%;
-
-    .action-icon {
-      width: 16px;
-      height: 16px;
-      color: var(--actions-icon-color);
-
-      &:hover {
-        color: var(--actions-icon-hover-color);
-      }
-      &.active {
-        color: var(--actions-icon-icative-color);
-      }
-    }
-
-    .action-text {
-      margin-left: 8px;
-    }
-  }
-}
-</style>
+<template>
+  <ui-data-table
+    test-id="task-table"
+    :data="data"
+    :options="options"
+    :loading="props.loading"
+    :total-pages="props.totalPages"
+    :total-items="props.totalItems"
+    :texts="texts"
+    class="task-table"
+    @sort="onSorting"
+    @pagination="onPagination"
+    @column-filter="onColumnFilter"
+  >
+    <template #icon="{ item }">
+      <span class="flex-align-center">
+        <span :class="['icon', item.data.icon]" />
+
+        <span
+          :data-id="`rtask-${item.data.testId}`"
+          :class="item.data.isLink && 'target-link'"
+          @click.stop="onSelectNodeOfTree(item.data)"
+        >
+          {{ item.text }}
+        </span>
+      </span>
+    </template>
+
+    <template #status="{ item }">
+      <ui-chip :test-id="item.data.testId" :color="item.data.chipColor" rounded>
+        <ui-icon
+          :name="item.data.icon"
+          width="14px"
+          height="14px"
+          class="chip-icon"
+        ></ui-icon>
+        {{ item.text }}
+      </ui-chip>
+
+      <common-pages-tasks-table-error-info
+        v-if="item.data.error"
+        :id="item.data.testId"
+        :error="item.data.error"
+        :opened-error="openedError"
+        @toggle-error="onToggleError"
+      />
+    </template>
+
+    <template #default-actions="{ item }">
+      <div class="actions">
+        <ui-button
+          variant="text"
+          :test-id="`data-table-task-action-${item.data.id}`"
+          is-without-height
+          is-without-sizes
+          @click.stop="onToggleActions(item.data.id)"
+        >
+          <span
+            :class="['action-icon', { active: actionsShowId === item.data.id }]"
+          >
+            <ui-icon name="vertical-dotes" width="20" height="20" />
+          </span>
+        </ui-button>
+        <ui-dropdown
+          :show="actionsShowId === item.data.id"
+          :test-id="`data-table-task-dropdown-${item.data.id}`"
+          :items="actions"
+          :elem-id="`data-table-task-action-${item.data.id}`"
+          left
+          width="max-content"
+          @select="onSelectAction(item.data.target, $event)"
+          @hide="onHideActionsDropdown"
+        >
+          <template #row="{ item: dropMenu }">
+            <ui-icon
+              v-if="dropMenu.iconName === 'hide'"
+              name="password-hide"
+              width="16"
+              height="16"
+            />
+            <span class="action-text">
+              {{ dropMenu.text }}
+            </span>
+          </template>
+        </ui-dropdown>
+      </div>
+    </template>
+
+    <template #expand="{ item }">
+      <common-pages-tasks-table-expand-details :data="item.data" />
+    </template>
+  </ui-data-table>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type {
+  UI_I_DataTable,
+  UI_I_DataTableHeader,
+  UI_I_DataTableBody,
+  UI_I_Pagination,
+  UI_I_TableTexts,
+} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_T_ArbitraryObject } from '~/node_modules/bfg-uikit/models/types'
+import type { UI_T_Project, UI_T_ProcuratorTypeNodes } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_TaskItem } from '~/lib/models/store/tasks/interfaces'
+import type { UI_I_TableTarget } from '~/lib/models/table/interfaces'
+import {
+  options,
+  getTargetActionsFunc,
+  getHeaderDataFunc,
+  getBodyDataFunc,
+} from '~/components/common/pages/tasks/table/lib/config/config'
+import { useDebounceFn } from '@vueuse/core'
+
+const props = defineProps<{
+  project: UI_T_Project
+  tableData: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]
+  totalPages: number
+  totalItems: number
+  loading: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'sort', value: string): void
+  (event: 'pagination', value: UI_I_Pagination): void
+  (event: 'col-search', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const texts = computed<UI_I_TableTexts>(() => ({
+  searchHere: localization.value.common.searchHere,
+  rowsPerPage: localization.value.common.rowsPerPage,
+  of: localization.value.common.of,
+  selected: localization.value.common.selected,
+  columns: localization.value.common.columns,
+  previous: localization.value.common.previous,
+  next: localization.value.common.next,
+  noItemsFound: localization.value.common.noItemsFound,
+  exportAll: localization.value.common.exportAll,
+  exportSelected: localization.value.common.exportSelected,
+  all: localization.value.common.all,
+}))
+
+const actionsShowId = ref<number>(-1)
+
+const data = computed<UI_I_DataTable>(() => ({
+  id: 'tasks-table',
+  header: taskHeadItems.value,
+  body: taskBodyItems.value,
+}))
+
+const taskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
+  getHeaderDataFunc(localization.value)
+)
+
+const taskBodyItems = ref<UI_I_DataTableBody[]>([])
+watch(
+  () => props.tableData,
+  (newValue: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]) => {
+    if (!newValue?.length) {
+      taskBodyItems.value = []
+      return
+    }
+
+    taskBodyItems.value = getBodyDataFunc(newValue, localization.value)
+  },
+  { deep: true, immediate: true }
+)
+
+const openedError = ref<string>('')
+
+const onToggleError = (value: string): void => {
+  if (!value || value === openedError.value) {
+    openedError.value = ''
+  } else {
+    openedError.value = value
+  }
+}
+
+const onSorting = (value: string): void => {
+  emits('sort', value)
+}
+const onPagination = (value: UI_I_Pagination): void => {
+  emits('pagination', value)
+}
+const sendFilter = useDebounceFn((searchText: string) => {
+  emits('col-search', searchText)
+}, 1000)
+const onColumnFilter = (obj: UI_T_ArbitraryObject<string>): void => {
+  let searchText = ''
+
+  for (const [key, value] of Object.entries(obj)) {
+    const currentFilter = searchText
+      ? ',' + key + '.' + value
+      : key + '.' + value
+
+    searchText = searchText + (value ? currentFilter : '')
+  }
+  sendFilter(searchText)
+}
+
+const actions = computed<UI_I_Dropdown[]>(() =>
+  getTargetActionsFunc(localization.value, props.project)
+)
+const onToggleActions = (id: number): void => {
+  if (actionsShowId.value === id) {
+    actionsShowId.value = -1
+  } else {
+    actionsShowId.value = id
+  }
+}
+const onSelectAction = (
+  data: UI_I_TableTarget<typeof props.project>,
+  action: 'view-target' | 'view-zone'
+): void => {
+  switch (action) {
+    case 'view-target':
+      onSelectNodeOfTree(data)
+      break
+    case 'view-zone':
+      onSelectNodeOfTree({ ...data, type: 'zone', nav: 'h' })
+      break
+  }
+  onHideActionsDropdown()
+}
+const onHideActionsDropdown = (): void => {
+  actionsShowId.value = -1
+}
+
+const onSelectNodeOfTree = (
+  data: UI_I_TableTarget<typeof props.project>
+): void => {
+  if (!data.isLink) return
+
+  const { type, id, nav } = data
+
+  const node = {
+    id,
+    type,
+  }
+
+  const path = `/inventory/type=${type};nav=${nav};id=${id}/summary`
+  navigateTo(path)
+
+  $store.dispatch('inventory/A_SELECT_NODE', { node, type })
+}
+</script>
+
+<style>
+/*TODO move up*/
+:root {
+  --actions-icon-color: #4d5d69;
+  --actions-icon-hover-color: #213444;
+  --actions-icon-icative-color: #008fd6;
+}
+:root.dark-theme {
+  --actions-icon-color: #e9eaec;
+  --actions-icon-hover-color: #ffffff;
+  --actions-icon-icative-color: #2ba2de;
+}
+</style>
+<style scoped lang="scss">
+.task-table {
+  height: inherit;
+
+  .target-link {
+    font-family: Inter, serif;
+    font-size: 13px;
+    color: var(--bottom-pannel-rtask-link-text);
+    font-weight: 400;
+    line-height: 15.73px;
+    cursor: pointer;
+    &:hover {
+      color: var(--bottom-pannel-rtask-link-hover-text);
+    }
+  }
+  .chip-icon {
+    min-width: 14px;
+  }
+  .icon {
+    margin-right: 4px;
+  }
+
+  .actions {
+    width: 100%;
+
+    .action-icon {
+      width: 16px;
+      height: 16px;
+      color: var(--actions-icon-color);
+
+      &:hover {
+        color: var(--actions-icon-hover-color);
+      }
+      &.active {
+        color: var(--actions-icon-icative-color);
+      }
+    }
+
+    .action-text {
+      margin-left: 8px;
+    }
+  }
+}
+</style>

package/package.json

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