{} },
+ userFilter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
searchDataKey: { type: String, default: undefined },
@@ -32,6 +33,7 @@ const url = computed(() => {
const arrayData = useArrayData(props.dataKey, {
url: url.value,
filter: props.filter,
+ userFilter: props.userFilter,
});
onBeforeMount(async () => {
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index a4eb26958..f82370d88 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -102,7 +102,7 @@ const columns = computed(() => [
storage: 'dms',
collection: null,
resolution: null,
- id: prop.row.file.split('.')[0],
+ id: Number(prop.row.file.split('.')[0]),
token: token,
class: 'rounded',
ratio: 1,
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 014b84b31..3ede24274 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -70,6 +70,9 @@ const handleModelValue = (data) => {
(checkboxOptions.value[opt].selected = false)
+ (opt) => (checkboxOptions.value[opt].selected = false),
);
await applyFilter();
}
@@ -378,7 +379,7 @@ watch(
() => router.currentRoute.value.params.id,
() => {
applyFilter();
- }
+ },
);
@@ -391,7 +392,7 @@ watch(
const changedModel = item.changedModel;
return {
locale: useCapitalize(
- validations[changedModel]?.locale?.name ?? changedModel
+ validations[changedModel]?.locale?.name ?? changedModel,
),
value: changedModel,
};
@@ -507,7 +508,7 @@ watch(
:title="
date.formatDate(
log.creationDate,
- 'DD/MM/YYYY hh:mm:ss'
+ 'DD/MM/YYYY hh:mm:ss',
) ?? `date:'dd/MM/yyyy HH:mm:ss'`
"
>
@@ -577,7 +578,7 @@ watch(
t(
`actions.${
actionsText[log.action]
- }`
+ }`,
)
"
/>
@@ -677,139 +678,144 @@ watch(