shared-ritm 1.2.130 → 1.2.131

package/src/common/app-table/components/TablePagination.vue

@@ -1,152 +1,152 @@
-<template>
-  <div class="table-pagination">
-    <button class="arrow-button" :disabled="modelValue <= 1" @click="prevPage">
-      <q-icon name="mdi-chevron-left" :color="modelValue <= 1 ? 'grey-4' : 'primary'" />
-    </button>
-
-    <div class="pages">
-      <button
-        v-for="page in pageArray"
-        :key="page"
-        class="page-button"
-        :class="{ selected: page === modelValue, ellipsis: page === '...' }"
-        :disabled="page === modelValue || page === '...'"
-        @click="changePage(page)"
-      >
-        {{ page }}
-      </button>
-    </div>
-
-    <button class="arrow-button" :disabled="modelValue >= totalPages" @click="nextPage">
-      <q-icon name="mdi-chevron-right" :color="modelValue >= totalPages ? 'grey-4' : 'primary'" />
-    </button>
-  </div>
-</template>
-<script setup lang="ts">
-import { computed } from 'vue'
-import { defineProps, defineEmits } from 'vue'
-
-const props = defineProps<{
-  modelValue: number
-  totalPages: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: number): void
-  (e: 'page-change', value: number): void
-}>()
-
-const currentPage = computed({
-  get: () => props.modelValue,
-  set: (val: number) => {
-    emit('update:modelValue', val)
-    emit('page-change', val)
-  },
-})
-
-const pageArray = computed(() => {
-  const maxPagesToShow = 5
-  let startPage = 1
-  let endPage = props.totalPages
-  const pages: (number | string)[] = []
-
-  if (props.totalPages <= maxPagesToShow) {
-    for (let i = 1; i <= props.totalPages; i++) pages.push(i)
-  } else {
-    if (props.modelValue <= 3) {
-      startPage = 1
-      endPage = maxPagesToShow - 1
-    } else if (props.modelValue + 2 >= props.totalPages) {
-      startPage = props.totalPages - (maxPagesToShow - 2)
-      endPage = props.totalPages
-    } else {
-      startPage = props.modelValue - 2
-      endPage = props.modelValue + 2
-    }
-
-    for (let i = startPage; i <= endPage; i++) pages.push(i)
-
-    if (startPage > 1) {
-      pages.unshift('...')
-      pages.unshift(1)
-    }
-    if (endPage < props.totalPages) {
-      pages.push('...')
-      pages.push(props.totalPages)
-    }
-  }
-
-  return pages
-})
-
-function changePage(page: number | string) {
-  if (typeof page === 'number' && page !== props.modelValue) {
-    currentPage.value = page
-  }
-}
-
-function prevPage() {
-  if (props.modelValue > 1) currentPage.value = props.modelValue - 1
-}
-
-function nextPage() {
-  if (props.modelValue < props.totalPages) currentPage.value = props.modelValue + 1
-}
-</script>
-
-<style scoped lang="scss">
-.pages {
-  display: flex;
-  gap: 20px;
-}
-.table-pagination {
-  display: flex;
-  justify-content: start;
-  align-items: center;
-  gap: 20px;
-  flex-wrap: wrap;
-
-  .arrow-button,
-  .page-button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 34px;
-    height: 34px;
-    border-radius: 4px;
-    background: white;
-    border: none;
-    cursor: pointer;
-    font-weight: 500;
-    color: #3f8cff;
-    font-size: 16px;
-    transition: all 0.2s ease;
-  }
-
-  .page-button.selected {
-    background: #3f8cff;
-    color: white;
-    cursor: not-allowed;
-  }
-
-  .page-button.ellipsis {
-    cursor: default;
-    color: #aab2c8;
-    font-weight: 400;
-  }
-
-  .arrow-button:disabled {
-    cursor: not-allowed;
-    background: white;
-  }
-
-  @media (max-width: 768px) {
-    .arrow-button,
-    .page-button {
-      width: 32px;
-      height: 32px;
-      font-size: 14px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="table-pagination">
+    <button class="arrow-button" :disabled="modelValue <= 1" @click="prevPage">
+      <q-icon name="mdi-chevron-left" :color="modelValue <= 1 ? 'grey-4' : 'primary'" />
+    </button>
+
+    <div class="pages">
+      <button
+        v-for="page in pageArray"
+        :key="page"
+        class="page-button"
+        :class="{ selected: page === modelValue, ellipsis: page === '...' }"
+        :disabled="page === modelValue || page === '...'"
+        @click="changePage(page)"
+      >
+        {{ page }}
+      </button>
+    </div>
+
+    <button class="arrow-button" :disabled="modelValue >= totalPages" @click="nextPage">
+      <q-icon name="mdi-chevron-right" :color="modelValue >= totalPages ? 'grey-4' : 'primary'" />
+    </button>
+  </div>
+</template>
+<script setup lang="ts">
+import { computed } from 'vue'
+import { defineProps, defineEmits } from 'vue'
+
+const props = defineProps<{
+  modelValue: number
+  totalPages: number
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: number): void
+  (e: 'page-change', value: number): void
+}>()
+
+const currentPage = computed({
+  get: () => props.modelValue,
+  set: (val: number) => {
+    emit('update:modelValue', val)
+    emit('page-change', val)
+  },
+})
+
+const pageArray = computed(() => {
+  const maxPagesToShow = 5
+  let startPage = 1
+  let endPage = props.totalPages
+  const pages: (number | string)[] = []
+
+  if (props.totalPages <= maxPagesToShow) {
+    for (let i = 1; i <= props.totalPages; i++) pages.push(i)
+  } else {
+    if (props.modelValue <= 3) {
+      startPage = 1
+      endPage = maxPagesToShow - 1
+    } else if (props.modelValue + 2 >= props.totalPages) {
+      startPage = props.totalPages - (maxPagesToShow - 2)
+      endPage = props.totalPages
+    } else {
+      startPage = props.modelValue - 2
+      endPage = props.modelValue + 2
+    }
+
+    for (let i = startPage; i <= endPage; i++) pages.push(i)
+
+    if (startPage > 1) {
+      pages.unshift('...')
+      pages.unshift(1)
+    }
+    if (endPage < props.totalPages) {
+      pages.push('...')
+      pages.push(props.totalPages)
+    }
+  }
+
+  return pages
+})
+
+function changePage(page: number | string) {
+  if (typeof page === 'number' && page !== props.modelValue) {
+    currentPage.value = page
+  }
+}
+
+function prevPage() {
+  if (props.modelValue > 1) currentPage.value = props.modelValue - 1
+}
+
+function nextPage() {
+  if (props.modelValue < props.totalPages) currentPage.value = props.modelValue + 1
+}
+</script>
+
+<style scoped lang="scss">
+.pages {
+  display: flex;
+  gap: 20px;
+}
+.table-pagination {
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  gap: 20px;
+  flex-wrap: wrap;
+
+  .arrow-button,
+  .page-button {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 34px;
+    height: 34px;
+    border-radius: 4px;
+    background: white;
+    border: none;
+    cursor: pointer;
+    font-weight: 500;
+    color: #3f8cff;
+    font-size: 16px;
+    transition: all 0.2s ease;
+  }
+
+  .page-button.selected {
+    background: #3f8cff;
+    color: white;
+    cursor: not-allowed;
+  }
+
+  .page-button.ellipsis {
+    cursor: default;
+    color: #aab2c8;
+    font-weight: 400;
+  }
+
+  .arrow-button:disabled {
+    cursor: not-allowed;
+    background: white;
+  }
+
+  @media (max-width: 768px) {
+    .arrow-button,
+    .page-button {
+      width: 32px;
+      height: 32px;
+      font-size: 14px;
+    }
+  }
+}
+</style>

package/src/common/app-table/controllers/useBaseTable.ts

@@ -1,45 +1,45 @@
-import { ref, watch, onMounted, Ref } from 'vue'
-
-export function useBaseTable(model: {
-  initialize: (params: { search: string; page: number }) => Promise<void>
-  loading: Ref<boolean>
-  columnFilters: Ref<Record<string, any>>
-}) {
-  const search = ref('')
-  const currentPage = ref(1)
-
-  const loadTable = async (searchVal = '', pageVal = 1) => {
-    await model.initialize({ search: searchVal, page: pageVal })
-  }
-
-  const handleSearch = async (val: string) => {
-    search.value = val
-    currentPage.value = 1
-    await loadTable(val, currentPage.value)
-  }
-
-  const handlePageChange = async (page: number) => {
-    currentPage.value = page
-    await loadTable(search.value, page)
-  }
-
-  watch(
-    () => model.columnFilters.value,
-    async () => {
-      currentPage.value = 1
-      await loadTable(search.value, currentPage.value)
-    },
-    { deep: true },
-  )
-
-  onMounted(() => loadTable(search.value, currentPage.value))
-
-  return {
-    search,
-    currentPage,
-    loading: model.loading,
-    handleSearch,
-    handlePageChange,
-    loadTable,
-  }
-}
+import { ref, watch, onMounted, Ref } from 'vue'
+
+export function useBaseTable(model: {
+  initialize: (params: { search: string; page: number }) => Promise<void>
+  loading: Ref<boolean>
+  columnFilters: Ref<Record<string, any>>
+}) {
+  const search = ref('')
+  const currentPage = ref(1)
+
+  const loadTable = async (searchVal = '', pageVal = 1) => {
+    await model.initialize({ search: searchVal, page: pageVal })
+  }
+
+  const handleSearch = async (val: string) => {
+    search.value = val
+    currentPage.value = 1
+    await loadTable(val, currentPage.value)
+  }
+
+  const handlePageChange = async (page: number) => {
+    currentPage.value = page
+    await loadTable(search.value, page)
+  }
+
+  watch(
+    () => model.columnFilters.value,
+    async () => {
+      currentPage.value = 1
+      await loadTable(search.value, currentPage.value)
+    },
+    { deep: true },
+  )
+
+  onMounted(() => loadTable(search.value, currentPage.value))
+
+  return {
+    search,
+    currentPage,
+    loading: model.loading,
+    handleSearch,
+    handlePageChange,
+    loadTable,
+  }
+}

package/src/common/app-table/controllers/useColumnSelector.ts

@@ -1,38 +1,38 @@
-import { computed, ref } from 'vue'
-
-export interface ColumnConfig {
-  name: string
-  label: string
-  [key: string]: any
-}
-
-export function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames: string[] = []) {
-  const selectedColumnNames = ref<string[]>([...new Set([...fixedColumnNames, ...allColumns.map(col => col.name)])])
-
-  const visibleColumns = computed(() => allColumns.filter(col => selectedColumnNames.value.includes(col.name)))
-
-  function openColumnSelectorDialog($q: any) {
-    $q.dialog({
-      title: 'Выберите колонки',
-      options: {
-        type: 'checkbox',
-        model: [...selectedColumnNames.value],
-        items: allColumns.map(col => ({
-          label: col.label,
-          value: col.name,
-          disable: fixedColumnNames.includes(col.name),
-        })),
-      },
-      cancel: true,
-      persistent: true,
-    }).onOk((val: string[]) => {
-      selectedColumnNames.value = Array.from(new Set([...val, ...fixedColumnNames]))
-    })
-  }
-
-  return {
-    selectedColumnNames,
-    visibleColumns,
-    openColumnSelectorDialog,
-  }
-}
+import { computed, ref } from 'vue'
+
+export interface ColumnConfig {
+  name: string
+  label: string
+  [key: string]: any
+}
+
+export function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames: string[] = []) {
+  const selectedColumnNames = ref<string[]>([...new Set([...fixedColumnNames, ...allColumns.map(col => col.name)])])
+
+  const visibleColumns = computed(() => allColumns.filter(col => selectedColumnNames.value.includes(col.name)))
+
+  function openColumnSelectorDialog($q: any) {
+    $q.dialog({
+      title: 'Выберите колонки',
+      options: {
+        type: 'checkbox',
+        model: [...selectedColumnNames.value],
+        items: allColumns.map(col => ({
+          label: col.label,
+          value: col.name,
+          disable: fixedColumnNames.includes(col.name),
+        })),
+      },
+      cancel: true,
+      persistent: true,
+    }).onOk((val: string[]) => {
+      selectedColumnNames.value = Array.from(new Set([...val, ...fixedColumnNames]))
+    })
+  }
+
+  return {
+    selectedColumnNames,
+    visibleColumns,
+    openColumnSelectorDialog,
+  }
+}

