shared-ritm 1.2.87 → 1.2.89

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

@@ -1,270 +1,270 @@
-<template>
-  <label class="field-label">
-    {{ label }}
-    <span v-if="rules?.length && isShowRequired" class="required">*</span>
-  </label>
-
-  <q-select
-    ref="select"
-    v-model="selected"
-    :options="filteredOptions"
-    :disable="isDisabled"
-    :multiple="multiple"
-    :popup-content-class="'custom-select-menu'"
-    :hide-selected="!showChip && !simple"
-    :placeholder="placeholder"
-    :loading="loading"
-    :option-value="optionValue || 'value'"
-    :option-label="optionLabel || 'label'"
-    emit-value
-    filled
-    map-options
-    stack-label
-    use-input
-    :use-chips="!simple"
-    :hide-bottom-space="hideBottomSpace"
-    input-debounce="100"
-    autocomplete=""
-    :rules="rules"
-    @virtual-scroll="onScroll"
-    @filter="filterFn"
-  >
-    <template v-if="multiple || showChip" #selected-item="scope">
-      <q-chip
-        v-if="scope.opt"
-        removable
-        :tabindex="scope.tabindex"
-        :style="{ backgroundColor: chipColor }"
-        icon-remove="close"
-        text-color="secondary"
-        @remove="scope.removeAtIndex(scope.index)"
-      >
-        {{ scope.opt[optionLabel || 'label'] }}
-      </q-chip>
-    </template>
-
-    <template #append>
-      <q-icon
-        v-if="!isDisabled && selected && (selected.length || selected > 0)"
-        name="close"
-        class="cursor-pointer clear-input"
-        @click.stop="handleClear"
-      />
-    </template>
-
-    <template #no-option>
-      <div class="q-pa-sm">
-        <q-item>
-          <q-item-section class="wrapper-empty-text">
-            {{ emptyText || 'Ничего не найдено' }}
-            <button
-              v-if="allowCreate && internalSearch && internalSearch.trim()"
-              class="add-new-items"
-              @click="handleCreateFromSearch"
-            >
-              Добавить
-            </button>
-          </q-item-section>
-        </q-item>
-      </div>
-    </template>
-
-    <template #option="scope">
-      <q-item v-if="scope.opt.__loading" class="q-py-md q-ml-md">
-        <q-spinner-dots size="24px" color="primary" />
-      </q-item>
-      <q-item v-else v-bind="scope.itemProps">
-        <q-item-section>{{ scope.opt[optionLabel || 'label'] }}</q-item-section>
-      </q-item>
-    </template>
-  </q-select>
-</template>
-
-<script setup lang="ts">
-import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
-type Option = Record<string, any>
-
-interface AppQSelectProps {
-  modelValue: any
-  options: Option[]
-  placeholder?: string | undefined
-  emptyText?: string
-  optionLabel?: string
-  optionValue?: string
-  label?: string
-  multiple?: boolean
-  loading?: boolean
-  isShowRequired?: boolean
-  isDisabled?: boolean
-  allowCreate?: boolean
-  isSearch?: boolean
-  showChip?: boolean
-  simple?: boolean
-  hideBottomSpace?: boolean
-  chipColor?: string
-  height?: string
-  borderColor?: string
-  borderRadius?: string
-  menuWidth?: string
-  rules?: ((val: any) => boolean | string)[]
-}
-
-const props = defineProps<AppQSelectProps>()
-const emit = defineEmits(['update:modelValue', 'update:scroll', 'update:search', 'clear', 'create'])
-
-const select = ref({})
-const lcText: Ref<string> = ref('')
-const internalSearch = ref('')
-
-const selected = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
-})
-
-function handleClear() {
-  const emptyValue = props.multiple ? [] : null
-  selected.value = emptyValue
-  lcText.value = ''
-  emit('update:modelValue', emptyValue)
-  emit('clear')
-}
-
-const filteredOptions = computed(() => {
-  const labelKey = props.optionLabel || 'label'
-
-  const baseOptions = props.options.filter(x => {
-    const label = x[labelKey]
-    return typeof label === 'string' && label.toLowerCase().includes(lcText.value)
-  })
-
-  if (props.loading) {
-    return [
-      ...baseOptions,
-      {
-        __loading: true,
-        label: '__loading__',
-        value: '__loading__',
-      },
-    ]
-  }
-
-  return baseOptions
-})
-
-function handleCreateFromSearch() {
-  const labelKey = props.optionLabel || 'label'
-  const valueKey = props.optionValue || 'value'
-
-  const trimmed = internalSearch.value?.trim()
-  if (!trimmed) return
-
-  const newOption = {
-    [labelKey]: trimmed,
-    [valueKey]: trimmed,
-  }
-  emit('create', newOption)
-  handleClear()
-}
-
-function filterFn(val: string, update: (cb: () => void) => void) {
-  debouncedFilter(val, update)
-}
-
-const debouncedFilter = debounce((val: string, update: (cb: () => void) => void) => {
-  internalSearch.value = val
-  emit('update:search', val)
-  update(() => {
-    lcText.value = val.toLowerCase()
-  })
-}, 500)
-
-function onScroll({ to, ref: qSelectRef }) {
-  const totalOptions = qSelectRef.options.length
-  if (to >= totalOptions - 1 && !lcText.value) {
-    emit('update:scroll')
-  }
-}
-
-function debounce<T>(fn: T, ms) {
-  let timeoutId
-  return function (...args) {
-    clearTimeout(timeoutId)
-    return new Promise(resolve => {
-      timeoutId = setTimeout(() => {
-        resolve(fn(...args))
-      }, ms)
-    })
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.wrapper-empty-text {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex-direction: row;
-  .add-new-items {
-    background: #3f8cff;
-    color: #fff;
-    outline: none;
-    border: none;
-    border-radius: 4px;
-    padding: 5px 10px;
-    cursor: pointer;
-  }
-}
-.field-label {
-  font-size: 14px;
-  font-weight: 700;
-  color: #7d8592;
-}
-.required {
-  color: #f65160;
-  font-weight: bold;
-}
-
-::v-deep(.q-placeholder) {
-  color: #7d8592;
-}
-::v-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__control:before) {
-  display: none;
-}
-:global(.q-field--filled.q-field--highlighted .q-field__control:before) {
-  background: #fff !important;
-  border: none;
-}
-::v-deep(.q-field--with-bottom) {
-  padding-bottom: 0;
-}
-::v-deep(.q-field__bottom) {
-  padding: 0;
-}
-.clear-input {
-  color: #d8e0f0;
-}
-::v-deep(.q-chip) {
-  border-radius: 4px;
-  background: #e9eff9;
-  color: #1d425d;
-  font-family: NunitoSansFont, sans-serif;
-  font-size: 14px;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 15px;
-  .q-chip__icon {
-    color: #3f8cff;
-    margin-left: 5px;
-  }
-}
-</style>
+<template>
+  <label class="field-label">
+    {{ label }}
+    <span v-if="rules?.length && isShowRequired" class="required">*</span>
+  </label>
+
+  <q-select
+    ref="select"
+    v-model="selected"
+    :options="filteredOptions"
+    :disable="isDisabled"
+    :multiple="multiple"
+    :popup-content-class="'custom-select-menu'"
+    :hide-selected="!showChip && !simple"
+    :placeholder="placeholder"
+    :loading="loading"
+    :option-value="optionValue || 'value'"
+    :option-label="optionLabel || 'label'"
+    emit-value
+    filled
+    map-options
+    stack-label
+    use-input
+    :use-chips="!simple"
+    :hide-bottom-space="hideBottomSpace"
+    input-debounce="100"
+    autocomplete=""
+    :rules="rules"
+    @virtual-scroll="onScroll"
+    @filter="filterFn"
+  >
+    <template v-if="multiple || showChip" #selected-item="scope">
+      <q-chip
+        v-if="scope.opt"
+        removable
+        :tabindex="scope.tabindex"
+        :style="{ backgroundColor: chipColor }"
+        icon-remove="close"
+        text-color="secondary"
+        @remove="scope.removeAtIndex(scope.index)"
+      >
+        {{ scope.opt[optionLabel || 'label'] }}
+      </q-chip>
+    </template>
+
+    <template #append>
+      <q-icon
+        v-if="!isDisabled && selected && (selected.length || selected > 0)"
+        name="close"
+        class="cursor-pointer clear-input"
+        @click.stop="handleClear"
+      />
+    </template>
+
+    <template #no-option>
+      <div class="q-pa-sm">
+        <q-item>
+          <q-item-section class="wrapper-empty-text">
+            {{ emptyText || 'Ничего не найдено' }}
+            <button
+              v-if="allowCreate && internalSearch && internalSearch.trim()"
+              class="add-new-items"
+              @click="handleCreateFromSearch"
+            >
+              Добавить
+            </button>
+          </q-item-section>
+        </q-item>
+      </div>
+    </template>
+
+    <template #option="scope">
+      <q-item v-if="scope.opt.__loading" class="q-py-md q-ml-md">
+        <q-spinner-dots size="24px" color="primary" />
+      </q-item>
+      <q-item v-else v-bind="scope.itemProps">
+        <q-item-section>{{ scope.opt[optionLabel || 'label'] }}</q-item-section>
+      </q-item>
+    </template>
+  </q-select>
+</template>
+
+<script setup lang="ts">
+import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
+type Option = Record<string, any>
+
+interface AppQSelectProps {
+  modelValue: any
+  options: Option[]
+  placeholder?: string | undefined
+  emptyText?: string
+  optionLabel?: string
+  optionValue?: string
+  label?: string
+  multiple?: boolean
+  loading?: boolean
+  isShowRequired?: boolean
+  isDisabled?: boolean
+  allowCreate?: boolean
+  isSearch?: boolean
+  showChip?: boolean
+  simple?: boolean
+  hideBottomSpace?: boolean
+  chipColor?: string
+  height?: string
+  borderColor?: string
+  borderRadius?: string
+  menuWidth?: string
+  rules?: ((val: any) => boolean | string)[]
+}
+
+const props = defineProps<AppQSelectProps>()
+const emit = defineEmits(['update:modelValue', 'update:scroll', 'update:search', 'clear', 'create'])
+
+const select = ref({})
+const lcText: Ref<string> = ref('')
+const internalSearch = ref('')
+
+const selected = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+
+function handleClear() {
+  const emptyValue = props.multiple ? [] : null
+  selected.value = emptyValue
+  lcText.value = ''
+  emit('update:modelValue', emptyValue)
+  emit('clear')
+}
+
+const filteredOptions = computed(() => {
+  const labelKey = props.optionLabel || 'label'
+
+  const baseOptions = props.options.filter(x => {
+    const label = x[labelKey]
+    return typeof label === 'string' && label.toLowerCase().includes(lcText.value)
+  })
+
+  if (props.loading) {
+    return [
+      ...baseOptions,
+      {
+        __loading: true,
+        label: '__loading__',
+        value: '__loading__',
+      },
+    ]
+  }
+
+  return baseOptions
+})
+
+function handleCreateFromSearch() {
+  const labelKey = props.optionLabel || 'label'
+  const valueKey = props.optionValue || 'value'
+
+  const trimmed = internalSearch.value?.trim()
+  if (!trimmed) return
+
+  const newOption = {
+    [labelKey]: trimmed,
+    [valueKey]: trimmed,
+  }
+  emit('create', newOption)
+  handleClear()
+}
+
+function filterFn(val: string, update: (cb: () => void) => void) {
+  debouncedFilter(val, update)
+}
+
+const debouncedFilter = debounce((val: string, update: (cb: () => void) => void) => {
+  internalSearch.value = val
+  emit('update:search', val)
+  update(() => {
+    lcText.value = val.toLowerCase()
+  })
+}, 500)
+
+function onScroll({ to, ref: qSelectRef }) {
+  const totalOptions = qSelectRef.options.length
+  if (to >= totalOptions - 1 && !lcText.value) {
+    emit('update:scroll')
+  }
+}
+
+function debounce<T>(fn: T, ms) {
+  let timeoutId
+  return function (...args) {
+    clearTimeout(timeoutId)
+    return new Promise(resolve => {
+      timeoutId = setTimeout(() => {
+        resolve(fn(...args))
+      }, ms)
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wrapper-empty-text {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-direction: row;
+  .add-new-items {
+    background: #3f8cff;
+    color: #fff;
+    outline: none;
+    border: none;
+    border-radius: 4px;
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+}
+.field-label {
+  font-size: 14px;
+  font-weight: 700;
+  color: #7d8592;
+}
+.required {
+  color: #f65160;
+  font-weight: bold;
+}
+
+::v-deep(.q-placeholder) {
+  color: #7d8592;
+}
+::v-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__control:before) {
+  display: none;
+}
+:global(.q-field--filled.q-field--highlighted .q-field__control:before) {
+  background: #fff !important;
+  border: none;
+}
+::v-deep(.q-field--with-bottom) {
+  padding-bottom: 0;
+}
+::v-deep(.q-field__bottom) {
+  padding: 0;
+}
+.clear-input {
+  color: #d8e0f0;
+}
+::v-deep(.q-chip) {
+  border-radius: 4px;
+  background: #e9eff9;
+  color: #1d425d;
+  font-family: NunitoSansFont, sans-serif;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 15px;
+  .q-chip__icon {
+    color: #3f8cff;
+    margin-left: 5px;
+  }
+}
+</style>

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

@@ -77,17 +77,18 @@
       </q-card-section>
 
       <q-card-actions align="center">
-        <q-btn v-if="mode === 'view'" class="remove" flat label="Удалить" @click="emit('delete')" />
+        <q-btn v-if="mode === 'view'" class="remove" flat label="Удалить" :loading="loading" @click="emit('delete')" />
         <q-btn
           v-if="mode !== 'view'"
           class="confirm"
           flat
           :label="mode === 'edit' ? 'Сохранить' : 'Создать'"
           :disable="isSubmitDisabled"
+          :loading="loading"
           @click="submit"
         />
-        <q-btn v-else class="confirm" flat label="Редактировать" @click="$emit('edit')" />
-        <q-btn v-close-popup class="cancel" flat label="Закрыть" />
+        <q-btn v-else class="confirm" flat label="Редактировать" :disable="loading" @click="$emit('edit')" />
+        <q-btn v-close-popup class="cancel" flat label="Закрыть" :disable="loading" />
       </q-card-actions>
     </q-card>
   </q-dialog>
@@ -125,6 +126,7 @@ const props = defineProps<{
   mode: ModalMode
   fields: FieldSchema[]
   initialData?: Record<string, any>
+  loading?: boolean
 }>()
 const emit = defineEmits<{
   (e: 'update:modelValue', val: boolean): void

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

@@ -25,7 +25,10 @@ export function useBaseTable(model: {
 
   watch(
     () => model.columnFilters.value,
-    () => loadTable(search.value, currentPage.value),
+    async () => {
+      currentPage.value = 1
+      await loadTable(search.value, currentPage.value)
+    },
     { deep: true },
   )
 

package/src/styles/variables.sass

@@ -1,12 +1,12 @@
-$primary    : #1976D2
-$secondary  : #C4C4C4
-$accent     : #665BA6
-$positive   : #3B9F69
-$negative   : #C10015
-$info       : #31CCEC
-$warning    : #F2C037
-
-$dark       : #1D1D1D
-$dark-page  : #121212
-
-$secondary: #1D1D1D
+$primary    : #1976D2
+$secondary  : #C4C4C4
+$accent     : #665BA6
+$positive   : #3B9F69
+$negative   : #C10015
+$info       : #31CCEC
+$warning    : #F2C037
+
+$dark       : #1D1D1D
+$dark-page  : #121212
+
+$secondary: #1D1D1D

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

@@ -1,10 +0,0 @@
-import ApiService from '@/api/settings/ApiService'
-import { Api_Comment_Request_Dto } from '@/api/types/Api_Comment'
-import { Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks'
-declare class CommentsService extends ApiService {
-  uploadComment(payload: Api_Comment_Request_Dto): Promise<Api_Tasks_Task_Dto>
-  deleteComment(commentId: string): Promise<unknown>
-  editComment(payload: { commentId: string; data: unknown }): Promise<unknown>
-}
-export default function useCommentsService(): CommentsService
-export {}

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

@@ -1,43 +0,0 @@
-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[]
-}