shared-ritm 1.1.91 → 1.1.92

package/package.json

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

package/src/common/app-dialogs/AppConfirmDialog.vue

@@ -1,100 +1,100 @@
-<template>
-  <q-dialog ref="dialogRef" persistent transition-show="slide-up" transition-hide="slide-down" :class="$style.dialog">
-    <q-card :class="$style.modal">
-      <q-card-section :class="$style['modal__content']">
-        <div :class="$style['modal__content__header']">
-          <safety-icon v-if="type === 'edit'" />
-          <remove-icon v-if="type === 'delete'" />
-          <h4>Подтвердить ?</h4>
-        </div>
-        <p>{{ content }}</p>
-      </q-card-section>
-      <q-card-section :class="$style.footer">
-        <app-button :class="$style['footer__btn--ok']" label="Подтвердить" @click="onDialogOK" />
-        <app-button :class="$style['footer__btn--cancel']" label="Отменить" @click="onDialogHide" />
-      </q-card-section>
-    </q-card>
-  </q-dialog>
-</template>
-
-<script setup lang="ts">
-import { useDialogPluginComponent } from 'quasar'
-import AppButton from '@/common/app-button/AppButton.vue'
-import SafetyIcon from '@/icons/dialogs/SafetyIcon.vue'
-import RemoveIcon from '@/icons/dialogs/RemoveIcon.vue'
-
-const { onDialogHide, onDialogOK, dialogRef } = useDialogPluginComponent()
-
-interface Props {
-  content: string
-  type: 'delete' | 'edit'
-}
-
-const props = defineProps<Props>()
-</script>
-
-<style lang="scss" module>
-.modal {
-  font-family: NunitoSansFont, sans-serif;
-  display: flex;
-  flex-direction: column;
-  width: 400px;
-  border-radius: 24px !important;
-  justify-content: space-between;
-  padding: 40px;
-  &__content {
-    margin: 0 auto;
-    padding: 0;
-    flex-grow: 1;
-    &__header {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      gap: 16px;
-      h4 {
-        font-size: 24px;
-        font-weight: 600;
-      }
-    }
-  }
-  p {
-    margin-top: 14px;
-    margin-bottom: 30px;
-    font-size: 16px;
-    text-align: center;
-  }
-}
-
-.footer {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  align-items: center;
-  justify-content: center;
-  //height: 146px;
-  padding: 0;
-  &__btn--ok,
-  &__btn--cancel {
-    background-color: #3f8cff;
-    border-radius: 9px;
-    color: white;
-    font-size: 16px;
-    font-weight: bold;
-    width: 300px;
-    height: 48px;
-    cursor: pointer;
-    span {
-      color: white;
-    }
-  }
-  &__btn--cancel {
-    background-color: white;
-    border: 1px solid #3f8cff;
-    span {
-      color: #3f8cff;
-    }
-  }
-}
-</style>
+<template>
+  <q-dialog ref="dialogRef" persistent transition-show="slide-up" transition-hide="slide-down" :class="$style.dialog">
+    <q-card :class="$style.modal">
+      <q-card-section :class="$style['modal__content']">
+        <div :class="$style['modal__content__header']">
+          <safety-icon v-if="type === 'edit'" />
+          <remove-icon v-if="type === 'delete'" />
+          <h4>Подтвердить ?</h4>
+        </div>
+        <p>{{ content }}</p>
+      </q-card-section>
+      <q-card-section :class="$style.footer">
+        <app-button :class="$style['footer__btn--ok']" label="Подтвердить" @click="onDialogOK" />
+        <app-button :class="$style['footer__btn--cancel']" label="Отменить" @click="onDialogHide" />
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { useDialogPluginComponent } from 'quasar'
+import AppButton from '@/common/app-button/AppButton.vue'
+import SafetyIcon from '@/icons/dialogs/SafetyIcon.vue'
+import RemoveIcon from '@/icons/dialogs/RemoveIcon.vue'
+
+const { onDialogHide, onDialogOK, dialogRef } = useDialogPluginComponent()
+
+interface Props {
+  content: string
+  type: 'delete' | 'edit'
+}
+
+const props = defineProps<Props>()
+</script>
+
+<style lang="scss" module>
+.modal {
+  font-family: NunitoSansFont, sans-serif;
+  display: flex;
+  flex-direction: column;
+  width: 400px;
+  border-radius: 24px !important;
+  justify-content: space-between;
+  padding: 40px;
+  &__content {
+    margin: 0 auto;
+    padding: 0;
+    flex-grow: 1;
+    &__header {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      gap: 16px;
+      h4 {
+        font-size: 24px;
+        font-weight: 600;
+      }
+    }
+  }
+  p {
+    margin-top: 14px;
+    margin-bottom: 30px;
+    font-size: 16px;
+    text-align: center;
+  }
+}
+
+.footer {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  align-items: center;
+  justify-content: center;
+  //height: 146px;
+  padding: 0;
+  &__btn--ok,
+  &__btn--cancel {
+    background-color: #3f8cff;
+    border-radius: 9px;
+    color: white;
+    font-size: 16px;
+    font-weight: bold;
+    width: 300px;
+    height: 48px;
+    cursor: pointer;
+    span {
+      color: white;
+    }
+  }
+  &__btn--cancel {
+    background-color: white;
+    border: 1px solid #3f8cff;
+    span {
+      color: #3f8cff;
+    }
+  }
+}
+</style>

package/src/common/app-sheet/AppSheet.vue

