From acedbb88decf28fd169baa4363136f3d727f7af8 Mon Sep 17 00:00:00 2001 From: elsiosanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Wed, 11 Mar 2020 21:28:20 -0400 Subject: [PATCH] Show sequence options in the table menu (#388) * Show sequence options in the table menu * Open sequence modal --- src/components/ADempiere/DataTable/index.vue | 6 +++--- src/components/ADempiere/DataTable/menu/index.vue | 4 ++-- src/components/ADempiere/DataTable/menu/menuTableMixin.js | 8 ++++++++ src/store/modules/ADempiere/window.js | 4 +++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/components/ADempiere/DataTable/index.vue b/src/components/ADempiere/DataTable/index.vue index 4a749de1..466c687a 100644 --- a/src/components/ADempiere/DataTable/index.vue +++ b/src/components/ADempiere/DataTable/index.vue @@ -326,10 +326,10 @@ export default { }, computed: { getterContextMenu() { - const process = this.$store.getters.getContextMenu(this.containerUuid).actions + const process = this.$store.getters.getContextMenu(this.containerUuid) if (process) { - return process.filter(menu => { - if (menu.type === 'process') { + return process.actions.filter(menu => { + if (menu.type === 'process' || menu.type === 'application') { return menu } }) diff --git a/src/components/ADempiere/DataTable/menu/index.vue b/src/components/ADempiere/DataTable/menu/index.vue index 29d7dfbc..ee81498f 100644 --- a/src/components/ADempiere/DataTable/menu/index.vue +++ b/src/components/ADempiere/DataTable/menu/index.vue @@ -26,9 +26,9 @@ v-for="(process, key) in processMenu" v-show="isPanelWindow && processMenu" :key="key" - :disabled="Boolean(getDataSelection.length < 1)" + :disabled="process.type === 'application' ? false : Boolean(getDataSelection.length < 1)" index="process" - @click="showModalTable(process)" + @click="process.type === 'application' ? sortTab(process) : showModalTable(process)" > {{ process.name }} diff --git a/src/components/ADempiere/DataTable/menu/menuTableMixin.js b/src/components/ADempiere/DataTable/menu/menuTableMixin.js index 9fca5d8c..d87d8632 100644 --- a/src/components/ADempiere/DataTable/menu/menuTableMixin.js +++ b/src/components/ADempiere/DataTable/menu/menuTableMixin.js @@ -157,6 +157,14 @@ export const menuTableMixin = { }, methods: { showNotification, + sortTab(actionSequence) { + // TODO: Refactor and remove redundant dispatchs + this.$store.dispatch('setShowDialog', { + type: 'window', + action: actionSequence, + parentRecordUuid: this.$route.query.action + }) + }, closeMenu() { // TODO: Validate to dispatch one action this.$store.dispatch('showMenuTable', { diff --git a/src/store/modules/ADempiere/window.js b/src/store/modules/ADempiere/window.js index 52531051..9300c472 100644 --- a/src/store/modules/ADempiere/window.js +++ b/src/store/modules/ADempiere/window.js @@ -197,7 +197,9 @@ const window = { parentTabs.push(tab) return tab } - childrenTabs.push(tab) + if (!tab.isSortTab) { + childrenTabs.push(tab) + } return tab })