From 5b6a526932b0bdc232fd8ac8a05f5c0da378f9c3 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 29 Jan 2024 15:12:30 +0100 Subject: [PATCH 001/102] refs #5509 feat: VnDms feat: EntryDms --- src/components/FormModel.vue | 2 +- src/components/common/VnDms.vue | 75 ++++++++++++++++++++++++++++++ src/components/ui/VnRow.vue | 8 +++- src/components/ui/VnSubToolbar.vue | 2 +- src/i18n/en/index.js | 4 ++ src/i18n/es/index.js | 4 ++ src/pages/Entry/Card/EntryDms.vue | 6 +++ src/router/modules/entry.js | 11 ++++- 8 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 src/components/common/VnDms.vue create mode 100644 src/pages/Entry/Card/EntryDms.vue diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 4ad566bf8..153c086bb 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -128,7 +128,7 @@ async function save() { try { const body = $props.mapper ? $props.mapper(formData.value) : formData.value; - let response + let response; if ($props.urlCreate) { response = await axios.post($props.urlCreate, body); notify('globals.dataCreated', 'positive'); diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue new file mode 100644 index 000000000..cdc54b786 --- /dev/null +++ b/src/components/common/VnDms.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index c3c951528..e13730e62 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -1,12 +1,16 @@ diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue index 81a1820f1..b314716ce 100644 --- a/src/components/ui/VnSubToolbar.vue +++ b/src/components/ui/VnSubToolbar.vue @@ -1,5 +1,5 @@ + diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js index 8d25a8e0c..3ac12d953 100644 --- a/src/router/modules/entry.js +++ b/src/router/modules/entry.js @@ -11,7 +11,7 @@ export default { redirect: { name: 'EntryMain' }, menus: { main: ['EntryList'], - card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryLog'], + card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'], }, children: [ { @@ -86,6 +86,15 @@ export default { }, component: () => import('src/pages/Entry/Card/EntryNotes.vue'), }, + { + path: 'dms', + name: 'EntryDms', + meta: { + title: 'dms', + icon: 'cloud_upload', + }, + component: () => import('src/pages/Entry/Card/EntryDms.vue'), + }, { path: 'log', name: 'EntryLog', From 78877556cf5798dc17716c079a3af07d58ad4597 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 31 Jan 2024 12:52:50 +0100 Subject: [PATCH 002/102] refs #6763 click --- src/components/ui/VnTree.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue index c382ef9f2..3998135ca 100644 --- a/src/components/ui/VnTree.vue +++ b/src/components/ui/VnTree.vue @@ -1,7 +1,8 @@