shared-ritm 1.2.55 → 1.2.57

package/dist/types/api/types/Api_Controls.d.ts

@@ -21,7 +21,7 @@ export interface ControlMeta {
     totalPages: number;
     currentPage: number;
 }
-export interface FiltersValue {
+export type FiltersValue = {
     users?: {
         users: Api_User_Dto[];
     };
@@ -34,18 +34,18 @@ export interface FiltersValue {
     status?: {
         status: boolean;
     };
-}
-export interface Api_Instrument_Dto {
+};
+export type Api_Instrument_Dto = {
     id: string;
     name: string;
     storage_id?: string;
-}
-export interface Api_Warehouse_Dto {
+};
+export type Api_Warehouse_Dto = {
     id: string;
     invoice_ref_key: string;
     inventory_number: string;
     instrument: Api_Instrument_Dto[];
-}
+};
 export type Api_ControlLogs_Dto = {
     id: string;
     automatically: string;

package/dist/types/utils/helpers.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Сравнивает два значения на глубокое равенство.
+ * Поддерживает массивы, объекты и примитивы.
+ */
+export declare function isEqual(a: any, b: any): boolean;
+/**
+ * Нормализует значение:
+ * - Если передан массив объектов, возвращает массив `.value` или сам объект.
+ * - Если передан объект, возвращает `.value` или сам объект.
+ * - Если примитив — возвращает без изменений.
+ */
+export declare function normalizeValue(val: any): any;
+/**
+ * Генерирует UUID v4.
+ * Используется для идентификаторов временных сущностей.
+ */
+export declare function uuidv4(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.2.55",
+  "version": "1.2.57",
   "private": false,
   "files": [
     "dist",

package/src/api/types/Api_Controls.ts

@@ -1,72 +1,72 @@
-export type Api_User_Dto = {
-  id: string
-  full_name: string
-}
-export type Api_ControlZones_Dto = {
-  id: string
-  name: string
-  inventory_number: string
-  uuid: string
-  controller_zone: string
-  users?: Api_User_Dto[]
-}
-export type ControlsParams = {
-  search?: string
-  page?: number
-  filter?: Record<string, string[]>
-}
-
-export interface ControlMeta {
-  total: number
-  perPage: number
-  totalPages: number
-  currentPage: number
-}
-
-export interface FiltersValue {
-  users?: {
-    users: Api_User_Dto[]
-  }
-  controller?: {
-    controller: Api_User_Dto[]
-  }
-  responsible?: {
-    responsible: Api_User_Dto[]
-  }
-  status?: {
-    status: boolean
-  }
-}
-export interface Api_Instrument_Dto {
-  id: string
-  name: string
-  storage_id?: string
-}
-export interface Api_Warehouse_Dto {
-  id: string
-  invoice_ref_key: string
-  inventory_number: string
-  instrument: Api_Instrument_Dto[]
-}
-
-export type Api_ControlLogs_Dto = {
-  id: string
-  automatically: string
-  in_zone: string
-  uuid: string
-  controller_zone: string
-  controller: Api_User_Dto[]
-  user: Api_User_Dto[]
-  frame: Api_ControlZones_Dto[]
-  warehouse: Api_Warehouse_Dto[]
-}
-export type Api_New_Items = {
-  title: string
-  inventory_numbers: string
-  storage_id: string
-}
-export type Api_ManualEntry_Dto = {
-  user: string
-  items?: string[]
-  new_items?: Api_New_Items[]
-}
+export type Api_User_Dto = {
+  id: string
+  full_name: string
+}
+export type Api_ControlZones_Dto = {
+  id: string
+  name: string
+  inventory_number: string
+  uuid: string
+  controller_zone: string
+  users?: Api_User_Dto[]
+}
+export type ControlsParams = {
+  search?: string
+  page?: number
+  filter?: Record<string, string[]>
+}
+
+export interface ControlMeta {
+  total: number
+  perPage: number
+  totalPages: number
+  currentPage: number
+}
+
+export type FiltersValue = {
+  users?: {
+    users: Api_User_Dto[]
+  }
+  controller?: {
+    controller: Api_User_Dto[]
+  }
+  responsible?: {
+    responsible: Api_User_Dto[]
+  }
+  status?: {
+    status: boolean
+  }
+}
+export type Api_Instrument_Dto = {
+  id: string
+  name: string
+  storage_id?: string
+}
+export type Api_Warehouse_Dto = {
+  id: string
+  invoice_ref_key: string
+  inventory_number: string
+  instrument: Api_Instrument_Dto[]
+}
+
+export type Api_ControlLogs_Dto = {
+  id: string
+  automatically: string
+  in_zone: string
+  uuid: string
+  controller_zone: string
+  controller: Api_User_Dto[]
+  user: Api_User_Dto[]
+  frame: Api_ControlZones_Dto[]
+  warehouse: Api_Warehouse_Dto[]
+}
+export type Api_New_Items = {
+  title: string
+  inventory_numbers: string
+  storage_id: string
+}
+export type Api_ManualEntry_Dto = {
+  user: string
+  items?: string[]
+  new_items?: Api_New_Items[]
+}

package/src/common/app-table/AppTable.vue

@@ -1,64 +1,3 @@
-<script setup lang="ts">
-import { defineProps, defineEmits, ref, computed, watch } from 'vue'
-import type { Ref } from 'vue'
-import FilterIcon from '@/icons/components/table-filter-icon.vue'
-
-interface FilterOption {
-  id: string
-  name: string
-}
-
-interface TableEmits {
-  'toggle-filter-value': [colName: string, value: string]
-  'clear-filter': [colName: string]
-  'open-filter-menu': [colName: string, isOpen: boolean]
-  'row-click': [row: Record<string, any>]
-  'update:selectedRows': [rows: any[]]
-}
-
-const emit = defineEmits<TableEmits>()
-
-const props = defineProps<{
-  rows: Ref<any[]>
-  columns: any[]
-  columnFilters: Ref<Record<string, string | string[] | undefined>>
-  filterMenus: Ref<Record<string, boolean>>
-  filtersOptions: Record<string, FilterOption[]>
-  meta: Ref<{ currentPage: number; perPage: number }>
-  enableMultiSelect?: boolean
-  selectedRows: any[]
-}>()
-
-const localSearches = ref<Record<string, string>>({})
-
-const filteredOptions = computed(() => {
-  const result: Record<string, FilterOption[]> = {}
-  for (const col of props.columns) {
-    const search = localSearches.value[col.name]?.toLowerCase() || ''
-    const options = props.filtersOptions[col.name] || []
-    result[col.name] = options.filter(opt => opt.name.toLowerCase().includes(search))
-  }
-  return result
-})
-const selected = ref<any[]>([])
-
-watch(
-  () => props.selectedRows,
-  val => {
-    selected.value = val
-  },
-  { immediate: true },
-)
-
-watch(
-  selected,
-  val => {
-    emit('update:selectedRows', val)
-  },
-  { deep: true },
-)
-</script>
-
 <template>
   <q-page class="flex flex-col" style="min-height: 100%">
     <q-table
@@ -175,7 +114,65 @@ watch(
     </q-table>
   </q-page>
 </template>
+<script setup lang="ts">
+import { defineProps, defineEmits, ref, computed, watch } from 'vue'
+import type { Ref } from 'vue'
+import FilterIcon from '@/icons/components/table-filter-icon.vue'
+
+interface FilterOption {
+  id: string
+  name: string
+}
+
+interface TableEmits {
+  'toggle-filter-value': [colName: string, value: string]
+  'clear-filter': [colName: string]
+  'open-filter-menu': [colName: string, isOpen: boolean]
+  'row-click': [row: Record<string, any>]
+  'update:selectedRows': [rows: any[]] // синтаксис defineEmits для эмита с именованными параметрами
+}
+
+const props = defineProps<{
+  rows: Ref<any[]>
+  columns: any[]
+  columnFilters: Ref<Record<string, string | string[] | undefined>>
+  filterMenus: Ref<Record<string, boolean>>
+  filtersOptions: Record<string, FilterOption[]>
+  meta: Ref<{ currentPage: number; perPage: number }>
+  enableMultiSelect?: boolean
+  selectedRows: any[]
+}>()
+const emit = defineEmits<TableEmits>()
 
+const localSearches = ref<Record<string, string>>({})
+const selected = ref<any[]>([])
+
+const filteredOptions = computed(() => {
+  const result: Record<string, FilterOption[]> = {}
+  for (const col of props.columns) {
+    const search = localSearches.value[col.name]?.toLowerCase() || ''
+    const options = props.filtersOptions[col.name] || []
+    result[col.name] = options.filter(opt => opt.name.toLowerCase().includes(search))
+  }
+  return result
+})
+
+watch(
+  () => props.selectedRows,
+  val => {
+    selected.value = val
+  },
+  { immediate: true },
+)
+
+watch(
+  selected,
+  val => {
+    emit('update:selectedRows', val)
+  },
+  { deep: true },
+)
+</script>
 <style scoped lang="scss">
 .cursor-pointer {
   cursor: pointer;

package/src/common/app-table/AppTableLayout.vue

@@ -1,27 +1,3 @@
-<script setup lang="ts">
-import AppTable from './AppTable.vue'
-import AppTablePagination from '../app-table/components/TablePagination.vue'
-import AppTableSearch from '../app-table/components/TableSearch.vue'
-import { defineProps, defineEmits } from 'vue'
-
-const emit = defineEmits<{
-  'update:selectedRows': [rows: any[]]
-}>()
-const props = defineProps<{
-  search: string
-  loading: boolean
-  currentPage: number
-  totalPages: number
-  tableProps: any
-  tableEvents: any
-  onSearch: (val: string) => void
-  onPageChange: (page: number) => void
-  actionsSlot?: boolean
-  modalSlot?: boolean
-  selectedRows: any[]
-}>()
-</script>
-
 <template>
   <div class="table-layout">
     <div class="table-controls">
@@ -55,7 +31,29 @@ const props = defineProps<{
     <slot v-if="modalSlot" name="modal" />
   </div>
 </template>
+<script setup lang="ts">
+import AppTable from './AppTable.vue'
+import AppTablePagination from '../app-table/components/TablePagination.vue'
+import AppTableSearch from '../app-table/components/TableSearch.vue'
+import { defineProps, defineEmits } from 'vue'
 
+const props = defineProps<{
+  search: string
+  loading: boolean
+  currentPage: number
+  totalPages: number
+  tableProps: any
+  tableEvents: any
+  onSearch: (val: string) => void
+  onPageChange: (page: number) => void
+  actionsSlot?: boolean
+  modalSlot?: boolean
+  selectedRows: any[]
+}>()
+const emit = defineEmits<{
+  'update:selectedRows': [rows: any[]]
+}>()
+</script>
 <style scoped lang="scss">
 .table-layout {
   height: calc(100vh - 100px);

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

@@ -1,154 +1,3 @@
-<script setup lang="ts">
-import { ref, watch, defineProps, defineEmits, nextTick, computed } from 'vue'
-import AppModalSelect from '../components/ModalSelect.vue'
-import { useQuasar } from 'quasar'
-import { notificationSettings } from '@/utils/notification'
-
-const $q = useQuasar()
-
-type ModalMode = 'view' | 'edit' | 'create'
-type FieldType = 'text' | 'select'
-
-interface FieldOption {
-  label: string
-  value: string
-}
-
-interface FieldSchema {
-  key: string
-  label: string
-  type: FieldType
-  rules?: ((val: any) => boolean | string)[]
-  options?: FieldOption[]
-  placeholder?: string
-  onSearch?: (val: string) => void
-  onScroll?: () => void
-  loading?: boolean
-}
-
-const props = defineProps<{
-  modelValue: boolean
-  title: string
-  mode: ModalMode
-  fields: FieldSchema[]
-  initialData?: Record<string, any>
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', val: boolean): void
-  (e: 'submit', data: Record<string, any>): void
-  (e: 'edit'): void
-  (e: 'delete'): void
-}>()
-
-const formData = ref<Record<string, any>>({})
-const formRef = ref()
-
-watch(
-  () => props.modelValue,
-  val => {
-    if (val) {
-      formData.value = { ...(props.initialData ?? {}) }
-    }
-  },
-  { immediate: true },
-)
-function isEqual(a: any, b: any): boolean {
-  if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length) return false
-    return a.every((item, i) => isEqual(item, b[i]))
-  }
-  if (typeof a === 'object' && typeof b === 'object') {
-    return JSON.stringify(a) === JSON.stringify(b)
-  }
-  return a === b
-}
-
-function normalizeValue(val: any): any {
-  if (Array.isArray(val)) {
-    return val.map(v => (typeof v === 'object' && v !== null ? v.value ?? v : v))
-  }
-  return typeof val === 'object' && val !== null ? val.value ?? val : val
-}
-
-function submit() {
-  formRef.value?.validate().then(ok => {
-    if (!ok) return
-
-    const changed: Record<string, any> = {}
-
-    for (const field of props.fields) {
-      const key = field.key
-      const current = formData.value[key]
-      const initial = props.initialData?.[key]
-
-      const normalizedCurrent = field.type === 'select' ? normalizeValue(current) : current
-      const normalizedInitial = field.type === 'select' ? normalizeValue(initial) : initial
-
-      if (!isEqual(normalizedCurrent, normalizedInitial)) {
-        changed[key] = normalizedCurrent
-      }
-    }
-
-    emit('submit', changed)
-  })
-}
-
-function handleClear(key: string) {
-  const field = props.fields.find(f => f.key === key)
-  formData.value[key] = field?.type === 'select' ? [] : ''
-
-  nextTick(() => {
-    formRef.value?.validate()
-  })
-}
-const isSubmitDisabled = computed(() => {
-  if (props.mode === 'view') return false
-
-  const hasEmptyRequired = props.fields.some(field => {
-    const isRequired = field.rules?.some(rule => rule('') !== true)
-    const val = formData.value[field.key]
-    const normalized = normalizeValue(val)
-
-    const empty =
-      normalized === null ||
-      normalized === undefined ||
-      (typeof normalized === 'string' && normalized.trim() === '') ||
-      (Array.isArray(normalized) && normalized.length === 0)
-
-    return isRequired && empty
-  })
-
-  if (hasEmptyRequired) return true
-
-  const hasChanges = props.fields.some(field => {
-    const key = field.key
-    const current = normalizeValue(formData.value[key])
-    const initial = normalizeValue(props.initialData?.[key])
-    return !isEqual(current, initial)
-  })
-
-  return !hasChanges
-})
-function uuidv4() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    const r = (Math.random() * 16) | 0
-    const v = c === 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
-  })
-}
-
-function generateUuid() {
-  formData.value.uuid = uuidv4()
-}
-function copyToClipboard(text: string) {
-  navigator.clipboard.writeText(text).then(() => {
-    $q.notify(notificationSettings('success', 'UUID скопирован'))
-  })
-}
-const filteredOptions = ref<Record<string, FieldOption[]>>({})
-</script>
-
 <template>
   <q-dialog :model-value="modelValue" @update:model-value="val => emit('update:modelValue', val)">
     <q-card style="min-width: 700px">
@@ -243,6 +92,129 @@ const filteredOptions = ref<Record<string, FieldOption[]>>({})
     </q-card>
   </q-dialog>
 </template>
+
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits, nextTick, computed } from 'vue'
+import { useQuasar } from 'quasar'
+import AppModalSelect from '../components/ModalSelect.vue'
+import { notificationSettings } from '@/utils/notification'
+import { isEqual, normalizeValue, uuidv4 } from '@/utils/helpers'
+
+type ModalMode = 'view' | 'edit' | 'create'
+type FieldType = 'text' | 'select'
+
+interface FieldOption {
+  label: string
+  value: string
+}
+interface FieldSchema {
+  key: string
+  label: string
+  type: FieldType
+  rules?: ((val: any) => boolean | string)[]
+  options?: FieldOption[]
+  placeholder?: string
+  onSearch?: (val: string) => void
+  onScroll?: () => void
+  loading?: boolean
+}
+
+const props = defineProps<{
+  modelValue: boolean
+  title: string
+  mode: ModalMode
+  fields: FieldSchema[]
+  initialData?: Record<string, any>
+}>()
+const emit = defineEmits<{
+  (e: 'update:modelValue', val: boolean): void
+  (e: 'submit', data: Record<string, any>): void
+  (e: 'edit'): void
+  (e: 'delete'): void
+}>()
+
+const $q = useQuasar()
+const formRef = ref()
+const formData = ref<Record<string, any>>({})
+const filteredOptions = ref<Record<string, FieldOption[]>>({})
+const isSubmitDisabled = computed(() => {
+  if (props.mode === 'view') return false
+
+  const hasEmptyRequired = props.fields.some(field => {
+    const isRequired = field.rules?.some(rule => rule('') !== true)
+    const val = formData.value[field.key]
+    const normalized = normalizeValue(val)
+
+    const empty =
+      normalized === null ||
+      normalized === undefined ||
+      (typeof normalized === 'string' && normalized.trim() === '') ||
+      (Array.isArray(normalized) && normalized.length === 0)
+
+    return isRequired && empty
+  })
+
+  if (hasEmptyRequired) return true
+
+  const hasChanges = props.fields.some(field => {
+    const key = field.key
+    const current = normalizeValue(formData.value[key])
+    const initial = normalizeValue(props.initialData?.[key])
+    return !isEqual(current, initial)
+  })
+
+  return !hasChanges
+})
+function submit() {
+  formRef.value?.validate().then(ok => {
+    if (!ok) return
+
+    const changed: Record<string, any> = {}
+
+    for (const field of props.fields) {
+      const key = field.key
+      const current = formData.value[key]
+      const initial = props.initialData?.[key]
+
+      const normalizedCurrent = field.type === 'select' ? normalizeValue(current) : current
+      const normalizedInitial = field.type === 'select' ? normalizeValue(initial) : initial
+
+      if (!isEqual(normalizedCurrent, normalizedInitial)) {
+        changed[key] = normalizedCurrent
+      }
+    }
+
+    emit('submit', changed)
+  })
+}
+function handleClear(key: string) {
+  const field = props.fields.find(f => f.key === key)
+  formData.value[key] = field?.type === 'select' ? [] : ''
+
+  nextTick(() => {
+    formRef.value?.validate()
+  })
+}
+function generateUuid() {
+  formData.value.uuid = uuidv4()
+}
+function copyToClipboard(text: string) {
+  navigator.clipboard.writeText(text).then(() => {
+    $q.notify(notificationSettings('success', 'UUID скопирован'))
+  })
+}
+
+watch(
+  () => props.modelValue,
+  val => {
+    if (val) {
+      formData.value = { ...(props.initialData ?? {}) }
+    }
+  },
+  { immediate: true },
+)
+</script>
+
 <style lang="scss">
 .custom-select-menu {
   max-height: 250px !important;