From 4d6496f5c6fc522e60fbcd6f06f10afc81bb823b Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Wed, 21 Apr 2021 14:05:05 -0400 Subject: [PATCH] record access mode mobile support (#755) * record access mode mobile support * resolve conflict * add traslation * minimal changes Co-authored-by: Elsio Sanchez --- .../ContextMenu/contextMenuDesktop.vue | 6 +- .../ContextMenu/contextMenuMobile.vue | 3 + src/components/ADempiere/Dialog/index.vue | 11 +- src/components/ADempiere/Field/index.vue | 1 + .../ADempiere/RecordAccess/index.vue | 22 ++ .../recordAccessDesktop.vue} | 2 +- .../RecordAccess/recordAccessMobile.vue | 281 ++++++++++++++++++ src/lang/ADempiere/es.js | 2 +- src/store/modules/ADempiere/contextMenu.js | 9 +- src/views/ADempiere/Window/index.vue | 4 + .../ADempiere/Window/windowLogicComponent.js | 8 +- 11 files changed, 341 insertions(+), 8 deletions(-) create mode 100644 src/components/ADempiere/RecordAccess/index.vue rename src/components/ADempiere/{recordAccess/index.vue => RecordAccess/recordAccessDesktop.vue} (99%) create mode 100644 src/components/ADempiere/RecordAccess/recordAccessMobile.vue diff --git a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue index 7e03b633..91617a31 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue +++ b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue @@ -216,6 +216,10 @@ export default { clickRunAction(action) { if (action === 'refreshData') { this.refreshData() + } else if (action.action === 'recordAccess') { + this.$store.commit('changeShowRigthPanel', true) + this.$store.commit('setRecordAccess', true) + this.runAction(action) } else { this.runAction(action) } @@ -286,7 +290,7 @@ export default { border-radius: 4px; -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); - max-height: 250px; + max-height: 300px; max-width: 220px; overflow: auto; } diff --git a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue index 01286008..73d7cb19 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue +++ b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue @@ -214,6 +214,9 @@ export default { clickRunAction(action) { if (action === 'refreshData') { this.refreshData() + } else if (action.action === 'recordAccess') { + this.$store.commit('changeShowRigthPanel', true) + this.$store.commit('setRecordAccess', true) } else { this.runAction(action) } diff --git a/src/components/ADempiere/Dialog/index.vue b/src/components/ADempiere/Dialog/index.vue index 055c5446..3840496b 100644 --- a/src/components/ADempiere/Dialog/index.vue +++ b/src/components/ADempiere/Dialog/index.vue @@ -30,7 +30,9 @@
- + import MainPanel from '@/components/ADempiere/Panel' import SequenceOrder from '@/components/ADempiere/SequenceOrder' -import RecordAccess from '@/components/ADempiere/recordAccess' +import RecordAccess from '@/components/ADempiere/RecordAccess' import { showNotification } from '@/utils/ADempiere/notification' import { updateAccessRecord @@ -121,6 +123,9 @@ export default { }, getterDataRecordsAndSelection() { return this.$store.getters.getDataRecordAndSelection(this.containerUuid) + }, + showRecordAccess() { + return this.$store.getters.getShowRecordAccess } }, watch: { @@ -149,8 +154,10 @@ export default { type: this.modalMetadata.panelType, action: undefined }) + this.$store.commit('setRecordAccess', false) }, runAction(action) { + this.$store.commit('setRecordAccess', false) if (action.isSortTab) { this.$store.dispatch('updateSequence', { parentUuid: this.modalMetadata.parentUuid, diff --git a/src/components/ADempiere/Field/index.vue b/src/components/ADempiere/Field/index.vue index 5a101b9b..013e2d62 100644 --- a/src/components/ADempiere/Field/index.vue +++ b/src/components/ADempiere/Field/index.vue @@ -547,6 +547,7 @@ export default { } }, handleCommand(command) { + this.$store.commit('setRecordAccess', false) if (command.name === this.$t('table.ProcessActivity.zoomIn')) { this.redirect({ window: command.fieldAttributes.reference.zoomWindows[0] }) return diff --git a/src/components/ADempiere/RecordAccess/index.vue b/src/components/ADempiere/RecordAccess/index.vue new file mode 100644 index 00000000..60beafb1 --- /dev/null +++ b/src/components/ADempiere/RecordAccess/index.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/components/ADempiere/recordAccess/index.vue b/src/components/ADempiere/RecordAccess/recordAccessDesktop.vue similarity index 99% rename from src/components/ADempiere/recordAccess/index.vue rename to src/components/ADempiere/RecordAccess/recordAccessDesktop.vue index 063b3c47..7a75faca 100644 --- a/src/components/ADempiere/recordAccess/index.vue +++ b/src/components/ADempiere/RecordAccess/recordAccessDesktop.vue @@ -80,7 +80,7 @@ import draggable from 'vuedraggable' export default { - name: 'RecordAccess', + name: 'RecordAccessDesktop', components: { draggable }, diff --git a/src/components/ADempiere/RecordAccess/recordAccessMobile.vue b/src/components/ADempiere/RecordAccess/recordAccessMobile.vue new file mode 100644 index 00000000..26cc13e9 --- /dev/null +++ b/src/components/ADempiere/RecordAccess/recordAccessMobile.vue @@ -0,0 +1,281 @@ + + + + + + diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index 97e00aca..99d258d3 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -310,7 +310,7 @@ export default { lockRecord: 'Bloquear Registro', noDescription: 'Sin Descripción', recordAccess: { - actions: 'Acceso a registros', + actions: 'Acceso a Registros', hideRecord: 'Ocultar Registro', recordDisplay: 'Permitir Visualización del Registro', isReadonly: 'Solo Lectura', diff --git a/src/store/modules/ADempiere/contextMenu.js b/src/store/modules/ADempiere/contextMenu.js index c8b13226..14c4a851 100644 --- a/src/store/modules/ADempiere/contextMenu.js +++ b/src/store/modules/ADempiere/contextMenu.js @@ -28,7 +28,8 @@ const initStateContextMenu = { documentActionsList: [], recordId: undefined, recordUuid: undefined - } + }, + recordAccess: false } const contextMenu = { @@ -57,6 +58,9 @@ const contextMenu = { }, fieldContextMenu(state, payload) { state.optionField = payload + }, + setRecordAccess(state, params) { + state.recordAccess = params } }, actions: { @@ -189,6 +193,9 @@ const contextMenu = { }, getFieldContextMenu: (state) => { return state.optionField + }, + getShowRecordAccess: (state) => { + return state.recordAccess } } } diff --git a/src/views/ADempiere/Window/index.vue b/src/views/ADempiere/Window/index.vue index d20a6cfb..b0192ba6 100644 --- a/src/views/ADempiere/Window/index.vue +++ b/src/views/ADempiere/Window/index.vue @@ -315,8 +315,12 @@ +