aloha-vue 1.2.38 → 1.2.39

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.38",
+  "version": "1.2.39",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/ATable/ATable.js

@@ -501,27 +501,30 @@ export default {
       tableGrandparentRef,
     });
 
+    const {
+      hasViews,
+      initViewCurrent,
+      isViewTableVisible,
+      updateViewCurrent,
+      viewCurrent,
+    } = ViewsAPI(props, context, {
+      closePreviewAll,
+      startSearch: () => ({}), // TODO: in AFilters
+    });
+
     const {
       changeOffset,
       changeLimit,
+      usePaginationLocal,
     } = LimitOffsetAPI(props, context, {
       closePreviewAll,
+      isViewTableVisible,
       limit,
       offset,
       scrollToTable,
       setEmptySelectedRowsIndexes,
       setFocusToTable,
-    });
-
-    const {
-      hasViews,
-      initViewCurrent,
-      isViewTableVisible,
-      updateViewCurrent,
       viewCurrent,
-    } = ViewsAPI(props, context, {
-      closePreviewAll,
-      startSearch: () => ({}), // TODO: in AFilters
     });
 
     const {
@@ -628,6 +631,7 @@ export default {
       togglePreviewResize,
       updateRow,
       updateViewCurrent,
+      usePaginationLocal,
       viewCurrent,
     };
   },
@@ -824,7 +828,7 @@ export default {
         this.$slots[this.viewCurrent.type]({
           rows: this.rowsLocalAll,
         }),
-        (this.isViewTableVisible && this.pagination.use) &&
+        (this.usePaginationLocal) &&
         h(APagination, {
           countAllRows: this.countAllRowsLocal,
           disabled: this.pagination.disabled,

package/src/ATable/compositionAPI/LimitOffsetAPI.js

@@ -1,4 +1,5 @@
 import {
+  computed,
   ref,
   toRef,
 } from "vue";
@@ -9,13 +10,25 @@ import {
 
 export default function LimitOffsetAPI(props, { emit }, {
   closePreviewAll = () => {},
+  isViewTableVisible = computed(() => true),
   limit = ref(0),
   offset = ref(0),
   scrollToTable = () => {},
   setEmptySelectedRowsIndexes = () => {},
   setFocusToTable = () => {},
+  viewCurrent = computed(() => ({})),
 }) {
   const offsetStart = toRef(props, "offsetStart");
+  const pagination = toRef(props, "pagination");
+
+  const usePaginationLocal = computed(() => {
+    if (pagination.value?.use) {
+      if (isViewTableVisible.value || viewCurrent.value.usePagination) {
+        return true;
+      }
+    }
+    return false;
+  });
 
   const changeOffset = _offset => {
     let offsetLocal;
@@ -58,5 +71,6 @@ export default function LimitOffsetAPI(props, { emit }, {
   return {
     changeOffset,
     changeLimit,
+    usePaginationLocal,
   };
 }