edvoyui-component-library-test-flight 0.0.231 → 0.0.233

package/dist/components/table/UTable.vue

@@ -279,18 +279,17 @@
           <slot
             name="tableCount"
             :currentPage="newCurrentPage"
-            :from="newCurrentPage * limit + 1"
-            :to="(newCurrentPage + 1) * limit"
+            :from="rangeFrom"
+            :to="rangeTo"
           >
-            <div class="inline-flex items-center gap-x-10">
-              <div class="text-sm font-normal text-gray-900">
-                {{ newCurrentPage * limit + 1 }} -
-                {{ (newCurrentPage + 1) * limit }} of {{ total }}
+            <div class="inline-flex items-center self-stretch gap-x-3">
+              <div class="text-sm font-normal text-gray-600">
+                {{ rangeFrom }} - {{ rangeTo }} of {{ total }}
               </div>
-              <div class="inline-flex items-center gap-2">
-                <span class="text-sm font-normal text-gray-900"
-                  >Result per page</span
-                >
+              <div class="self-stretch w-px h-4 my-auto bg-gray-300"></div>
+              <div class="inline-flex items-center gap-0">
+                <span class="text-sm font-normal text-gray-600"
+                  > Items per page:</span>
                 <EUIPageLimit
                   :page-limit="limit"
                   @update-limit="changeLimit($event)"
@@ -418,6 +417,12 @@ const newCheckedRows = ref([...checkedRows.value]);
 const newCurrentPage = ref(currentPage.value);
 const limit = ref(props.perPage);
 const loading = computed(() => props.tableLoading);
+const rangeFrom = computed(() =>
+  total.value > 0 ? newCurrentPage.value * limit.value + 1 : 0
+);
+const rangeTo = computed(() =>
+  Math.min((newCurrentPage.value + 1) * limit.value, total.value)
+);
 
 // Computed Property