@@ -1,149 +1,120 @@
-<template>
-  <q-dialog
-    v-model="internalModel"
-    :auto-focus="false"
-    :focus-trap="false"
-    :position="position"
-    :persistent="persistent"
-    :class="customClass"
-    full-width
-    full-height
-    no-shake
-    no-esc-dismiss
-  >
-    <template v-if="type === 'details' && ready">
-      <q-card>
-        <div class="wrapper">
-          <div class="sheet-header">
-            <h2>{{ title }}</h2>
-            <div class="close-button">
-              <q-btn v-close-popup dense flat icon="close" />
-            </div>
-          </div>
-          <div v-if="loading" class="loader">
-            <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
-          </div>
-          <slot v-else />
-        </div>
-      </q-card>
-    </template>
-    <template v-if="type === 'custom' && ready">
-      <div v-if="loading" class="custom-wrapper">
-        <div class="loader">
-          <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
-        </div>
-      </div>
-      <slot v-else />
-    </template>
-  </q-dialog>
-</template>
-
-<script setup lang="ts">
-import { computed, defineEmits, defineProps, ref, watch, withDefaults } from 'vue'
-
-interface DialogProps {
-  modelValue: boolean
-  position?: string
-  persistent?: boolean
-  customClass?: string
-  dialogRef: any
-  loading?: boolean
-  title?: string
-  width?: string
-  type?: 'details' | 'custom'
-  tabs?: any[]
-  currentTabName?: string
-}
-
-const props = withDefaults(defineProps<DialogProps>(), {
-  title: '',
-  position: 'right',
-  width: '976px',
-  type: 'details',
-  loading: false,
-  tabs: () => [],
-  currentTabName: '',
-})
-
-const emit = defineEmits(['update:dialogRef', 'update:currentTabName', 'update:modelValue'])
-
-const DialogRef = computed({
-  get() {
-    return props.dialogRef
-  },
-  set(value) {
-    emit('update:dialogRef', value)
-  },
-})
-
-const internalModel = ref(props.modelValue)
-const ready = ref(false)
-
-watch(
-  () => props.modelValue,
-  val => {
-    internalModel.value = val
-    if (val) {
-      // отложенный рендер слота после открытия
-      setTimeout(() => {
-        ready.value = true
-      }, 50)
-    } else {
-      ready.value = false
-    }
-  },
-)
-
-watch(internalModel, val => {
-  emit('update:modelValue', val)
-})
-</script>
-
-<style lang="scss" scoped>
-.custom-wrapper {
-  width: v-bind(width);
-  background-color: white;
-}
-
-.wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  width: v-bind(width);
-  height: 100vh;
-  min-height: 100vh;
-  position: relative;
-  padding: 2rem 2rem 4rem 2rem;
-  background-color: #7991ad32;
-  font-family: 'NunitoSansFont', sans-serif;
-}
-
-.sheet-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  h2 {
-    font-size: 36px;
-  }
-}
-
-.loader {
-  min-width: 976px;
-
-  &-spinner {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    z-index: 4;
-  }
-}
-</style>
-
-<style lang="scss" module>
-.sheet-dialog {
-  :global(.q-dialog__inner--minimized) {
-    padding: 0;
-  }
-}
-</style>
+<template>
+  <q-dialog
+    ref="DialogRef"
+    :model-value="true"
+    :position="'right'"
+    :class="$style['sheet-dialog']"
+    no-shake
+    no-esc-dismiss
+    full-height
+    full-width
+  >
+    <template v-if="type === 'details'">
+      <q-card>
+        <div class="wrapper">
+          <div class="sheet-header">
+            <h2>{{ title }}</h2>
+            <div class="close-button">
+              <q-btn v-close-popup dense flat icon="close" />
+            </div>
+          </div>
+          <div v-if="loading" class="loader">
+            <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
+          </div>
+          <slot v-else />
+        </div>
+      </q-card>
+    </template>
+    <template v-if="type === 'custom'">
+      <div v-if="loading" class="custom-wrapper">
+        <div class="loader">
+          <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
+        </div>
+      </div>
+      <slot v-else />
+    </template>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { computed, defineEmits, defineProps, withDefaults } from 'vue'
+
+interface DialogProps {
+  dialogRef: any
+  loading?: boolean
+  title?: string
+  width?: string
+  type?: 'details' | 'custom'
+  tabs?: any[]
+  currentTabName?: string
+}
+
+const props = withDefaults(defineProps<DialogProps>(), {
+  title: '',
+  width: '976px',
+  type: 'details',
+  loading: false,
+  tabs: () => [],
+  currentTabName: '',
+})
+
+const emit = defineEmits(['update:dialogRef', 'update:currentTabName'])
+
+const DialogRef = computed({
+  get() {
+    return props.dialogRef
+  },
+  set(value) {
+    emit('update:dialogRef', value)
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.custom-wrapper {
+  width: v-bind(width);
+  background-color: white;
+}
+
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  width: v-bind(width);
+  height: 100vh;
+  min-height: 100vh;
+  position: relative;
+  padding: 2rem 2rem 4rem 2rem;
+  background-color: #7991ad32;
+  font-family: 'NunitoSansFont', sans-serif;
+}
+
+.sheet-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  h2 {
+    font-size: 36px;
+  }
+}
+
+.loader {
+  min-width: 976px;
+
+  &-spinner {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 4;
+  }
+}
+</style>
+
+<style lang="scss" module>
+.sheet-dialog {
+  :global(.q-dialog__inner--minimized) {
+    padding: 0;
+  }
+}
+</style>