wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

This commit is contained in:
Alex Moreno 2024-06-14 13:25:33 +02:00
parent 6f723af338 f86bc9791b
commit 79a34db700
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/VnTable/VnTable.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, onMounted, computed, watch, useAttrs } from 'vue'; import { ref, onMounted, computed, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
@ -60,7 +60,6 @@ const $props = defineProps({
default: false, default: false,
}, },
}); });
const attrs = useAttrs();
const { t } = useI18n(); const { t } = useI18n();
const stateStore = useStateStore(); const stateStore = useStateStore();
const route = useRoute(); const route = useRoute();

6
src/components/common/VnComponent.vue
View File

@ -4,7 +4,7 @@
v-if="toComponent?.component" v-if="toComponent?.component"
:is="mix(toComponent).component" :is="mix(toComponent).component"
v-bind="mix(toComponent).attrs" v-bind="mix(toComponent).attrs"
v-on="mix(toComponent).event" v-on="mix(toComponent).event ?? {}"
v-model="model" v-model="model"
/> />
</span> </span>
@ -21,12 +21,10 @@ const $props = defineProps({
components: { components: {
type: Object, type: Object,
default: () => {}, default: () => {},
required: false,
}, },
value: { value: {
type: Object, type: [Object, Number, String],
default: () => {}, default: () => {},
required: false,
}, },
}); });

5
src/pages/Customer/ExtendedList/CustomerExtendedList.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, computed, onMounted } from 'vue'; import { ref, computed, markRaw } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
@ -10,7 +10,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import RightMenu from 'src/components/common/RightMenu.vue';
const { t } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
@ -96,7 +95,7 @@ const columns = computed(() => [
name: 'phone', name: 'phone',
cardVisible: true, cardVisible: true,
after: { after: {
component: VnLinkPhone, component: markRaw(VnLinkPhone),
props: (prop) => ({ props: (prop) => ({
'phone-number': prop.phone, 'phone-number': prop.phone,
}), }),