bfg-common 1.4.773 → 1.4.774

package/components/common/pages/tasks/Tasks.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tasks">
+  <div class="tasks table-container-tasks-table">
     <div class="tasks__headline">
       {{ localization.mainNavigation.tasks }}
     </div>
@@ -11,6 +11,8 @@
       :loading="isLoading"
       :project="props.project"
       @pagination="onUpdatePagination"
+      @sort="onSortTable"
+      @col-search="onColSearching"
     />
   </div>
 </template>
@@ -36,7 +38,7 @@ const pagination = ref<UI_I_Pagination>({
   pageSize: 100,
 })
 const sort = ref<string | null>(null)
-
+const filter = ref<string | null>(null)
 const pauseGlobalRefresh = (): void => {
   const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
   $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
@@ -59,11 +61,14 @@ const onUpdatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
   getTasks()
 }
-
-// const onSortTable = (event: string): void => {
-//   sort.value = event
-//   getTasks()
-// }
+const onSortTable = (event: string): void => {
+  sort.value = event
+  getTasks()
+}
+const onColSearching = (value: string): void => {
+  filter.value = value
+  getTasks()
+}
 
 const isLoading = computed<boolean>(() =>
   $store.getters['tasks/getLoading']('tasks')
@@ -90,7 +95,7 @@ onUnmounted(() => {
     margin-bottom: 22px;
   }
   :deep(.data-table-header) {
-    z-index: 1050 !important; // TODO надо удалить потом (clr style)
+    z-index: 1000 !important; // TODO надо удалить потом (clr style)
   }
 }
 </style>

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/package.json

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

package/store/tasks/actions.ts

@@ -30,7 +30,7 @@ export default {
     },
     payload: UI_I_DataTableQuery
   ): Promise<API_UI_I_Error | void> {
-    const { page, pageSize, sortBy } = payload
+    const { page, pageSize, sortBy, filter } = payload
 
     const query: UI_I_TableQuery = {
       page_size: pageSize,
@@ -38,6 +38,7 @@ export default {
     }
 
     if (sortBy) query.sortBy = sortBy
+    if (filter) query.filter = filter
 
     const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
     const lastQuery: string = context.state.taskQuery || ''