shared-ritm 1.2.15 → 1.2.17

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ import AppInput from '@/common/app-input/AppInput.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';
+import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue';
 import AppLoader from '@/common/app-loader/index.vue';
 import AppSelect from '@/common/app-select/AppSelect.vue';
 import AppSheet from '@/common/app-sheet/AppSheet.vue';
@@ -22,7 +23,7 @@ import useTasksService from '@/api/services/TasksService';
 import useAuthService from '@/api/services/AuthService';
 import useFileService from '@/api/services/FileService';
 import ApiService from '@/api/settings/ApiService';
-export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, };
+export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, };
 export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, };
 export type { NotificationType } from './utils/notification';
 export { notificationSettings } from './utils/notification';

package/package.json

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

package/src/App.vue

@@ -6,20 +6,29 @@
     <template #drawer>
       <app-sidebar :is-drawer="true" :menu-items="menuItems" :is-route-active="isRouteActive" />
     </template>
-    <div class="wrapper">
-      <app-button
-        label="asad"
-        color="primary"
-        @click="
-          openConfirm(
-            'После подтверждения проект ремонта, проект подготовки сотрудников и проект подготовки МТР будут перенесены в текущие проекты',
-            'delete',
-          )
-        "
-      />
-      <app-input v-model="test" type="text" />
-      <app-date-picker v-model="dateStart" view="standard" :disabled="isDisabled" label="Прогнозируемая дата старта" />
-    </div>
+    <template #content>
+      <app-layout-page>
+        <div class="wrapper">
+          <app-button
+            label="asad"
+            color="primary"
+            @click="
+              openConfirm(
+                'После подтверждения проект ремонта, проект подготовки сотрудников и проект подготовки МТР будут перенесены в текущие проекты',
+                'delete',
+              )
+            "
+          />
+          <app-input v-model="test" type="text" />
+          <app-date-picker
+            v-model="dateStart"
+            view="standard"
+            :disabled="isDisabled"
+            label="Прогнозируемая дата старта"
+          />
+        </div>
+      </app-layout-page>
+    </template>
   </app-layout>
 </template>
 
@@ -33,6 +42,7 @@ import AppLayout from '@/common/app-layout/AppLayout.vue'
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
 import { useRoute } from 'vue-router'
 import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
+import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue'
 const test = ref('sdf')
 
 const $q = useQuasar()
@@ -2439,7 +2449,7 @@ const openConfirm = (content: string, type: 'delete' | 'edit') => {
 </script>
 <style lang="scss">
 .wrapper {
-  max-width: 1300px;
+  width: 100%;
   margin: 0 auto;
 }
 </style>

package/src/common/app-layout/AppLayout.vue

@@ -7,11 +7,7 @@
     <slot name="drawer"></slot>
     <slot name="header"></slot>
     <q-page-container :class="{ container: container }" @wheel="mouseMove">
-      <q-page>
-        <slot></slot>
-
-        <slot name="page-bottom"></slot>
-      </q-page>
+      <slot name="content"></slot>
     </q-page-container>
 
     <slot name="footer"></slot>

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

@@ -0,0 +1,32 @@
+<template>
+  <q-page class="page-container" :style="marginLeft">
+    <slot />
+  </q-page>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref, onBeforeUnmount } from 'vue'
+
+const hasPaddingLeft = ref(false)
+
+const marginLeft = computed(() => {
+  return hasPaddingLeft.value ? { 'margin-left': '0px' } : { 'margin-left': '72px' }
+})
+
+function checkPaddingLeft() {
+  const el = document.querySelector('.q-page-container') as HTMLElement | null
+  if (el) {
+    const observer = new ResizeObserver(() => {
+      hasPaddingLeft.value = window.getComputedStyle(el).paddingLeft !== '0px'
+    })
+    observer.observe(el)
+    onBeforeUnmount(() => observer.disconnect())
+  }
+}
+
+onMounted(() => {
+  checkPaddingLeft()
+})
+</script>
+
+<style scoped lang="scss"></style>

package/src/index.ts

@@ -1,62 +1,64 @@
-import '@/shared/styles/general.css'
-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 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'
-import AppLoader from '@/common/app-loader/index.vue'
-import AppSelect from '@/common/app-select/AppSelect.vue'
-import AppSheet from '@/common/app-sheet/AppSheet.vue'
-import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
-import AppToggle from '@/common/app-toggle/AppToggle.vue'
-import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
-import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue'
-import AppDropdown from '@/common/app-dropdown/AppDropdown.vue'
-
-import useGanttService from '@/api/services/GanttService'
-import useMetricsService from '@/api/services/MetricsService'
-import useProjectsService from '@/api/services/ProjectsService'
-import useRepairsService from '@/api/services/RepairsService'
-import useTasksService from '@/api/services/TasksService'
-import useAuthService from '@/api/services/AuthService'
-import useFileService from '@/api/services/FileService'
-import ApiService from '@/api/settings/ApiService'
-
-export {
-  AppButton,
-  AppCheckbox,
-  AppDatePicker,
-  AppInput,
-  AppInputSearch,
-  AppLayout,
-  AppLayoutHeader,
-  AppLoader,
-  AppSelect,
-  AppSheet,
-  AppSidebar,
-  AppToggle,
-  AppWrapper,
-  AppConfirmDialog,
-  AppDropdown,
-}
-
-export {
-  ApiService,
-  useAuthService,
-  useGanttService,
-  useMetricsService,
-  useProjectsService,
-  useRepairsService,
-  useTasksService,
-  useFileService,
-}
-
-export type { NotificationType } from './utils/notification'
-export { notificationSettings } from './utils/notification'
-
-export * from './api/types/Api_Tasks'
-export * from './api/types/Api_Repairs'
-export * from './api/types/Api_Projects'
-// export * from '@/api/types/Api_Metrics'
+import '@/shared/styles/general.css'
+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 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'
+import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue'
+import AppLoader from '@/common/app-loader/index.vue'
+import AppSelect from '@/common/app-select/AppSelect.vue'
+import AppSheet from '@/common/app-sheet/AppSheet.vue'
+import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
+import AppToggle from '@/common/app-toggle/AppToggle.vue'
+import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
+import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue'
+import AppDropdown from '@/common/app-dropdown/AppDropdown.vue'
+
+import useGanttService from '@/api/services/GanttService'
+import useMetricsService from '@/api/services/MetricsService'
+import useProjectsService from '@/api/services/ProjectsService'
+import useRepairsService from '@/api/services/RepairsService'
+import useTasksService from '@/api/services/TasksService'
+import useAuthService from '@/api/services/AuthService'
+import useFileService from '@/api/services/FileService'
+import ApiService from '@/api/settings/ApiService'
+
+export {
+  AppButton,
+  AppCheckbox,
+  AppDatePicker,
+  AppInput,
+  AppInputSearch,
+  AppLayout,
+  AppLayoutHeader,
+  AppLayoutPage,
+  AppLoader,
+  AppSelect,
+  AppSheet,
+  AppSidebar,
+  AppToggle,
+  AppWrapper,
+  AppConfirmDialog,
+  AppDropdown,
+}
+
+export {
+  ApiService,
+  useAuthService,
+  useGanttService,
+  useMetricsService,
+  useProjectsService,
+  useRepairsService,
+  useTasksService,
+  useFileService,
+}
+
+export type { NotificationType } from './utils/notification'
+export { notificationSettings } from './utils/notification'
+
+export * from './api/types/Api_Tasks'
+export * from './api/types/Api_Repairs'
+export * from './api/types/Api_Projects'
+// export * from '@/api/types/Api_Metrics'