shared-ritm 1.2.17 → 1.2.18

package/src/common/app-layout/components/AppLayoutHeader.vue

@@ -1,33 +1,48 @@
 <template>
-  <q-header ref="myDiv" :style="marginLeft" :class="[$style.header, { [$style[`header-full`]]: fullWidth }]">
+  <q-header :class="[$style.header, { [$style[`header-full`]]: fullWidth }]">
     <q-toolbar :class="$style.toolbar">
-      <h1>{{ pageTitle }}</h1>
+      <!--      <app-input-search v-model.trim="text" type="text" label="Поиск по системе" :class="$style['header-search']" />-->
       <div :class="$style['action-buttons']">
+        <slot name="filters-actions"></slot>
+      </div>
+
+      <div :class="$style['action-buttons']">
+        <slot name="action-buttons"></slot>
+
         <app-button icon="person" text-color="black" :label="shortName" rounded :class="$style['button-person']" />
+        <!--        <app-button :class="$style.button" rounded>-->
+        <!--          <small-caps-icon />-->
+        <!--        </app-button>-->
+        <!--        <app-button :class="$style.button" rounded>-->
+        <!--          <search-status-icon />-->
+        <!--        </app-button>-->
+        <!--        <app-button @click="counter++" :class="$style.button" rounded :badge="`+${counter}`" badge-color="#3F8CFF">-->
+        <!--          <flash-icon />-->
+        <!--        </app-button>-->
+        <!--        <app-button :class="$style.button" rounded>-->
+        <!--          <notification-icon />-->
+        <!--        </app-button>-->
       </div>
     </q-toolbar>
   </q-header>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineProps, withDefaults, onBeforeUnmount, onMounted, ref } from 'vue'
+import { computed, defineProps } from 'vue'
+//import AppInput from '@/common/app-input-search/AppInputSearch.vue'
 import AppButton from '@/common/app-button/AppButton.vue'
+
+//import SmallCapsIcon from '@/icons/header/smallCapsIcon.vue'
+//import SearchStatusIcon from '@/icons/header/searchStatusIcon.vue'
+//import FlashIcon from '@/icons/header/flashIcon.vue'
+//import NotificationIcon from '@/icons/header/notificationIcon.vue'
 interface Props {
   userData: any
   fullWidth?: boolean
-  autoMargin?: boolean
-  pageTitle?: string
-  leftMini?: string
-  leftMax?: string
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  pageTitle: '',
-  leftMini: '100px',
-  leftMax: '30px',
-})
+const props = defineProps<Props>()
 
