Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
BENJAMIN ESTEVE DIAZ CANO 2025-03-26 08:30:20 +00:00
commit 243bf2062a
3 changed files with 21 additions and 17 deletions

View File

@ -561,9 +561,7 @@ watch(
}}:
</span>
<VnLogValue
:value="
value.val.val
"
:value="value.val"
:name="value.name"
/>
</QItem>
@ -616,7 +614,7 @@ watch(
{{ prop.nameI18n }}:
</span>
<VnLogValue
:value="prop.val.val"
:value="prop.val"
:name="prop.name"
/>
<span
@ -647,7 +645,7 @@ watch(
</span>
<span v-if="log.action == 'update'">
<VnLogValue
:value="prop.old.val"
:value="prop.old"
:name="prop.name"
/>
<span
@ -658,7 +656,7 @@ watch(
</span>
<VnLogValue
:value="prop.val.val"
:value="prop.val"
:name="prop.name"
/>
<span
@ -670,7 +668,7 @@ watch(
</span>
<span v-else="prop.old.val">
<VnLogValue
:value="prop.val.val"
:value="prop.val"
:name="prop.name"
/>
<span

View File

@ -5,18 +5,24 @@ import { computed } from 'vue';
const descriptorStore = useDescriptorStore();
const $props = defineProps({
name: { type: [String], default: undefined },
value: { type: Object, default: () => {} },
name: { type: String, default: undefined },
});
const descriptor = computed(() => descriptorStore.has($props.name));
</script>
<template>
<VnJsonValue v-bind="$attrs" />
<QIcon
name="launch"
class="link"
v-if="$attrs.value && descriptor"
:data-cy="'iconLaunch-' + $props.name"
/>
<component :is="descriptor" :id="$attrs.value" v-if="$attrs.value && descriptor" />
<VnJsonValue :value="value.val" />
<span
v-if="(value.id || typeof value.val == 'number') && descriptor"
style="margin-left: 2px"
>
<QIcon
name="launch"
class="link"
:data-cy="'iconLaunch-' + $props.name"
style="padding-bottom: 2px"
/>
<component :is="descriptor" :id="value.id ?? value.val" />
</span>
</template>

View File

@ -11,7 +11,7 @@ export const useDescriptorStore = defineStore('descriptorStore', () => {
const files = import.meta.glob(`/src/**/*DescriptorProxy.vue`);
const moduleParser = {
account: 'user',
client: 'customer',
customer: 'client',
};
for (const file in files) {
const name = file.split('/').at(-1).slice(0, -19).toLowerCase();