shared-ritm 1.3.112 → 1.3.114

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

@@ -1,45 +1,45 @@
-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: {
-        label: 'Отмена',
-        'data-test': 'cancel-button',
-      },
-      ok: {
-        label: 'Ок',
-        'data-test': 'ok-button',
-      },
-      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: {
+        label: 'Отмена',
+        'data-test': 'cancel-button',
+      },
+      ok: {
+        label: 'Ок',
+        'data-test': 'ok-button',
+      },
+      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,97 +1,97 @@
-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,
+  }
+}

package/src/common/app-toggle/AppToggle.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <q-toggle v-bind="$props" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineProps } from 'vue'
-import { QToggleProps } from 'quasar'
-
-defineProps<QToggleProps>()
-</script>
+<template>
+  <div>
+    <q-toggle v-bind="$props" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps } from 'vue'
+import { QToggleProps } from 'quasar'
+
+defineProps<QToggleProps>()
+</script>