@fy-/fws-vue 0.8.0 → 0.8.2

package/components/ui/DefaultPaging.vue

@@ -11,7 +11,7 @@ import {
 import type { APIPaging } from "../../composables/rest";
 import { useEventBus } from "../../composables/event-bus";
 import { useServerRouter } from "../../stores/serverRouter";
-import { useRoute } from "vue-router";
+import { LocationQueryValue, RouteLocationRaw, useRoute } from "vue-router";
 import { useFyHead } from "@fy-/head";
 import { hasFW, getURL } from "@fy-/fws-js";
 
@@ -42,24 +42,35 @@ const next = () => {
   const page = props.items.page_no + 1;
 
   if (!isNewPage(page)) return;
-
+  const newQuery = { ...route.query };
+  newQuery.page = page.toString();
   history.push({
     path: history.currentRoute.path,
-    query: { page: page.toString(), ...route.query },
+    query: newQuery,
     hash: props.hash != "" ? props.hash : undefined,
   });
 };
 const prev = () => {
   const page = props.items.page_no - 1;
   if (!isNewPage(page)) return;
-
+  const newQuery = { ...route.query };
+  newQuery.page = page.toString();
   history.push({
     path: history.currentRoute.path,
-    query: { page: page.toString(), ...route.query },
+    query: newQuery,
     hash: props.hash != "" ? props.hash : undefined,
   });
 };
 
+const page = (page: number): RouteLocationRaw => {
+  const newQuery = { ...route.query };
+  newQuery.page = page.toString();
+  return {
+    path: history.currentRoute.path,
+    query: newQuery,
+    hash: props.hash != "" ? props.hash : undefined,
+  };
+};
 const currentUrl = computed(() => {
   /*
   const url = getURL();
@@ -154,9 +165,7 @@ useFyHead({
           <li v-if="items.page_no - 2 > 1">
             <router-link
               class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-              :to="
-                currentUrl + '1' + (props.hash != '' ? `#${props.hash}` : '')
-              "
+              :to="page(1)"
             >
               1
             </router-link>
@@ -176,11 +185,7 @@ useFyHead({
             >
               <router-link
                 class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-                :to="
-                  currentUrl +
-                  (items.page_no - (3 - i)) +
-                  (props.hash != '' ? `#${props.hash}` : '')
-                "
+                :to="page(items.page_no - (3 - i))"
               >
                 {{ items.page_no - (3 - i) }}
               </router-link>
@@ -201,11 +206,7 @@ useFyHead({
             >
               <router-link
                 class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-                :to="
-                  currentUrl +
-                  (items.page_no + i) +
-                  (props.hash != '' ? `#${props.hash}` : '')
-                "
+                :to="page(items.page_no + i)"
               >
                 {{ items.page_no + i }}
               </router-link>
@@ -221,11 +222,7 @@ useFyHead({
           <li v-if="items.page_no + 2 < items.page_max">
             <router-link
               class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-              :to="
-                currentUrl +
-                items.page_max +
-                (props.hash != '' ? `#${props.hash}` : '')
-              "
+              :to="page(items.page_max)"
             >
               {{ items.page_max }}
             </router-link>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {