bfg-common 1.4.773 → 1.4.775

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

@@ -7,8 +7,9 @@
     :total-pages="props.totalPages"
     :total-items="props.totalItems"
     class="task-table"
-    @sorting="onSorting"
+    @sort="onSorting"
     @pagination="onPagination"
+    @column-filter="onColumnFilter"
   >
     <template #icon="{ item }">
       <span class="flex-align-center">
@@ -96,6 +97,7 @@ import type {
   UI_I_DataTableBody,
   UI_I_Pagination,
 } 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'
@@ -106,6 +108,9 @@ import {
   getHeaderDataFunc,
   getBodyDataFunc,
 } from '~/components/common/pages/tasks/table/lib/config/config'
+import { useDebounceFn } from '@vueuse/core'
+
+
 
 const props = defineProps<{
   project: UI_T_Project
@@ -117,6 +122,7 @@ const props = defineProps<{
 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())
@@ -153,6 +159,21 @@ const onSorting = (value: string): void => {
 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)

package/components/common/pages/tasks/table/lib/config/config.ts

@@ -73,7 +73,7 @@ export const getHeaderDataFunc = (
     col: 'col5',
     colName: 'queued_for',
     text: localization.common.queuedFor,
-    isSortable: true,
+    isSortable: false,
     sort: 'asc',
     width: '180px',
     show: true,
@@ -83,7 +83,7 @@ export const getHeaderDataFunc = (
     col: 'col6',
     colName: 'start_time',
     text: localization.common.startTime,
-    isSortable: true,
+    isSortable: false,
     sort: 'asc',
     width: '180px',
     show: true,
@@ -91,7 +91,7 @@ export const getHeaderDataFunc = (
   },
   {
     col: 'col7',
-    colName: 'completion_time',
+    colName: 'completion',
     text: localization.common.completionTime,
     isSortable: true,
     sort: 'asc',
@@ -103,7 +103,7 @@ export const getHeaderDataFunc = (
     col: 'col8',
     colName: 'execution_time',
     text: localization.common.executionTime,
-    isSortable: true,
+    isSortable: false,
     sort: 'asc',
     width: '180px',
     show: true,

package/components/common/recursionTree/RecursionTree.vue

@@ -1,223 +1,223 @@
-<template>
-  <div class="recursion-tree">
-    <div
-      v-for="node in nodes"
-      :key="`${node.type}_${node.id}`"
-      :data-id="`${node.testId}-${node.type}-root`"
-    >
-      <div
-        :id="`tree-node-${node.type}-${node.id}`"
-        :data-id="node.testId"
-        class="clr-tree-node"
-        @click="selectNode(node)"
-      >
-        <button
-          v-if="node.hasNodes"
-          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
-          :data-id="`${node.testId}-toggle-button`"
-          class="clr-treenode-caret"
-          @click.stop="getNodes({ node })"
-        >
-          <i
-            v-if="loading[`${node.id}_${node.type}`]"
-            :data-id="`${node.testId}-spinner`"
-            class="fa clr-tree-node-caret-icon spinner spinner-sm"
-          />
-          <atoms-the-icon
-            v-else
-            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
-            name="angle"
-          />
-        </button>
-        <div
-          :class="[
-            'tree-node-text-drag',
-            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
-          ]"
-          :data-id="`${node.testId}-select-content`"
-          @contextmenu.prevent="showContextMenuAndSelectNode($event, node)"
-        >
-          <div
-            :class="[
-              'clr-treenode-link tree-node-text',
-              { active: node.isActive },
-            ]"
-            :data-id="`${node.testId}-name`"
-          >
-            <span :class="node.iconClassName" />
-            {{ node.name }}
-          </div>
-        </div>
-      </div>
-
-      <common-recursion-tree
-        v-if="node.nodesShow && node.nodes.length"
-        :nodes="node.nodes"
-        :class="node.nodesShow ? 'nodes-show' : ''"
-        @get-nodes="getNodes($event)"
-        @select-node="selectNode($event)"
-        @contextmenu.prevent
-        @show-context-menu="showContextMenu"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const { $store } = useNuxtApp()
-
-interface UI_I_Loading {
-  [key: string]: boolean
-}
-
-const props = defineProps<{
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'get-nodes', value: any): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-context-menu', value: any): void
-}>()
-
-const loading = ref<UI_I_Loading>({})
-watch(props.nodes, (nodes) => {
-  nodes.forEach((node) => {
-    loading.value[`${node.id}_${node.type}`] = false
-  })
-})
-
-const hasDarkMode = computed<boolean>(
-  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
-)
-
-const getNodes = (data: any): void => {
-  const node: UI_I_TreeNode = data.node
-  const cb: Function | undefined = data.cb
-
-  loading.value[`${node.id}_${node.type}`] = true
-  const collBack = () => {
-    loading.value[`${node.id}_${node.type}`] = false
-  }
-  emits('get-nodes', {
-    node,
-    cb: cb || collBack,
-  })
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  emits('select-node', node)
-}
-const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
-  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
-  if (event.node && event.event) {
-    emits('show-context-menu', { ...event })
-    return
-  }
-  emits('show-context-menu', { event, node })
-}
-const showContextMenuAndSelectNode = (
-  event: any,
-  node: UI_I_TreeNode
-): void => {
-  selectNode(node)
-
-  setTimeout(() => {
-    showContextMenu(event, node)
-  }, 0)
-}
-</script>
-
-<style>
-:root {
-  --vertical-nav-active-item-color: #fff;
-  --vertical-nav-active-bg-color: #29414e;
-  --vertical-nav-hover-bg-color: #e8e8e8;
-  --vertical-nav-hover-border-color: #666;
-  --tree-node-caret-icon: #666;
-
-  /* rtl*/
-  --tree-node-child-padding: 0 0 0 20px;
-  --tree-node-no-child-margin: 0 0 0 30px;
-}
-:root.dark-theme {
-  --vertical-nav-active-item-color: #000;
-  --vertical-nav-active-bg-color: #d8e3e9;
-  --vertical-nav-hover-bg-color: #324f61;
-  --vertical-nav-hover-border-color: #fff;
-  --tree-node-caret-icon: #acbac3;
-}
-:root[dir='rtl'] {
-  --tree-node-child-padding: 0 20px 0 0;
-  --tree-node-no-child-margin: 0 30px 0 0;
-}
-</style>
-<style scoped lang="scss">
-.recursion-tree {
-  .clr-tree-node {
-    width: 100%;
-    overflow: hidden;
-    display: flex;
-    flex: 1 1 0;
-    align-items: center;
-    margin-bottom: 1px;
-
-    .clr-treenode-caret {
-      outline: none;
-
-      .clr-tree-node-caret-icon {
-        position: static;
-        transform: rotate(90deg);
-        width: 11px;
-        height: 11px;
-        fill: var(--tree-node-caret-icon);
-
-        &.down {
-          transform: rotate(180deg);
-        }
-      }
-    }
-    .tree-node-text-drag {
-      width: 100%;
-      overflow: hidden;
-      display: flex;
-      cursor: grab;
-
-      &.no-child {
-        margin: var(--tree-node-no-child-margin);
-      }
-      .tree-node-text {
-        width: 100%;
-        box-sizing: border-box;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        padding: 0;
-        border-radius: 0;
-        border-bottom: 1px solid transparent;
-
-        &.active {
-          background: var(--vertical-nav-active-bg-color);
-          color: var(--vertical-nav-active-item-color);
-          border-bottom: 1px solid transparent;
-        }
-        &:hover {
-          border-color: var(--vertical-nav-hover-border-color);
-          &:not(.active) {
-            background: var(--vertical-nav-hover-bg-color);
-          }
-        }
-        span {
-          display: inline-block;
-          vertical-align: text-bottom;
-          margin: 1px 4px 0;
-        }
-      }
-    }
-  }
-
-  .nodes-show {
-    padding: var(--tree-node-child-padding);
-  }
-}
-</style>
+<template>
+  <div class="recursion-tree">
+    <div
+      v-for="node in nodes"
+      :key="`${node.type}_${node.id}`"
+      :data-id="`${node.testId}-${node.type}-root`"
+    >
+      <div
+        :id="`tree-node-${node.type}-${node.id}`"
+        :data-id="node.testId"
+        class="clr-tree-node"
+        @click="selectNode(node)"
+      >
+        <button
+          v-if="node.hasNodes"
+          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
+          :data-id="`${node.testId}-toggle-button`"
+          class="clr-treenode-caret"
+          @click.stop="getNodes({ node })"
+        >
+          <i
+            v-if="loading[`${node.id}_${node.type}`]"
+            :data-id="`${node.testId}-spinner`"
+            class="fa clr-tree-node-caret-icon spinner spinner-sm"
+          />
+          <atoms-the-icon
+            v-else
+            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
+            name="angle"
+          />
+        </button>
+        <div
+          :class="[
+            'tree-node-text-drag',
+            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
+          ]"
+          :data-id="`${node.testId}-select-content`"
+          @contextmenu.prevent="showContextMenuAndSelectNode($event, node)"
+        >
+          <div
+            :class="[
+              'clr-treenode-link tree-node-text',
+              { active: node.isActive },
+            ]"
+            :data-id="`${node.testId}-name`"
+          >
+            <span :class="node.iconClassName" />
+            {{ node.name }}
+          </div>
+        </div>
+      </div>
+
+      <common-recursion-tree
+        v-if="node.nodesShow && node.nodes.length"
+        :nodes="node.nodes"
+        :class="node.nodesShow ? 'nodes-show' : ''"
+        @get-nodes="getNodes($event)"
+        @select-node="selectNode($event)"
+        @contextmenu.prevent
+        @show-context-menu="showContextMenu"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const { $store } = useNuxtApp()
+
+interface UI_I_Loading {
+  [key: string]: boolean
+}
+
+const props = defineProps<{
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'get-nodes', value: any): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-context-menu', value: any): void
+}>()
+
+const loading = ref<UI_I_Loading>({})
+watch(props.nodes, (nodes) => {
+  nodes.forEach((node) => {
+    loading.value[`${node.id}_${node.type}`] = false
+  })
+})
+
+const hasDarkMode = computed<boolean>(
+  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
+)
+
+const getNodes = (data: any): void => {
+  const node: UI_I_TreeNode = data.node
+  const cb: Function | undefined = data.cb
+
+  loading.value[`${node.id}_${node.type}`] = true
+  const collBack = () => {
+    loading.value[`${node.id}_${node.type}`] = false
+  }
+  emits('get-nodes', {
+    node,
+    cb: cb || collBack,
+  })
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  emits('select-node', node)
+}
+const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
+  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
+  if (event.node && event.event) {
+    emits('show-context-menu', { ...event })
+    return
+  }
+  emits('show-context-menu', { event, node })
+}
+const showContextMenuAndSelectNode = (
+  event: any,
+  node: UI_I_TreeNode
+): void => {
+  selectNode(node)
+
+  setTimeout(() => {
+    showContextMenu(event, node)
+  }, 0)
+}
+</script>
+
+<style>
+:root {
+  --vertical-nav-active-item-color: #fff;
+  --vertical-nav-active-bg-color: #29414e;
+  --vertical-nav-hover-bg-color: #e8e8e8;
+  --vertical-nav-hover-border-color: #666;
+  --tree-node-caret-icon: #666;
+
+  /* rtl*/
+  --tree-node-child-padding: 0 0 0 20px;
+  --tree-node-no-child-margin: 0 0 0 30px;
+}
+:root.dark-theme {
+  --vertical-nav-active-item-color: #000;
+  --vertical-nav-active-bg-color: #d8e3e9;
+  --vertical-nav-hover-bg-color: #324f61;
+  --vertical-nav-hover-border-color: #fff;
+  --tree-node-caret-icon: #acbac3;
+}
+:root[dir='rtl'] {
+  --tree-node-child-padding: 0 20px 0 0;
+  --tree-node-no-child-margin: 0 30px 0 0;
+}
+</style>
+<style scoped lang="scss">
+.recursion-tree {
+  .clr-tree-node {
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex: 1 1 0;
+    align-items: center;
+    margin-bottom: 1px;
+
+    .clr-treenode-caret {
+      outline: none;
+
+      .clr-tree-node-caret-icon {
+        position: static;
+        transform: rotate(90deg);
+        width: 11px;
+        height: 11px;
+        fill: var(--tree-node-caret-icon);
+
+        &.down {
+          transform: rotate(180deg);
+        }
+      }
+    }
+    .tree-node-text-drag {
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      cursor: grab;
+
+      &.no-child {
+        margin: var(--tree-node-no-child-margin);
+      }
+      .tree-node-text {
+        width: 100%;
+        box-sizing: border-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        padding: 0;
+        border-radius: 0;
+        border-bottom: 1px solid transparent;
+
+        &.active {
+          background: var(--vertical-nav-active-bg-color);
+          color: var(--vertical-nav-active-item-color);
+          border-bottom: 1px solid transparent;
+        }
+        &:hover {
+          border-color: var(--vertical-nav-hover-border-color);
+          &:not(.active) {
+            background: var(--vertical-nav-hover-bg-color);
+          }
+        }
+        span {
+          display: inline-block;
+          vertical-align: text-bottom;
+          margin: 1px 4px 0;
+        }
+      }
+    }
+  }
+
+  .nodes-show {
+    padding: var(--tree-node-child-padding);
+  }
+}
+</style>