shared-ritm 1.2.68 → 1.2.70

package/dist/types/api/services/ControlsService.d.ts

@@ -1,5 +1,6 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
 import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '@/api/types/Api_Controls';
+import { ResponseApi } from '@/api/types/Api_Service';
 declare class ControlsService extends ApiService {
     fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
     fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>>;

package/dist/types/api/services/FileService.d.ts

@@ -1,4 +1,5 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
 import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files';
 declare class FileService extends ApiService {
     uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>>;

package/dist/types/api/services/MetricsService.d.ts

@@ -1,4 +1,5 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
 declare class MetricsService extends ApiService {
     fetchPieProjects(queryString: string): Promise<ResponseApi<any>>;
     fetchPieTasks(queryString: string): Promise<ResponseApi<any>>;

package/dist/types/api/services/PhotoService.d.ts

@@ -1,6 +1,5 @@
 import * as faceapi from 'face-api.js';
-import ApiService from '@/api/settings/ApiService';
-declare class PhotoService extends ApiService {
+declare class PhotoService {
     getVideoStreamConfig(width: number, height: number): {
         audio: boolean;
         video: {

package/dist/types/api/services/ProjectsService.d.ts

@@ -1,4 +1,5 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
 import { Api_Project_Dto } from '@/api/types/Api_Projects';
 declare class ProjectsService extends ApiService {
     fetchProjectById(id: string): Promise<ResponseApi<Api_Project_Dto>>;

package/dist/types/api/services/RepairsService.d.ts

@@ -1,4 +1,5 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
 import { Api_Create_Repair_With_Equipments, Api_Equipment_Full_Dto, Api_Repair_Dto, Api_Update_Repair, OptionFilters } from '@/api/types/Api_Repairs';
 declare class RepairsService extends ApiService {
     fetchFilters(fullParams: string): Promise<OptionFilters>;

package/dist/types/api/services/SearchService.d.ts

@@ -0,0 +1,8 @@
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
+import { Api_Search_User } from '@/api/types/Api_Search';
+declare class SearchService extends ApiService {
+    fetchSearchUsers(params: any): Promise<ResponseApi<Api_Search_User>>;
+}
+export default function useSearchService(): SearchService;
+export {};

package/dist/types/api/services/TasksService.d.ts

@@ -1,4 +1,5 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService';
+import ApiService from '@/api/settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
 import { Api_Task_Close_Reason, Api_Task_Instrument_Dto, Api_Task_Instrument_From_Warehouse, Api_Task_Module_Instrument_Condition, Api_Tasks_Dto, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
 import { Api_Equipment_Full_Dto, Api_Task_Video_Source, Api_Task_Video_Source_Stream } from '@/api/types/Api_Repairs';
 declare class TasksService extends ApiService {

package/dist/types/api/settings/ApiService.d.ts

@@ -2,14 +2,6 @@ import { AxiosRequestConfig, AxiosResponse } from 'axios';
 export declare enum ApiServiceType {
     SERVICE_AUTH = "SERVICE_AUTH"
 }
-export type ResponseApi<T> = {
-    count: number;
-    current_page: number;
-    data: T;
-    per_page: number;
-    total: number;
-    total_pages: number;
-};
 export default class ApiService {
     private axiosInstance;
     constructor();

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

@@ -67,6 +67,8 @@ export type Api_Create_Repair_With_Equipments = {
     power_output_MWh?: number;
     cost_per_MWh?: number;
     category?: string;
+    user_id_list?: string[];
+    team_id_list?: string[];
 };
 export type Api_Update_Repair = {
     name?: string;
@@ -75,6 +77,8 @@ export type Api_Update_Repair = {
     power_output_MWh?: number;
     cost_per_MWh?: number;
     category?: string;
+    user_id_list?: string[];
+    team_id_list?: string[];
 };
 export type Api_Repair_Dto = {
     id: string;

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

@@ -0,0 +1,43 @@
+export type Api_Search_User_Passes = {
+    id: string;
+    type: string;
+    uuid: string;
+};
+export type Api_Search_User_Positions = {
+    id: string;
+    name: string;
+    display_name: string;
+    description: string;
+};
+export type Api_Search_User_Roles = {
+    id: string;
+    name: string;
+    display_name: string;
+};
+export type Api_Search_User_Teams = {
+    id: string;
+    name: string;
+    display_name: string;
+    roles: Api_Search_User_Roles[];
+};
+export type Api_Search_User_Photos = {
+    id: string;
+    name: string;
+    path: string;
+    type: string;
+};
+export type Api_Search_User = {
+    id: string;
+    full_name: string;
+    last_name: string;
+    first_name: string;
+    patronymic: string;
+    email: string;
+    phone: string;
+    divisions: string;
+    personnel_number: string;
+    passes: Api_Search_User_Passes[];
+    positions: Api_Search_User_Positions[];
+    teams: Api_Search_User_Teams[];
+    photos: Api_Search_User_Photos[];
+};

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

@@ -0,0 +1,9 @@
+export type ResponseApi<T> = {
+    count: number;
+    current_page: number;
+    data: T;
+    per_page: number;
+    total: number;
+    total_pages: number;
+    filter_value?: string;
+};

package/dist/types/index.d.ts

@@ -3,6 +3,7 @@ import AppButton from '@/common/app-button/AppButton.vue';
 import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue';
 import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue';
 import AppInput from '@/common/app-input/AppInput.vue';
+import AppInputNew from '@/common/app-input-new/AppInputNew.vue';
 import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue';
 import AppLayout from '@/common/app-layout/AppLayout.vue';
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue';
@@ -21,6 +22,7 @@ import AppTableModal from '@/common/app-table/components/TableModal.vue';
 import AppTable from '@/common/app-table/AppTable.vue';
 import AppTableLayout from '@/common/app-table/AppTableLayout.vue';
 import AppModalSelect from '@/common/app-table/components/ModalSelect.vue';
+import ApiService from '@/api/settings/ApiService';
 import useGanttService from '@/api/services/GanttService';
 import useMetricsService from '@/api/services/MetricsService';
 import useProjectsService from '@/api/services/ProjectsService';
@@ -32,10 +34,10 @@ import useVideoService from '@/api/services/VideoService';
 import useUserService from '@/api/services/UserService';
 import usePhotoService from '@/api/services/PhotoService';
 import useInstrumentsService from '@/api/services/InstrumentsService';
-import ApiService from '@/api/settings/ApiService';
 import useControlsService from '@/api/services/ControlsService';
-export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, AppModalSelect, };
-export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, useVideoService, useUserService, usePhotoService, useInstrumentsService, };
+import useSearchService from '@/api/services/SearchService';
+export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputNew, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, AppModalSelect, };
+export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, useVideoService, useUserService, usePhotoService, useInstrumentsService, useSearchService, };
 export { useBaseTable } from './common/app-table/controllers/useBaseTable';
 export { useTableModel } from './common/app-table/controllers/useTableModel';
 export { useColumnSelector } from './common/app-table/controllers/useColumnSelector';
@@ -43,9 +45,11 @@ export type { FilterOption, TableModel, TableColumn } from './common/app-table/c
 export type { NotificationType } from './utils/notification';
 export { notificationSettings } from './utils/notification';
 export * from './utils/helpers';
+export * from './api/types/Api_Service';
 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_Search';
 export * from './api/types/Api_User';

package/package.json

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

package/src/api/types/Api_Repairs.ts

@@ -70,6 +70,8 @@ export type Api_Create_Repair_With_Equipments = {
   power_output_MWh?: number
   cost_per_MWh?: number
   category?: string
+  user_id_list?: string[]
+  team_id_list?: string[]
 }
 
 export type Api_Update_Repair = {
@@ -79,6 +81,8 @@ export type Api_Update_Repair = {
   power_output_MWh?: number
   cost_per_MWh?: number
   category?: string
+  user_id_list?: string[]
+  team_id_list?: string[]
 }
 
 export type Api_Repair_Dto = {

package/src/common/app-input-new/AppInputNew.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="app-input-new">
+    <label v-if="label" class="app-input-new__label">
+      {{ label }}
+      <span v-if="required" class="required">*</span>
+    </label>
+
+    <q-input v-model="model" filled :type="type" :rules="rules" :placeholder="placeholder" :disable="disable">
+      <template #append>
+        <q-icon
+          v-if="clearable && model?.length"
+          name="close"
+          class="cursor-pointer clear-input"
+          @click="model = null"
+        />
+        <q-btn v-if="uuid" flat no-caps label="UUID" size="sm" class="q-ml-sm uuid-btn" @click="model = uuidv4()" />
+        <q-icon
+          v-if="copyable"
+          name="content_copy"
+          class="cursor-pointer q-ml-sm copy-icon"
+          color="primary"
+          :disable="!model"
+          @click="copyToClipboard"
+        />
+      </template>
+    </q-input>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineEmits, defineProps, defineModel } from 'vue'
+import { uuidv4 } from '@/utils/helpers'
+import { notificationSettings } from '@/utils/notification'
+import { QInputProps, useQuasar } from 'quasar'
+
+defineProps<
+  QInputProps & {
+    modelValue?: string | number | null
+    label?: string
+    placeholder?: string
+    rules?: ((val: string | number | null | undefined) => boolean | string)[]
+    required?: boolean
+    disable?: boolean
+    uuid?: boolean
+    clearable?: boolean
+    copyable?: boolean
+  }
+>()
+
+defineEmits<{
+  (e: 'update:modelValue', val: boolean): void
+}>()
+
+const model = defineModel<string | null>()
+
+const $q = useQuasar()
+
+const copyToClipboard = () => {
+  if (!model.value) return
+
+  navigator.clipboard.writeText(model.value).then(() => {
+    $q.notify(notificationSettings('success', 'Данные скопированы'))
+  })
+}
+</script>
+
+<style scoped lang="scss">
+.app-input-new {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 15px;
+
+  &__label {
+    font-size: 14px;
+    font-weight: 700;
+    color: #7d8592;
+  }
+
+  .required {
+    color: #f65160;
+    font-weight: bold;
+  }
+
+  .clear-input {
+    color: #d8e0f0;
+  }
+
+  .uuid-btn {
+    height: 32px;
+    padding: 0 10px;
+    border: 1px solid #3f8cff;
+    color: #3f8cff;
+    font-weight: 700;
+    font-size: 14px;
+    background: white;
+    border-radius: 6px;
+
+    :deep(.block) {
+      line-height: normal;
+    }
+  }
+
+  :deep(.q-placeholder) {
+    color: #7d8592;
+  }
+
+  :deep(.q-field__control) {
+    border-radius: 8px;
+    border: 1px solid #d8e0f0;
+    background: #fff;
+    box-shadow: 0 1px 2px 0 rgba(184, 200, 224, 0.22);
+  }
+
+  :deep(.q-field--filled .q-field__control:before) {
+    background: #fff !important;
+    border: none;
+  }
+
+  :deep(.q-field--with-bottom) {
+    padding-bottom: 0;
+  }
+
+  :deep(.q-field__bottom) {
+    padding: 0;
+  }
+}
+</style>

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

@@ -11,7 +11,7 @@
     :disable="isDisabled"
     :multiple="multiple"
     :popup-content-class="'custom-select-menu'"
-    :hide-selected="!showChip"
+    :hide-selected="!showChip && !simple"
     :placeholder="placeholder"
     :loading="loading"
     :option-value="optionValue || 'value'"
@@ -20,8 +20,9 @@
     filled
     map-options
     stack-label
-    use-input
-    use-chips
+    :use-input="!selected || !simple"
+    :use-chips="!simple"
+    :hide-bottom-space="hideBottomSpace"
     input-debounce="100"
     autocomplete=""
     :rules="rules"
@@ -44,7 +45,7 @@
 
     <template #append>
       <q-icon
-        v-if="!isDisabled && selected && selected.length"
+        v-if="!isDisabled && selected && (selected.length || selected > 0)"
         name="close"
         class="cursor-pointer clear-input"
         @click.stop="handleClear"
@@ -55,7 +56,7 @@
       <div class="q-pa-sm">
         <q-item>
           <q-item-section class="wrapper-empty-text">
-            {{ emptyText }}
+            {{ emptyText || 'Ничего не найдено' }}
             <button
               v-if="allowCreate && internalSearch && internalSearch.trim()"
               class="add-new-items"
@@ -86,8 +87,8 @@ type Option = Record<string, any>
 interface AppQSelectProps {
   modelValue: any
   options: Option[]
-  placeholder: string | undefined
-  emptyText: string
+  placeholder?: string | undefined
+  emptyText?: string
   optionLabel?: string
   optionValue?: string
   label?: string
@@ -98,6 +99,8 @@ interface AppQSelectProps {
   allowCreate?: boolean
   isSearch?: boolean
   showChip?: boolean
+  simple?: boolean
+  hideBottomSpace?: boolean
   chipColor?: string
   height?: string
   borderColor?: string
@@ -123,9 +126,10 @@ const selected = computed({
 })
 
 function handleClear() {
-  selected.value = props.multiple ? [] : null
+  const emptyValue = props.multiple ? [] : null
+  selected.value = emptyValue
   lcText.value = ''
-  emit('update:modelValue', selected.value)
+  emit('update:modelValue', emptyValue)
   emit('clear')
 }
 
@@ -231,10 +235,9 @@ function debounce<T>(fn: T, ms) {
   border-radius: 8px;
   border: 1px solid #d8e0f0;
   background: #fff;
-  box-shadow: 0px 1px 2px 0px rgba(184, 200, 224, 0.22);
+  box-shadow: 0 1px 2px 0 rgba(184, 200, 224, 0.22);
 }
-::v-deep(.q-field--filled.q-field--highlighted .q-field__control:before),
-::v-deep(.q-field--filled .q-field__control:before) {
+:global(.q-field--filled.q-field--highlighted .q-field__control:before) {
   background: #fff !important;
   border: none;
 }

package/src/index.ts

@@ -3,6 +3,7 @@ import AppButton from '@/common/app-button/AppButton.vue'
 import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue'
 import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
 import AppInput from '@/common/app-input/AppInput.vue'
+import AppInputNew from '@/common/app-input-new/AppInputNew.vue'
 import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue'
 import AppLayout from '@/common/app-layout/AppLayout.vue'
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
@@ -42,6 +43,7 @@ export {
   AppCheckbox,
   AppDatePicker,
   AppInput,
+  AppInputNew,
   AppInputSearch,
   AppLayout,
   AppLayoutHeader,