shared-ritm 1.2.97 → 1.2.99

package/src/common/app-sidebar/components/SidebarMenuItem.vue

@@ -1,148 +1,148 @@
-<template>
-  <q-expansion-item
-    v-if="item.items"
-    :model-value="isRouteActive(item) && expand"
-    header-class="text-purple"
-    :class="[$style['menu-item'], { 'expansion-item-active': isRouteActive(item) && minify }]"
-    :data-test="`sidebar-expansion-item-${(item.name || 'unnamed').toLowerCase().replace(/\s+/g, '-')}`"
-    @update:model-value="expand = $event"
-  >
-    <template #header>
-      <q-tooltip
-        v-if="minify"
-        :delay="100"
-        transition-show="jump-right"
-        transition-hide="jump-left"
-        anchor="center right"
-        self="center left"
-      >
-        {{ item.label }}
-      </q-tooltip>
-
-      <q-item-section v-if="item.icon" avatar>
-        <app-icon :name="item.icon" color="white" size="24px" />
-      </q-item-section>
-
-      <q-item-section :class="$style['menu-item__label']">{{ item.label }}</q-item-section>
-    </template>
-
-    <sidebar-menu-item
-      v-for="(subItem, index) in item.items"
-      :key="index"
-      :item="subItem"
-      :main="main"
-      :is-route-active="isRouteActive"
-    />
-  </q-expansion-item>
-  <q-item
-    v-else-if="item.name !== 'sign-out'"
-    v-ripple
-    :class="$style['menu-item']"
-    :active="isRouteActive(item)"
-    active-class="menu-active"
-    clickable
-    :to="main ? item.to : ''"
-    :data-test="`sidebar-item-${item.name.toLowerCase().replace(/\s+/g, '-')}`"
-    @click="goToRoute(item.to)"
-  >
-    <q-item-section v-if="item.icon" avatar>
-      <app-icon :name="item.icon" color="white" size="24px" />
-    </q-item-section>
-
-    <q-item-section :class="$style['menu-item__label']">
-      <p>{{ item.label }}</p>
-    </q-item-section>
-    <q-tooltip
-      :delay="100"
-      transition-show="jump-right"
-      transition-hide="jump-left"
-      anchor="center right"
-      self="center left"
-    >
-      {{ item.label }}
-    </q-tooltip>
-  </q-item>
-</template>
-
-<script lang="ts" setup>
-import { defineProps, ref } from 'vue'
-import AppIcon from '@/common/app-icon/AppIcon.vue'
-
-interface Props {
-  minify?: boolean
-  main: boolean
-  isRouteActive: (item: any) => boolean
-  item: {
-    name: string
-    label: string
-    icon: string
-    href: string
-    to: string
-    items: any[]
-  }
-}
-
-const emits = defineEmits(['goToRoute'])
-const props = defineProps<Props>()
-
-const expand = ref(true)
-
-const goToRoute = (to: string) => {
-  if (!props.main) window.location.href = to
-}
-</script>
-
-<style lang="scss" scoped>
-.expansion-item-active {
-  background: rgba(243, 249, 253, 0.1);
-  border-radius: 10px;
-}
-</style>
-
-<style lang="scss" module>
-.menu-item {
-  margin: 0 8px;
-  &:global(.menu-active) {
-    border-radius: 10px;
-    background: rgba(243, 249, 253, 0.1);
-  }
-  :global(.q-item__section--avatar) {
-    min-width: 24px;
-    padding-right: 14px;
-  }
-
-  :global(.q-expansion-item__content .q-item) {
-    padding-left: 20px;
-  }
-  :global(.q-item__section--main ~ .q-item__section--side) {
-    color: white;
-  }
-  &__label {
-    color: #fff;
-    font-family: 'Nunito Sans', sans-serif;
-    font-size: 16px;
-    font-weight: 300;
-    p {
-      display: inline-block;
-      max-width: 160px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      margin: 0;
-    }
-  }
-}
-
-@media (max-width: 1440px) {
-  .menu-item {
-    margin: 0 4px;
-    :global(.q-item__section--avatar) {
-      min-width: 24px;
-      padding-right: 10px;
-    }
-    &__label {
-      font-size: 14px;
-    }
-  }
-}
-</style>
+<template>
+  <q-expansion-item
+    v-if="item.items"
+    :model-value="isRouteActive(item) && expand"
+    header-class="text-purple"
+    :class="[$style['menu-item'], { 'expansion-item-active': isRouteActive(item) && minify }]"
+    :data-test="`sidebar-expansion-item-${(item.name || 'unnamed').toLowerCase().replace(/\s+/g, '-')}`"
+    @update:model-value="expand = $event"
+  >
+    <template #header>
+      <q-tooltip
+        v-if="minify"
+        :delay="100"
+        transition-show="jump-right"
+        transition-hide="jump-left"
+        anchor="center right"
+        self="center left"
+      >
+        {{ item.label }}
+      </q-tooltip>
+
+      <q-item-section v-if="item.icon" avatar>
+        <app-icon :name="item.icon" color="white" size="24px" />
+      </q-item-section>
+
+      <q-item-section :class="$style['menu-item__label']">{{ item.label }}</q-item-section>
+    </template>
+
+    <sidebar-menu-item
+      v-for="(subItem, index) in item.items"
+      :key="index"
+      :item="subItem"
+      :main="main"
+      :is-route-active="isRouteActive"
+    />
+  </q-expansion-item>
+  <q-item
+    v-else-if="item.name !== 'sign-out'"
+    v-ripple
+    :class="$style['menu-item']"
+    :active="isRouteActive(item)"
+    active-class="menu-active"
+    clickable
+    :to="main ? item.to : ''"
+    :data-test="`sidebar-item-${item.name.toLowerCase().replace(/\s+/g, '-')}`"
+    @click="goToRoute(item.to)"
+  >
+    <q-item-section v-if="item.icon" avatar>
+      <app-icon :name="item.icon" color="white" size="24px" />
+    </q-item-section>
+
+    <q-item-section :class="$style['menu-item__label']">
+      <p>{{ item.label }}</p>
+    </q-item-section>
+    <q-tooltip
+      :delay="100"
+      transition-show="jump-right"
+      transition-hide="jump-left"
+      anchor="center right"
+      self="center left"
+    >
+      {{ item.label }}
+    </q-tooltip>
+  </q-item>
+</template>
+
+<script lang="ts" setup>
+import { defineProps, ref } from 'vue'
+import AppIcon from '@/common/app-icon/AppIcon.vue'
+
+interface Props {
+  minify?: boolean
+  main: boolean
+  isRouteActive: (item: any) => boolean
+  item: {
+    name: string
+    label: string
+    icon: string
+    href: string
+    to: string
+    items: any[]
+  }
+}
+
+const emits = defineEmits(['goToRoute'])
+const props = defineProps<Props>()
+
+const expand = ref(true)
+
+const goToRoute = (to: string) => {
+  if (!props.main) window.location.href = to
+}
+</script>
+
+<style lang="scss" scoped>
+.expansion-item-active {
+  background: rgba(243, 249, 253, 0.1);
+  border-radius: 10px;
+}
+</style>
+
+<style lang="scss" module>
+.menu-item {
+  margin: 0 8px;
+  &:global(.menu-active) {
+    border-radius: 10px;
+    background: rgba(243, 249, 253, 0.1);
+  }
+  :global(.q-item__section--avatar) {
+    min-width: 24px;
+    padding-right: 14px;
+  }
+
+  :global(.q-expansion-item__content .q-item) {
+    padding-left: 20px;
+  }
+  :global(.q-item__section--main ~ .q-item__section--side) {
+    color: white;
+  }
+  &__label {
+    color: #fff;
+    font-family: 'Nunito Sans', sans-serif;
+    font-size: 16px;
+    font-weight: 300;
+    p {
+      display: inline-block;
+      max-width: 160px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin: 0;
+    }
+  }
+}
+
+@media (max-width: 1440px) {
+  .menu-item {
+    margin: 0 4px;
+    :global(.q-item__section--avatar) {
+      min-width: 24px;
+      padding-right: 10px;
+    }
+    &__label {
+      font-size: 14px;
+    }
+  }
+}
+</style>

