#8197 - advancedMenu #1248

Merged
alexm merged 8 commits from 8197-advancedMenu into dev 2025-01-23 07:27:37 +00:00
3 changed files with 12 additions and 12 deletions
Showing only changes of commit 58edd511dc - Show all commits

View File

@ -131,7 +131,7 @@ const actionsIcon = {
};
const validDate = new RegExp(
/^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
/T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
/T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
);
function castJsonValue(value) {
@ -193,7 +193,7 @@ function getLogTree(data) {
user: log.user,
userFk: log.userFk,
logs: [],
})
}),
);
}
// Model
@ -211,7 +211,7 @@ function getLogTree(data) {
id: log.changedModelId,
showValue: log.changedModelValue,
logs: [],
})
}),
);
nLogs = 0;
}
@ -283,7 +283,7 @@ function setDate(type) {
to = date.adjustDate(
to,
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
true
true,
);
switch (type) {
@ -366,7 +366,7 @@ async function clearFilter() {
dateTo.value = undefined;
userRadio.value = undefined;
Object.keys(checkboxOptions.value).forEach(
(opt) => (checkboxOptions.value[opt].selected = false)
(opt) => (checkboxOptions.value[opt].selected = false),
);
await applyFilter();
}
@ -379,7 +379,7 @@ watch(
() => router.currentRoute.value.params.id,
() => {
applyFilter();
}
},
);
</script>
<template>
@ -392,7 +392,7 @@ watch(
const changedModel = item.changedModel;
return {
locale: useCapitalize(
validations[changedModel]?.locale?.name ?? changedModel
validations[changedModel]?.locale?.name ?? changedModel,
),
value: changedModel,
};
@ -508,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'`
"
>
@ -578,7 +578,7 @@ watch(
t(
`actions.${
actionsText[log.action]
}`
}`,
)
"
/>
@ -734,7 +734,7 @@ watch(
v-model="userSelect"
option-label="name"
option-value="id"
:url="`${model}Logs/${$route.params.id}/editors`"
:url="`${model}Logs/${route.params.id}/editors`"
:fields="['id', 'nickname', 'name', 'image']"
sort-by="nickname"
@update:model-value="selectFilter('userSelect')"

View File

@ -2,7 +2,7 @@
import RightAdvancedMenu from './RightAdvancedMenu.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnTableFilter from '../VnTable/VnTableFilter.vue';
import { onBeforeMount, computed } from 'vue';
import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
import { useArrayData } from 'src/composables/useArrayData';
import { useRoute, useRouter } from 'vue-router';
import { useHasContent } from 'src/composables/useHasContent';

View File

@ -5,7 +5,7 @@ export function useHasContent(selector) {
const hasContent = ref();
onMounted(() => {
container.value = document.querySelector(selector);
container.value = document?.querySelector(selector);
if (!container.value) return;
const observer = new MutationObserver(() => {