Skip to content

Commit

Permalink
Fix Full Grid Mode Scroll Window bug (adempiere#1285)
Browse files Browse the repository at this point in the history
  • Loading branch information
elsiosanchez authored Aug 12, 2023
1 parent 9b4fc3d commit 680cfd4
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 10 deletions.
14 changes: 12 additions & 2 deletions src/views/ADempiere/Window/DocumentWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
:tabs-list="windowMetadata.tabsListParent"
:all-tabs-list="allTabsList"
:actions-manager="actionsManager"
style="min-height: 84vh !important;"
:style="styleScroll"
/>
<modal-dialog
v-if="!isEmptyValue(processUuid)"
Expand Down Expand Up @@ -222,6 +222,15 @@ export default defineComponent({
return isEmptyValue(record) ? action : record
})

const showFullGridMode = computed(() => {
return store.getters['settings/getFullGridMode']
})

const styleScroll = computed(() => {
if (showFullGridMode.value) return 'overflow: auto;'
return 'min-height: 84vh !important;'
})

/**
* Watch
*/
Expand Down Expand Up @@ -255,7 +264,8 @@ export default defineComponent({
isViewFullScreenChild,
isViewFullScreenParent,
sizeTab,
sizeTabChild
sizeTabChild,
styleScroll
}
}

Expand Down
14 changes: 12 additions & 2 deletions src/views/ADempiere/Window/Finances.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:tabs-list="windowMetadata.tabsListParent"
:all-tabs-list="allTabsList"
:actions-manager="actionsManager"
style="min-height: 84vh !important;"
:style="styleScroll"
/>
<modal-dialog
v-if="!isEmptyValue(processUuid)"
Expand Down Expand Up @@ -209,6 +209,15 @@ export default defineComponent({
return props.windowMetadata.currentTab.isParentTab && props.windowMetadata.currentTab.isShowedTableRecords
})

const showFullGridMode = computed(() => {
return store.getters['settings/getFullGridMode']
})

const styleScroll = computed(() => {
if (showFullGridMode.value) return 'overflow: auto;'
return 'min-height: 84vh !important;'
})

/**
* Watch
*/
Expand Down Expand Up @@ -246,7 +255,8 @@ export default defineComponent({
sizeTab,
sizeTabChild,
actionsManager,
isFullGrid
isFullGrid,
styleScroll
}
}

Expand Down
14 changes: 12 additions & 2 deletions src/views/ADempiere/Window/GeneralLedger.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:tabs-list="windowMetadata.tabsListParent"
:all-tabs-list="allTabsList"
:actions-manager="actionsManager"
style="min-height: 84vh !important;"
:style="styleScroll"
/>
<modal-dialog
v-if="!isEmptyValue(processUuid)"
Expand Down Expand Up @@ -209,6 +209,15 @@ export default defineComponent({
return props.windowMetadata.currentTab.isParentTab && props.windowMetadata.currentTab.isShowedTableRecords
})

const showFullGridMode = computed(() => {
return store.getters['settings/getFullGridMode']
})

const styleScroll = computed(() => {
if (showFullGridMode.value) return 'overflow: auto;'
return 'min-height: 84vh !important;'
})

/**
* Watch
*/
Expand Down Expand Up @@ -246,7 +255,8 @@ export default defineComponent({
sizeTab,
sizeTabChild,
actionsManager,
isFullGrid
isFullGrid,
styleScroll
}
}

Expand Down
14 changes: 12 additions & 2 deletions src/views/ADempiere/Window/MaterialsManagement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:tabs-list="windowMetadata.tabsListParent"
:all-tabs-list="allTabsList"
:actions-manager="actionsManager"
style="min-height: 84vh !important;"
:style="styleScroll"
/>
<modal-dialog
v-if="!isEmptyValue(processUuid)"
Expand Down Expand Up @@ -212,6 +212,15 @@ export default defineComponent({
return props.windowMetadata.currentTab.isParentTab && props.windowMetadata.currentTab.isShowedTableRecords
})

const showFullGridMode = computed(() => {
return store.getters['settings/getFullGridMode']
})

const styleScroll = computed(() => {
if (showFullGridMode.value) return 'overflow: auto;'
return 'min-height: 84vh !important;'
})

/**
* Watch
*/
Expand Down Expand Up @@ -248,7 +257,8 @@ export default defineComponent({
sizeTab,
sizeTabChild,
actionsManager,
isFullGrid
isFullGrid,
styleScroll
}
}

Expand Down
14 changes: 12 additions & 2 deletions src/views/ADempiere/Window/MultiTabWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:tabs-list="windowMetadata.tabsListParent"
:all-tabs-list="allTabsList"
:actions-manager="actionsManager"
style="min-height: 84vh !important;"
:style="styleScroll"
/>

<modal-dialog
Expand Down Expand Up @@ -214,6 +214,15 @@ export default defineComponent({
return props.windowMetadata.currentTab.isParentTab && props.windowMetadata.currentTab.isShowedTableRecords
})

const showFullGridMode = computed(() => {
return store.getters['settings/getFullGridMode']
})

const styleScroll = computed(() => {
if (showFullGridMode.value) return 'overflow: auto;'
return 'min-height: 84vh !important;'
})

/**
* Watch
*/
Expand Down Expand Up @@ -251,7 +260,8 @@ export default defineComponent({
sizeTab,
sizeTabChild,
actionsManager,
isFullGrid
isFullGrid,
styleScroll
}
}

Expand Down

0 comments on commit 680cfd4

Please sign in to comment.