shared-ritm 1.2.88 → 1.2.90

package/package.json

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

package/src/common/app-sheet-new/AppSheetNew.vue

@@ -1,22 +1,20 @@
 <template>
   <q-dialog
-    ref="DialogRef"
-    :model-value="true"
+    :model-value="modelValue"
     :position="'right'"
     :class="$style['sheet-dialog']"
     :persistent="persistent"
     no-shake
     no-esc-dismiss
     full-height
-    full-width
-    @before-hide="emit('before-hide')"
+    @update:model-value="emit('update:modelValue', $event)"
   >
-    <div v-if="loading" class="custom-wrapper">
+    <div v-if="loading" class="custom-wrapper" :style="{ width }">
       <div class="loader">
         <q-spinner-audio v-if="loading" class="loader-spinner" size="md" :thickness="3" color="primary" />
       </div>
     </div>
-    <div v-else class="wrapper">
+    <div v-else class="wrapper" :style="{ width }">
       <div v-if="tabs?.length" class="sidebar" :class="{ noTitle: !tabsTitle }" :style="{ width: sidebarWidth }">
         <h5 v-if="tabsTitle">{{ tabsTitle }}</h5>
         <q-tabs
@@ -57,11 +55,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineEmits, defineProps, Ref, useSlots, withDefaults } from 'vue'
+import { computed, defineEmits, defineProps, useSlots, withDefaults } from 'vue'
 import { QDialog } from 'quasar'
 
 interface DialogProps {
-  dialogRef: Ref<QDialog | undefined, QDialog | undefined>
+  modelValue: boolean
   loading?: boolean
   title?: string
   tabsTitle?: string
@@ -74,6 +72,7 @@ interface DialogProps {
 }
 
 const props = withDefaults(defineProps<DialogProps>(), {
+  modelValue: false,
   title: '',
   tabsTitle: '',
   width: '1200px',
@@ -85,19 +84,10 @@ const props = withDefaults(defineProps<DialogProps>(), {
   persistent: false,
 })
 
-const emit = defineEmits(['update:dialogRef', 'update:tabId', 'close', 'before-hide'])
+const emit = defineEmits(['update:modelValue', 'update:tabId', 'close', 'before-hide'])
 
 const slots = useSlots()
 
-const DialogRef = computed({
-  get() {
-    return props.dialogRef
-  },
-  set(value) {
-    emit('update:dialogRef', value)
-  },
-})
-
 const currTabId = computed({
   get() {
     return props.tabs?.find(t => t.id === props.tabId)?.title
@@ -111,7 +101,7 @@ const currTabId = computed({
 
 <style lang="scss" scoped>
 .custom-wrapper {
-  width: v-bind(width);
+  max-width: unset;
   background-color: white;
 }
 
@@ -131,6 +121,7 @@ const currTabId = computed({
   overflow: hidden;
   font-family: 'NunitoSansFont', sans-serif;
   color: #3f414d;
+  max-width: unset;
 }
 
 .sidebar {
@@ -193,7 +184,6 @@ const currTabId = computed({
 <style lang="scss" module>
 .sheet-dialog {
   :global(.q-dialog__inner) {
-    width: v-bind(width);
     max-width: 95vw;
   }
 

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

@@ -29,7 +29,11 @@
       </template>
 
       <template v-for="col in resCols" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
-        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }">
+        <q-th
+          :props="propsSlot"
+          :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }"
+          :style="col.style"
+        >
           <div
             v-if="col.filterType"
             class="row items-center no-wrap"

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 },
   )