shared-ritm 1.2.62 → 1.2.64

package/dist/types/common/app-table/controllers/useTableModel.d.ts

@@ -6,7 +6,7 @@ export interface TableColumn {
     headerStyle?: string;
     field: string | ((row: any) => any);
     sortable?: boolean;
-    filterType: 'single' | 'multi' | null;
+    filterType?: 'single' | 'multi' | null;
     align?: 'left' | 'center' | 'right';
     badge?: {
         true?: string;

package/dist/types/index.d.ts

@@ -44,3 +44,4 @@ export * from './api/types/Api_Tasks';
 export * from './api/types/Api_Repairs';
 export * from './api/types/Api_Projects';
 export * from './api/types/Api_Controls';
+export * from './api/types/Api_Instruments';

package/package.json

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

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

@@ -1,5 +1,5 @@
 <template>
-  <q-page class="flex flex-col" style="min-height: 100%">
+  <q-page class="flex flex-col" style="height: 100%; min-height: 100%">
     <q-table
       v-model:selected="selected"
       :rows="rows.value"
@@ -11,6 +11,7 @@
       class="full-width"
       :rows-per-page-options="[0]"
       :selection="props.enableMultiSelect ? 'multiple' : 'none'"
+      style="height: 100%"
       @row-click="(_, row) => emit('row-click', row)"
     >
       <template #header-selection="scope">
@@ -22,7 +23,7 @@
       </template>
 
       <template #body-cell-index="props">
-        <q-td :props="props" class="text-center">
+        <q-td :props="props" class="text-center" :class="{ 'q-td--no-hover': noHover }">
           {{ props.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
         </q-td>
       </template>
@@ -90,7 +91,7 @@
       </template>
 
       <template #body-cell="props">
-        <q-td :props="props">
+        <q-td :props="props" :class="{ 'q-td--no-hover': noHover }">
           <q-badge
             v-if="props.col.badge && typeof props.value === 'boolean'"
             :color="
@@ -140,6 +141,7 @@ const props = defineProps<{
   filtersOptions: Record<string, FilterOption[]>
   meta: Ref<{ currentPage: number; perPage: number }>
   enableMultiSelect?: boolean
+  noHover?: boolean
   selectedRows: any[]
 }>()
 const emit = defineEmits<TableEmits>()
@@ -209,7 +211,10 @@ watch(
 }
 
 ::v-deep(.q-table thead) {
+  position: sticky;
+  top: 0;
   background: #f2f7fb;
+  z-index: 1;
 }
 
 ::v-deep(.q-table th) {
@@ -227,6 +232,10 @@ watch(
   font-size: 14px;
 }
 
+.q-td--no-hover {
+  cursor: default;
+}
+
 ::v-deep(.q-table tbody) {
   font-family: NunitoSansFont, sans-serif;
   border-color: #d7e0ef;

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

@@ -1,7 +1,8 @@
 <template>
-  <div class="table-layout">
-    <div class="table-controls">
+  <div class="table-layout" :class="{ 'hide-search': !actionsSlot && hideSearch }">
+    <div v-if="actionsSlot || !hideSearch" class="table-controls">
       <app-table-search
+        v-if="!hideSearch"
         :model-value="props.search"
         class="search-input"
         placeholder="Введите наименование"
@@ -14,6 +15,7 @@
       <app-table
         v-bind="props.tableProps"
         :selected-rows="props.selectedRows"
+        :no-hover="noHover"
         v-on="props.tableEvents"
         @update:selectedRows="rows => emit('update:selectedRows', rows)"
       />
@@ -48,6 +50,8 @@ const props = defineProps<{
   onPageChange: (page: number) => void
   actionsSlot?: boolean
   modalSlot?: boolean
+  hideSearch?: boolean
+  noHover?: boolean
   selectedRows: any[]
 }>()
 const emit = defineEmits<{
@@ -56,17 +60,22 @@ const emit = defineEmits<{
 </script>
 <style scoped lang="scss">
 .table-layout {
-  height: calc(100vh - 100px);
-  display: flex;
-  flex-direction: column;
+  height: 100%;
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  gap: 1.25rem;
   box-sizing: border-box;
+  overflow: auto;
+
+  &.hide-search {
+    grid-template-rows: 1fr auto;
+  }
 }
 .table-controls {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 18px;
-  margin-bottom: 20px;
+  gap: 1.25rem;
 
   .search-input {
     flex: 1;

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

@@ -105,10 +105,12 @@ function nextPage() {
   align-items: center;
   gap: 20px;
   flex-wrap: wrap;
-  margin-top: 17px;
-  margin-bottom: 15px;
+
   .arrow-button,
   .page-button {
+    display: flex;
+    justify-content: center;
+    align-items: center;
     width: 34px;
     height: 34px;
     border-radius: 4px;

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

@@ -7,7 +7,7 @@ export interface TableColumn {
   headerStyle?: string
   field: string | ((row: any) => any)
   sortable?: boolean
-  filterType: 'single' | 'multi' | null
+  filterType?: 'single' | 'multi' | null
   align?: 'left' | 'center' | 'right'
   badge?: {
     true?: string

package/src/index.ts

@@ -85,4 +85,5 @@ export * from './api/types/Api_Tasks'
 export * from './api/types/Api_Repairs'
 export * from './api/types/Api_Projects'
 export * from './api/types/Api_Controls'
+export * from './api/types/Api_Instruments'
 // export * from '@/api/types/Api_Metrics'