package/src/common/app-table/controllers/useTableModel.ts

@@ -1,102 +1,102 @@
-import { Ref, computed, ref } from 'vue'
-
-export interface TableColumn {
-  name: string
-  label: string
-  style?: string
-  headerStyle?: string
-  field?: string | ((row: any) => any)
-  sortable?: boolean
-  filterType?: 'single' | 'multi' | null
-  align?: 'left' | 'center' | 'right'
-  badge?: {
-    true?: string
-    false?: string
-    colorTrue?: string
-    colorFalse?: string
-  }
-  format?: (val: any) => any
-  html?: boolean
-}
-
-export interface FilterOption {
-  id: string
-  name: string
-}
-
-export interface TableModel<T = any> {
-  columns: TableColumn[]
-  rows: T[] | Ref<T[]>
-  filtersOptions?: Ref<Record<string, FilterOption[]>>
-}
-
-export const useTableModel = <T = any>(model: TableModel<T>) => {
-  const columnFilters = ref<Record<string, string | string[] | undefined>>({})
-  const filterMenus = ref<Record<string, boolean>>({})
-
-  model.columns.forEach(({ name, filterType }) => {
-    if (filterType) {
-      columnFilters.value[name] = filterType === 'multi' ? [] : undefined
-      filterMenus.value[name] = false
-    }
-  })
-
-  const resolvedRows = computed(() => (Array.isArray(model.rows) ? model.rows : model.rows.value))
-
-  const toggleFilterValue = (colName: string, value: string) => {
-    const col = model.columns.find(c => c.name === colName)
-    if (col?.filterType === 'multi') {
-      const current = columnFilters.value[colName] as string[]
-      const index = current.indexOf(value)
-      index > -1 ? current.splice(index, 1) : current.push(value)
-      columnFilters.value[colName] = [...current]
-    } else {
-      columnFilters.value[colName] = value
-      filterMenus.value[colName] = false
-    }
-  }
-
-  const selectedFilters = computed(() => {
-    const result: Record<string, string[]> = {}
-    for (const col of model.columns) {
-      const filter = columnFilters.value[col.name]
-      const options = model.filtersOptions?.value[col.name] || []
-
-      if (filter) {
-        let selectedIds: string[] = []
-        if (Array.isArray(filter)) {
-          selectedIds = options
-            .filter(opt => filter.includes(opt.name))
-            .map(opt => opt.id)
-        } else {
-          selectedIds = options
-            .filter(opt => opt.name === filter)
-            .map(opt => opt.id)
-        }
-        result[col.name] = Array.from(new Set(selectedIds))
-      }
-    }
-    return result
-  })
-
-
-  const clearFilter = (colName: string) => {
-    const col = model.columns.find(c => c.name === colName)
-    columnFilters.value[colName] = col?.filterType === 'multi' ? [] : undefined
-  }
-
-  const openFilterMenu = (colName: string, isOpen: boolean) => {
-    filterMenus.value[colName] = isOpen
-  }
-
-  return {
-    rows: resolvedRows,
-    columns: computed(() => model.columns),
-    columnFilters,
-    filterMenus,
-    toggleFilterValue,
-    clearFilter,
-    openFilterMenu,
-    selectedFilters,
-  }
-}
+import { Ref, computed, ref } from 'vue'
+
+export interface TableColumn {
+  name: string
+  label: string
+  style?: string
+  headerStyle?: string
+  field?: string | ((row: any) => any)
+  sortable?: boolean
+  filterType?: 'single' | 'multi' | null
+  align?: 'left' | 'center' | 'right'
+  badge?: {
+    true?: string
+    false?: string
+    colorTrue?: string
+    colorFalse?: string
+  }
+  format?: (val: any) => any
+  html?: boolean
+}
+
+export interface FilterOption {
+  id: string
+  name: string
+}
+
+export interface TableModel<T = any> {
+  columns: TableColumn[]
+  rows: T[] | Ref<T[]>
+  filtersOptions?: Ref<Record<string, FilterOption[]>>
+}
+
+export const useTableModel = <T = any>(model: TableModel<T>) => {
+  const columnFilters = ref<Record<string, string | string[] | undefined>>({})
+  const filterMenus = ref<Record<string, boolean>>({})
+
+  model.columns.forEach(({ name, filterType }) => {
+    if (filterType) {
+      columnFilters.value[name] = filterType === 'multi' ? [] : undefined
+      filterMenus.value[name] = false
+    }
+  })
+
+  const resolvedRows = computed(() => (Array.isArray(model.rows) ? model.rows : model.rows.value))
+
+  const toggleFilterValue = (colName: string, value: string) => {
+    const col = model.columns.find(c => c.name === colName)
+    if (col?.filterType === 'multi') {
+      const current = columnFilters.value[colName] as string[]
+      const index = current.indexOf(value)
+      index > -1 ? current.splice(index, 1) : current.push(value)
+      columnFilters.value[colName] = [...current]
+    } else {
+      columnFilters.value[colName] = value
+      filterMenus.value[colName] = false
+    }
+  }
+
+  const selectedFilters = computed(() => {
+    const result: Record<string, string[]> = {}
+    for (const col of model.columns) {
+      const filter = columnFilters.value[col.name]
+      const options = model.filtersOptions?.value[col.name] || []
+
+      if (filter) {
+        let selectedIds: string[] = []
+        if (Array.isArray(filter)) {
+          selectedIds = options
+            .filter(opt => filter.includes(opt.name))
+            .map(opt => opt.id)
+        } else {
+          selectedIds = options
+            .filter(opt => opt.name === filter)
+            .map(opt => opt.id)
+        }
+        result[col.name] = Array.from(new Set(selectedIds))
+      }
+    }
+    return result
+  })
+
+
+  const clearFilter = (colName: string) => {
+    const col = model.columns.find(c => c.name === colName)
+    columnFilters.value[colName] = col?.filterType === 'multi' ? [] : undefined
+  }
+
+  const openFilterMenu = (colName: string, isOpen: boolean) => {
+    filterMenus.value[colName] = isOpen
+  }
+
+  return {
+    rows: resolvedRows,
+    columns: computed(() => model.columns),
+    columnFilters,
+    filterMenus,
+    toggleFilterValue,
+    clearFilter,
+    openFilterMenu,
+    selectedFilters,
+  }
+}