WIP: refactor: #8322 changed Wagon component to use VnSection/VnCardBeta #1166

Draft
provira wants to merge 5 commits from 8322-Wagon into dev
3 changed files with 123 additions and 89 deletions

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue'; import VnCardBeta from 'src/components/common/VnCardBeta.vue';
</script> </script>
<template> <template>
<VnCard data-key="Wagon" base-url="Wagons" /> <VnCardBeta data-key="Wagon" base-url="Wagons" :descriptor="WagonDescriptor" />
</template> </template>

View File

@ -8,6 +8,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnSection from 'src/components/common/VnSection.vue';
const quasar = useQuasar(); const quasar = useQuasar();
const arrayData = useArrayData('WagonList'); const arrayData = useArrayData('WagonList');
@ -15,6 +16,7 @@ const store = arrayData.store;
const router = useRouter(); const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const dataKey = 'WagonList';
const filter = { const filter = {
include: { include: {
relation: 'type', relation: 'type',
@ -92,22 +94,31 @@ async function remove(row) {
<template> <template>
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<VnSection
:data-key="dataKey"
:columns="columns"
prefix="card"
:array-data-props="{
url: 'Wagons',
exprBuilder,
}"
>
<template #body>
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="WagonList" :data-key="dataKey"
url="Wagons"
:filter="filter"
:columns="columns"
order="id DESC"
:column-search="false"
:default-mode="'card'"
:disable-option="{ table: true }"
:create="{ :create="{
urlCreate: 'Wagons', urlCreate: 'Wagons',
title: t('Create new wagon'), title: t('Create new wagon'),
onDataSaved: () => tableRef.reload(), onDataSaved: () => tableRef.reload(),
formInitialData: {}, formInitialData: {},
}" }"
:filter="filter"
:columns="columns"
order="id DESC"
:column-search="false"
:default-mode="'card'"
:disable-option="{ table: true }"
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<VnInput <VnInput
@ -166,6 +177,8 @@ async function remove(row) {
</VnSelect> </VnSelect>
</template> </template>
</VnTable> </VnTable>
</template>
</VnSection>
</QPage> </QPage>
</template> </template>

View File

@ -1,34 +1,55 @@
import { RouterView } from 'vue-router'; import { RouterView } from 'vue-router';
const wagonCard = {
name: 'WagonCard',
path: ':id',
component: () => import('src/pages/Ticket/Card/WagonCard.vue'),
redirect: { name: 'WagonSummary' },
meta: {
//main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
menu: [],
},
children: [
{},
],
};
export default { export default {
path: '/wagon',
name: 'Wagon', name: 'Wagon',
path: '/wagon',
meta: { meta: {
title: 'wagons', title: 'wagons',
icon: 'vn:trolley', icon: 'vn:trolley',
moduleName: 'Wagon', moduleName: 'Wagon',
keyBinding: 'w',
menu: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
}, },
component: RouterView, component: RouterView,
redirect: { name: 'WagonMain' }, redirect: { name: 'WagonMain' },
menus: {
main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
card: [],
},
children: [ children: [
{ {
path: '/wagon', path: '',
name: 'WagonMain', name: 'WagonMain',
component: () => import('src/components/common/VnModule.vue'), component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'WagonList' }, redirect: { name: 'WagonIndexMain' },
children: [
{
path: '',
name: 'WagonIndexMain',
redirect: { name: 'WagonList' },
component: () => import('src/pages/Wagon/WagonList.vue'),
children: [ children: [
{ {
path: 'list',
name: 'WagonList', name: 'WagonList',
path: 'list',
meta: { meta: {
title: 'list', title: 'list',
icon: 'vn:trolley', icon: 'view_list',
}, },
component: () => import('src/pages/Wagon/WagonList.vue'), },
]
}, },
{ {
path: 'create', path: 'create',