-const hasPaddingLeft = ref(false)
 // const counter = ref(1)
 const shortName = computed(
   () =>
@@ -35,27 +50,6 @@ const shortName = computed(
       props.userData?.patronymic?.[0] ? '.' : ''
     }`,
 )
-
-const marginLeft = computed(() => {
-  if (!props.autoMargin) return {}
-  return hasPaddingLeft.value ? { 'margin-left': props.leftMax } : { 'margin-left': props.leftMini }
-})
-
-function checkPaddingLeft() {
-  const el = document.querySelector('.q-header') as HTMLElement | null
-  if (el) {
-    const observer = new ResizeObserver(() => {
-      console.log(window.getComputedStyle(el).left)
-      hasPaddingLeft.value = window.getComputedStyle(el).left !== '0px'
-    })
-    observer.observe(el)
-    onBeforeUnmount(() => observer.disconnect())
-  }
-}
-
-onMounted(() => {
-  checkPaddingLeft()
-})
 </script>
 
 <style lang="scss" module>
@@ -67,17 +61,11 @@ onMounted(() => {
 }
 .header-full {
   max-width: 100%;
-  padding-right: 20px;
+  padding: 0 20px;
 }
 .toolbar {
   padding: 0;
   min-height: 100%;
-  h1 {
-    font-weight: 600;
-    font-size: 28px;
-    line-height: 100%;
-    font-family: Montserrat, sans-serif;
-  }
 }
 
 .header-search {

package/src/common/app-select/AppSelect.vue

@@ -1,157 +1,157 @@
-<template>
-  <q-select
-    ref="select"
-    v-model="selected"
-    :options="filteredOptions"
-    :option-value="optionValue"
-    :option-label="optionLabel"
-    emit-value
-    map-options
-    :disable="isDisabled"
-    :multiple="multiple"
-    outlined
-    stack-label
-    :use-input="search"
-    :class="[$style.select]"
-    :label="label"
-    input-debounce="100"
-    :popup-content-class="$style['app-select__menu']"
-    :clearable="clearable"
-    rounded
-    autocomplete=""
-    @filter="filterFn"
-  >
-    <template v-if="multiple" #selected-item="scope">
-      <q-chip
-        v-if="scope.opt"
-        removable
-        class="q-ma-none"
-        dense
-        :tabindex="scope.tabindex"
-        color="white"
-        text-color="secondary"
-        @remove="scope.removeAtIndex(scope.index)"
-      >
-        {{ scope.opt[`${optionLabel}`] }}
-      </q-chip>
-    </template>
-    <template #no-option>
-      <q-item>{{ emptyText }}</q-item>
-    </template>
-    <q-item v-if="!lcText && type()">{{ placeholder }}</q-item>
-  </q-select>
-</template>
-<script setup lang="ts">
-import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
-
-import { QSelect } from 'quasar'
-
-type Option = Record<string, any>
-
-interface AppQSelectProps {
-  modelValue: any
-  options: Option[]
-  placeholder: string
-  emptyText: string
-  optionLabel?: string
-  optionValue?: string
-  label?: string
-  multiple?: boolean
-  borderColor: string
-  isDisabled?: boolean
-  clearable?: boolean
-  search?: boolean
-}
-
-const props = defineProps<AppQSelectProps>()
-const select = ref({})
-const emit = defineEmits(['update:modelValue'])
-const selected = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
-})
-
-const type = () => {
-  if (Array.isArray(selected.value) && !selected.value.length) return true
-  return typeof selected.value === 'string' && !selected.value
-}
-
-const lcText: Ref<string> = ref('')
-const filteredOptions = computed(() => {
-  return props.options.filter(x => x[props?.optionLabel || 'label'].toLowerCase().includes(lcText.value))
-})
-
-function filterFn(val: string, update: (arg0: () => void) => void) {
-  update(() => {
-    lcText.value = val.toLowerCase()
-  })
-}
-</script>
-<style module lang="scss">
-.wrap {
-  position: relative;
-
-  &:global(.--option-tree) {
-    cursor: pointer;
-  }
-}
-
-.select {
-  &:global(.q-field--outlined.q-field--rounded .q-field__control) {
-    border-radius: 14px;
-  }
-  &:global(.q-field--outlined .q-field__control:before) {
-    border-color: v-bind(borderColor);
-  }
-  &:global(.q-select .q-field__input) {
-    padding: 0 6px;
-  }
-  //&:global(.q-field--filled .q-field__control) {
-  //  //color: red;
-  //}
-  //&:global(.q-field--filled.q-field--focused .q-field__control) {
-  //}
-  //&:global(.q-field--filled .q-field__control:after) {
-  //  left: 8px;
-  //  right: 8px;
-  //}
-  &:global(.q-field--outlined .q-item) {
-    color: #1d1d1d;
-    position: absolute;
-    padding: 0 4px;
-    top: 18px;
-    left: 0;
-  }
-}
-
-.append-wrapper {
-  display: flex;
-  align-items: center;
-  column-gap: 4px;
-}
-
-.menu-wrap {
-  padding: 8px;
-}
-
-.search-wrapper {
-  position: sticky;
-  top: 0;
-  padding: 4px;
-  background: var(--main-bg);
-  z-index: 1;
-}
-.app-select__menu {
-  border-radius: 14px;
-  .q-item__label {
-    word-break: break-word;
-  }
-  &:global(.q-menu) {
-    max-height: 200px !important;
-  }
-}
-</style>
+<template>
+  <q-select
+    ref="select"
+    v-model="selected"
+    :options="filteredOptions"
+    :option-value="optionValue"
+    :option-label="optionLabel"
+    emit-value
+    map-options
+    :disable="isDisabled"
+    :multiple="multiple"
+    outlined
+    stack-label
+    :use-input="search"
+    :class="[$style.select]"
+    :label="label"
+    input-debounce="100"
+    :popup-content-class="$style['app-select__menu']"
+    :clearable="clearable"
+    rounded
+    autocomplete=""
+    @filter="filterFn"
+  >
+    <template v-if="multiple" #selected-item="scope">
+      <q-chip
+        v-if="scope.opt"
+        removable
+        class="q-ma-none"
+        dense
+        :tabindex="scope.tabindex"
+        color="white"
+        text-color="secondary"
+        @remove="scope.removeAtIndex(scope.index)"
+      >
+        {{ scope.opt[`${optionLabel}`] }}
+      </q-chip>
+    </template>
+    <template #no-option>
+      <q-item>{{ emptyText }}</q-item>
+    </template>
+    <q-item v-if="!lcText && type()">{{ placeholder }}</q-item>
+  </q-select>
+</template>
+<script setup lang="ts">
+import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
+
+import { QSelect } from 'quasar'
+
+type Option = Record<string, any>
+
+interface AppQSelectProps {
+  modelValue: any
+  options: Option[]
+  placeholder: string
+  emptyText: string
+  optionLabel?: string
+  optionValue?: string
+  label?: string
+  multiple?: boolean
+  borderColor: string
+  isDisabled?: boolean
+  clearable?: boolean
+  search?: boolean
+}
+
+const props = defineProps<AppQSelectProps>()
+const select = ref({})
+const emit = defineEmits(['update:modelValue'])
+const selected = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+
+const type = () => {
+  if (Array.isArray(selected.value) && !selected.value.length) return true
+  return typeof selected.value === 'string' && !selected.value
+}
+
+const lcText: Ref<string> = ref('')
+const filteredOptions = computed(() => {
+  return props.options.filter(x => x[props?.optionLabel || 'label'].toLowerCase().includes(lcText.value))
+})
+
+function filterFn(val: string, update: (arg0: () => void) => void) {
+  update(() => {
+    lcText.value = val.toLowerCase()
+  })
+}
+</script>
+<style module lang="scss">
+.wrap {
+  position: relative;
+
+  &:global(.--option-tree) {
+    cursor: pointer;
+  }
+}
+
+.select {
+  &:global(.q-field--outlined.q-field--rounded .q-field__control) {
+    border-radius: 14px;
+  }
+  &:global(.q-field--outlined .q-field__control:before) {
+    border-color: v-bind(borderColor);
+  }
+  &:global(.q-select .q-field__input) {
+    padding: 0 6px;
+  }
+  //&:global(.q-field--filled .q-field__control) {
+  //  //color: red;
+  //}
+  //&:global(.q-field--filled.q-field--focused .q-field__control) {
+  //}
+  //&:global(.q-field--filled .q-field__control:after) {
+  //  left: 8px;
+  //  right: 8px;
+  //}
+  &:global(.q-field--outlined .q-item) {
+    color: #1d1d1d;
+    position: absolute;
+    padding: 0 4px;
+    top: 18px;
+    left: 0;
+  }
+}
+
+.append-wrapper {
+  display: flex;
+  align-items: center;
+  column-gap: 4px;
+}
+
+.menu-wrap {
+  padding: 8px;
+}
+
+.search-wrapper {
+  position: sticky;
+  top: 0;
+  padding: 4px;
+  background: var(--main-bg);
+  z-index: 1;
+}
+.app-select__menu {
+  border-radius: 14px;
+  .q-item__label {
+    word-break: break-word;
+  }
+  &:global(.q-menu) {
+    max-height: 200px !important;
+  }
+}
+</style>