shared-ritm 1.2.71 → 1.2.73

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

@@ -78,9 +78,9 @@ export type Api_Create_Repair_With_Template = Omit<Api_Create_Repair_With_Equipm
 export type Api_Update_Repair = {
     name?: string;
     display_name?: string;
-    description?: string;
-    power_output_MWh?: number;
-    cost_per_MWh?: number;
+    description?: string | null;
+    power_output_MWh?: number | null;
+    cost_per_MWh?: number | null;
     category?: number;
     user_id_list?: string[];
     team_id_list?: string[];

package/package.json

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

package/src/api/types/Api_Repairs.ts

@@ -83,9 +83,9 @@ export type Api_Create_Repair_With_Template = Omit<Api_Create_Repair_With_Equipm
 export type Api_Update_Repair = {
   name?: string
   display_name?: string
-  description?: string
-  power_output_MWh?: number
-  cost_per_MWh?: number
+  description?: string | null
+  power_output_MWh?: number | null
+  cost_per_MWh?: number | null
   category?: number
   user_id_list?: string[]
   team_id_list?: string[]

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

@@ -3,7 +3,7 @@
     <q-table
       v-model:selected="selected"
       :rows="rows.value"
-      :columns="columns"
+      :columns="resCols"
       row-key="id"
       flat
       bordered
@@ -12,7 +12,7 @@
       :rows-per-page-options="[0]"
       :selection="props.enableMultiSelect ? 'multiple' : 'none'"
       style="height: 100%"
-      @row-click="(_, row) => emit('row-click', row)"
+      @row-click="rowClick"
     >
       <template #header-selection="scope">
         <q-toggle v-model="scope.selected" />
@@ -22,14 +22,14 @@
         <q-toggle v-model="scope.selected" />
       </template>
 
-      <template #body-cell-index="props">
-        <q-td :props="props" class="text-center" :class="{ 'q-td--no-hover': noHover }">
-          {{ props.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
+      <template #body-cell-index="cellProps">
+        <q-td :props="cellProps" class="text-center" :class="{ 'q-td--no-hover': noHover }">
+          {{ cellProps.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
         </q-td>
       </template>
 
-      <template v-for="col in columns" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
-        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType }">
+      <template v-for="col in resCols" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
+        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }">
           <div
             v-if="col.filterType"
             class="row items-center no-wrap"
@@ -90,26 +90,35 @@
         </q-th>
       </template>
 
-      <template #body-cell="props">
-        <q-td :props="props" :class="{ 'q-td--no-hover': noHover }">
+      <template #body-cell="cellProps">
+        <q-td
+          :props="cellProps"
+          :class="{
+            'q-td--no-hover': noHover || cellProps.col.name === 'actions',
+            actions: cellProps.col.name === 'actions',
+          }"
+        >
+          <div v-if="cellProps.col.name === 'actions'" class="actions__btns">
+            <q-btn square icon="edit" size="sm" unelevated title="Редактировать" @click="emit('edit', cellProps.row)" />
+          </div>
           <q-badge
-            v-if="props.col.badge && typeof props.value === 'boolean'"
+            v-else-if="cellProps.col.badge && typeof cellProps.value === 'boolean'"
             :color="
-              props.col.badge.colorTrue && props.value
-                ? props.col.badge.colorTrue
-                : props.col.badge.colorFalse && !props.value
-                ? props.col.badge.colorFalse
-                : props.value
+              cellProps.col.badge.colorTrue && cellProps.value
+                ? cellProps.col.badge.colorTrue
+                : cellProps.col.badge.colorFalse && !cellProps.value
+                ? cellProps.col.badge.colorFalse
+                : cellProps.value
                 ? 'green'
                 : 'red'
             "
             outline
             class="text-bold"
           >
-            {{ props.value ? props.col.badge.true ?? 'Да' : props.col.badge.false ?? 'Нет' }}
+            {{ cellProps.value ? cellProps.col.badge.true ?? 'Да' : cellProps.col.badge.false ?? 'Нет' }}
           </q-badge>
-          <span v-else-if="props.col.html" v-html="props.value"></span>
-          <span v-else>{{ props.value }}</span>
+          <span v-else-if="cellProps.col.html" v-html="cellProps.value"></span>
+          <span v-else>{{ cellProps.value }}</span>
         </q-td>
       </template>
     </q-table>
@@ -131,6 +140,7 @@ interface TableEmits {
   'open-filter-menu': [colName: string, isOpen: boolean]
   'row-click': [row: Record<string, any>]
   'update:selectedRows': [rows: any[]] // синтаксис defineEmits для эмита с именованными параметрами
+  edit: [row: Record<string, any>]
 }
 
 const props = defineProps<{
@@ -143,12 +153,19 @@ const props = defineProps<{
   enableMultiSelect?: boolean
   noHover?: boolean
   selectedRows: any[]
+  actions?: string[]
 }>()
 const emit = defineEmits<TableEmits>()
 
 const localSearches = ref<Record<string, string>>({})
 const selected = ref<any[]>([])
 
+const resCols = computed(() => {
+  if (!props.actions?.length) return props.columns
+
+  return [...props.columns, { name: 'actions', label: 'Действия', align: 'center' }]
+})
+
 const filteredOptions = computed(() => {
   const result: Record<string, FilterOption[]> = {}
   for (const col of props.columns) {
@@ -159,6 +176,14 @@ const filteredOptions = computed(() => {
   return result
 })
 
+const rowClick = (e: Event, row: Record<string, any>) => {
+  const target = e?.target
+
+  if (!(target instanceof HTMLElement) || target.closest('.actions') || document.getSelection()?.toString()) return
+
+  emit('row-click', row)
+}
+
 watch(
   () => props.selectedRows,
   val => {
@@ -176,6 +201,28 @@ watch(
 )
 </script>
 <style scoped lang="scss">
+.actions {
+  width: 100px;
+  background-color: #f2f7fb;
+  position: sticky;
+  right: 0;
+  z-index: 1;
+  border-left: 1px solid #d7e0ef;
+
+  &__btns {
+    display: flex;
+    justify-content: center;
+    gap: 0.5rem;
+
+    button {
+      background-color: #a4b4cf50;
+      width: 32px;
+      height: 32px;
+      border-radius: 8px;
+    }
+  }
+}
+
 .cursor-pointer {
   cursor: pointer;
 }
@@ -196,7 +243,7 @@ watch(
   }
   .q-item__section {
     min-width: 30px;
-    padding: 0px;
+    padding: 0;
   }
   ::v-deep(.q-radio__inner),
   ::v-deep(.q-checkbox__inner) {
@@ -214,7 +261,7 @@ watch(
   position: sticky;
   top: 0;
   background: #f2f7fb;
-  z-index: 1;
+  z-index: 2;
 }
 
 ::v-deep(.q-table th) {