package/src/common/app-table/AppTable.vue

@@ -24,7 +24,7 @@
 
       <template #body-cell-index="cellProps">
         <q-td :props="cellProps" class="text-center" :class="{ 'q-td--no-hover': noHover }">
-          {{ getIndex(cellProps.rowIndex) }}
+          {{ cellProps.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
         </q-td>
       </template>
 
@@ -157,7 +157,6 @@ const props = defineProps<{
   meta: Ref<{ currentPage: number; perPage: number }>
   enableMultiSelect?: boolean
   noHover?: boolean
-  hidePagination?: boolean
   selectedRows: any[]
   actions?: string[]
   slots?: Slots
@@ -193,12 +192,6 @@ const rowClick = (e: Event, row: Record<string, any>) => {
   emit('row-click', row)
 }
 
-const getIndex = (rowIndex: number) => {
-  if (props.hidePagination) return rowIndex + 1
-
-  return rowIndex + 1 + (props.meta.value.currentPage - 1) * props.meta.value.perPage
-}
-
 watch(
   () => props.selectedRows,
   val => {

package/src/common/app-table/AppTableLayout.vue

@@ -17,7 +17,6 @@
         :selected-rows="props.selectedRows"
         :no-hover="noHover"
         :slots="slots"
-        :hide-pagination="hidePagination"
         v-on="props.tableEvents"
         @update:selectedRows="rows => emit('update:selectedRows', rows)"
       >
@@ -31,7 +30,7 @@
     </div>
 
     <app-table-pagination
-      v-if="!hidePagination && props.currentPage && props.totalPages"
+      v-if="!hidePagination"
       :model-value="props.currentPage"
       :total-pages="props.totalPages"
       @page-change="props.onPageChange"
@@ -49,10 +48,10 @@ import { defineProps, defineEmits, useSlots, computed } from 'vue'
 const props = defineProps<{
   search?: string
   loading?: boolean
-  currentPage?: number
-  totalPages?: number
+  currentPage: number
+  totalPages: number
   tableProps: any
-  tableEvents?: any
+  tableEvents: any
   onSearch?: (val: string) => void
   onPageChange?: (page: number) => void
   hideSearch?: boolean

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

@@ -1,152 +1,152 @@
-<template>
-  <div class="table-pagination">
-    <button class="arrow-button" :disabled="modelValue <= 1" @click="prevPage">
-      <q-icon name="mdi-chevron-left" :color="modelValue <= 1 ? 'grey-4' : 'primary'" />
-    </button>
-
-    <div class="pages">
-      <button
-        v-for="page in pageArray"
-        :key="page"
-        class="page-button"
-        :class="{ selected: page === modelValue, ellipsis: page === '...' }"
-        :disabled="page === modelValue || page === '...'"
-        @click="changePage(page)"
-      >
-        {{ page }}
-      </button>
-    </div>
-
-    <button class="arrow-button" :disabled="modelValue >= totalPages" @click="nextPage">
-      <q-icon name="mdi-chevron-right" :color="modelValue >= totalPages ? 'grey-4' : 'primary'" />
-    </button>
-  </div>
-</template>
-<script setup lang="ts">
-import { computed } from 'vue'
-import { defineProps, defineEmits } from 'vue'
-
-const props = defineProps<{
-  modelValue: number
-  totalPages: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: number): void
-  (e: 'page-change', value: number): void
-}>()
-
-const currentPage = computed({
-  get: () => props.modelValue,
-  set: (val: number) => {
-    emit('update:modelValue', val)
-    emit('page-change', val)
-  },
-})
-
-const pageArray = computed(() => {
-  const maxPagesToShow = 5
-  let startPage = 1
-  let endPage = props.totalPages
-  const pages: (number | string)[] = []
-
-  if (props.totalPages <= maxPagesToShow) {
-    for (let i = 1; i <= props.totalPages; i++) pages.push(i)
-  } else {
-    if (props.modelValue <= 3) {
-      startPage = 1
-      endPage = maxPagesToShow - 1
-    } else if (props.modelValue + 2 >= props.totalPages) {
-      startPage = props.totalPages - (maxPagesToShow - 2)
-      endPage = props.totalPages
-    } else {
-      startPage = props.modelValue - 2
-      endPage = props.modelValue + 2
-    }
-
-    for (let i = startPage; i <= endPage; i++) pages.push(i)
-
-    if (startPage > 1) {
-      pages.unshift('...')
-      pages.unshift(1)
-    }
-    if (endPage < props.totalPages) {
-      pages.push('...')
-      pages.push(props.totalPages)
-    }
-  }
-
-  return pages
-})
-
-function changePage(page: number | string) {
-  if (typeof page === 'number' && page !== props.modelValue) {
-    currentPage.value = page
-  }
-}
-
-function prevPage() {
-  if (props.modelValue > 1) currentPage.value = props.modelValue - 1
-}
-
-function nextPage() {
-  if (props.modelValue < props.totalPages) currentPage.value = props.modelValue + 1
-}
-</script>
-
-<style scoped lang="scss">
-.pages {
-  display: flex;
-  gap: 20px;
-}
-.table-pagination {
-  display: flex;
-  justify-content: start;
-  align-items: center;
-  gap: 20px;
-  flex-wrap: wrap;
-
-  .arrow-button,
-  .page-button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 34px;
-    height: 34px;
-    border-radius: 4px;
-    background: white;
-    border: none;
-    cursor: pointer;
-    font-weight: 500;
-    color: #3f8cff;
-    font-size: 16px;
-    transition: all 0.2s ease;
-  }
-
-  .page-button.selected {
-    background: #3f8cff;
-    color: white;
-    cursor: not-allowed;
-  }
-
-  .page-button.ellipsis {
-    cursor: default;
-    color: #aab2c8;
-    font-weight: 400;
-  }
-
-  .arrow-button:disabled {
-    cursor: not-allowed;
-    background: white;
-  }
-
-  @media (max-width: 768px) {
-    .arrow-button,
-    .page-button {
-      width: 32px;
-      height: 32px;
-      font-size: 14px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="table-pagination">
+    <button class="arrow-button" :disabled="modelValue <= 1" @click="prevPage">
+      <q-icon name="mdi-chevron-left" :color="modelValue <= 1 ? 'grey-4' : 'primary'" />
+    </button>
+
+    <div class="pages">
+      <button
+        v-for="page in pageArray"
+        :key="page"
+        class="page-button"
+        :class="{ selected: page === modelValue, ellipsis: page === '...' }"
+        :disabled="page === modelValue || page === '...'"
+        @click="changePage(page)"
+      >
+        {{ page }}
+      </button>
+    </div>
+
+    <button class="arrow-button" :disabled="modelValue >= totalPages" @click="nextPage">
+      <q-icon name="mdi-chevron-right" :color="modelValue >= totalPages ? 'grey-4' : 'primary'" />
+    </button>
+  </div>
+</template>
+<script setup lang="ts">
+import { computed } from 'vue'
+import { defineProps, defineEmits } from 'vue'
+
+const props = defineProps<{
+  modelValue: number
+  totalPages: number
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: number): void
+  (e: 'page-change', value: number): void
+}>()
+
+const currentPage = computed({
+  get: () => props.modelValue,
+  set: (val: number) => {
+    emit('update:modelValue', val)
+    emit('page-change', val)
+  },
+})
+
+const pageArray = computed(() => {
+  const maxPagesToShow = 5
+  let startPage = 1
+  let endPage = props.totalPages
+  const pages: (number | string)[] = []
+
+  if (props.totalPages <= maxPagesToShow) {
+    for (let i = 1; i <= props.totalPages; i++) pages.push(i)
+  } else {
+    if (props.modelValue <= 3) {
+      startPage = 1
+      endPage = maxPagesToShow - 1
+    } else if (props.modelValue + 2 >= props.totalPages) {
+      startPage = props.totalPages - (maxPagesToShow - 2)
+      endPage = props.totalPages
+    } else {
+      startPage = props.modelValue - 2
+      endPage = props.modelValue + 2
+    }
+
+    for (let i = startPage; i <= endPage; i++) pages.push(i)
+
+    if (startPage > 1) {
+      pages.unshift('...')
+      pages.unshift(1)
+    }
+    if (endPage < props.totalPages) {
+      pages.push('...')
+      pages.push(props.totalPages)
+    }
+  }
+
+  return pages
+})
+
+function changePage(page: number | string) {
+  if (typeof page === 'number' && page !== props.modelValue) {
+    currentPage.value = page
+  }
+}
+
+function prevPage() {
+  if (props.modelValue > 1) currentPage.value = props.modelValue - 1
+}
+
+function nextPage() {
+  if (props.modelValue < props.totalPages) currentPage.value = props.modelValue + 1
+}
+</script>
+
+<style scoped lang="scss">
+.pages {
+  display: flex;
+  gap: 20px;
+}
+.table-pagination {
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  gap: 20px;
+  flex-wrap: wrap;
+
+  .arrow-button,
+  .page-button {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 34px;
+    height: 34px;
+    border-radius: 4px;
+    background: white;
+    border: none;
+    cursor: pointer;
+    font-weight: 500;
+    color: #3f8cff;
+    font-size: 16px;
+    transition: all 0.2s ease;
+  }
+
+  .page-button.selected {
+    background: #3f8cff;
+    color: white;
+    cursor: not-allowed;
+  }
+
+  .page-button.ellipsis {
+    cursor: default;
+    color: #aab2c8;
+    font-weight: 400;
+  }
+
+  .arrow-button:disabled {
+    cursor: not-allowed;
+    background: white;
+  }
+
+  @media (max-width: 768px) {
+    .arrow-button,
+    .page-button {
+      width: 32px;
+      height: 32px;
+      font-size: 14px;
+    }
+  }
+}
+</style>