adminforth 2.4.0-next.43 → 2.4.0-next.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
<!-- skelet loader -->
|
|
7
7
|
<div role="status" v-if="!resource || !resource.columns"
|
|
8
8
|
class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded shadow animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
|
|
9
|
-
|
|
10
9
|
<div role="status" class="max-w-sm animate-pulse">
|
|
11
10
|
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
|
|
12
11
|
</div>
|
|
@@ -254,8 +253,8 @@
|
|
|
254
253
|
|
|
255
254
|
<!-- Help text -->
|
|
256
255
|
<span class="text-sm text-gray-700 dark:text-gray-400">
|
|
257
|
-
<span v-if="((page || 1) - 1) * pageSize + 1 > totalRows">{{ $t('Wrong Page') }} </span>
|
|
258
|
-
<template v-else>
|
|
256
|
+
<span v-if="((((page || 1) - 1) * pageSize + 1 > totalRows) && totalRows > 0)">{{ $t('Wrong Page') }} </span>
|
|
257
|
+
<template v-else-if="resource && totalRows > 0">
|
|
259
258
|
|
|
260
259
|
<span class="af-pagination-info hidden sm:inline">
|
|
261
260
|
<i18n-t keypath="Showing {from} to {to} of {total} Entries" tag="p" >
|
|
@@ -271,8 +271,8 @@
|
|
|
271
271
|
|
|
272
272
|
<!-- Help text -->
|
|
273
273
|
<span class="text-sm text-gray-700 dark:text-gray-400">
|
|
274
|
-
<span v-if="((page || 1) - 1) * pageSize + 1 > totalRows">{{ $t('Wrong Page') }} </span>
|
|
275
|
-
<template v-else>
|
|
274
|
+
<span v-if="((((page || 1) - 1) * pageSize + 1 > totalRows) && totalRows > 0)">{{ $t('Wrong Page') }} </span>
|
|
275
|
+
<template v-else-if="resource && totalRows > 0">
|
|
276
276
|
|
|
277
277
|
<span class="hidden sm:inline">
|
|
278
278
|
<i18n-t keypath="Showing {from} to {to} of {total} Entries" tag="p" >
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
|
|
2
|
+
<div :class="`overflow-x-auto ${isRounded ? 'rounded-default' : ''} shadow-resourseFormShadow dark:shadow-darkResourseFormShadow`">
|
|
3
3
|
<div v-if="groupName && !noTitle" class="text-md font-semibold px-6 py-3 flex flex-1 items-center dark:border-gray-600 text-gray-700 bg-lightFormHeading dark:bg-gray-700 dark:text-gray-400 rounded-t-lg">
|
|
4
4
|
{{ groupName }}
|
|
5
5
|
</div>
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
import { getCustomComponent } from '@/utils';
|
|
61
61
|
import { useCoreStore } from '@/stores/core';
|
|
62
62
|
import { computed } from 'vue';
|
|
63
|
-
const props = defineProps<{
|
|
63
|
+
const props = withDefaults(defineProps<{
|
|
64
64
|
columns: Array<{
|
|
65
65
|
name: string;
|
|
66
66
|
label: string;
|
|
@@ -80,8 +80,11 @@
|
|
|
80
80
|
noTitle?: boolean;
|
|
81
81
|
resource: Record<string, any>;
|
|
82
82
|
record: Record<string, any>;
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
isRounded?: boolean;
|
|
84
|
+
}>(), {
|
|
85
|
+
isRounded: true
|
|
86
|
+
});
|
|
87
|
+
|
|
85
88
|
const coreStore = useCoreStore();
|
|
86
89
|
const allColumnsHaveCustomComponent = computed(() => {
|
|
87
90
|
return props.columns.every(column => {
|