fix: Height Table Report (PanJiaChen#2656)

EdwinBetanc0urt · Sep 19, 2024 · 84749af · 84749af
1 parent b780ec3
commit 84749af
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/components/ADempiere/Report/Data/DataReport.vue b/src/components/ADempiere/Report/Data/DataReport.vue
@@ -135,7 +135,13 @@ export default defineComponent({
       if (isEmptyValue(rowCells)) return []
       return rowCells
     })
+    const tableHeight = computed(() => {
+      return store.getters.getIsActiateCollapse
+    })
     const height = computed(() => {
+      if (tableHeight.value === '1') {
+        return 'calc(100vh - 460px)'
+      }
       if (store.getters.device !== 'mobile') {
         return 'calc(100vh - 295px)'
       }
@@ -452,6 +458,7 @@ export default defineComponent({
       isLoadingReport,
       currentPageSize,
       currentPageNumber,
+      tableHeight,
       getColumnStyle,
       // Methods
       keyAction,

diff --git a/src/components/ADempiere/ReportManager/Setup/optionsReportViewer.vue b/src/components/ADempiere/ReportManager/Setup/optionsReportViewer.vue
@@ -24,7 +24,7 @@
       </b>
     </div>
 
-    <el-collapse v-model="activeCollapse">
+    <el-collapse @change="activeCollapse">
       <el-collapse-item name="1">
         <template slot="title">
           <b style="font-size: 18px">
@@ -266,7 +266,7 @@ export default defineComponent({
     const reportAsViewValue = ref(undefined)
     const reportAsPrintFormatValue = ref(undefined)
     const reportTypeFormatValue = ref('')
-    const activeCollapse = ref(['1', '2'])
+    // const activeCollapse = ref(['1', '2'])
     const isSummaryReport = ref(true)
 
     /**
@@ -280,6 +280,9 @@ export default defineComponent({
      * @containerManagerReportViwer - Container Manager the Report Viwer
      * @componentRender - Import the Panel Definitions component
      */
+    function activeCollapse({ 0: data }) {
+      store.commit('setActivateCollapse', data)
+    }
     const reportAsView = computed(() => {
       const options = store.getters.getStoredActionsMenu({
         containerUuid: props.containerUuid

diff --git a/src/store/modules/ADempiere/reportManager.js b/src/store/modules/ADempiere/reportManager.js
@@ -70,12 +70,16 @@ const initState = {
   exportReport: {},
   contactSend: '',
   typeNotify: '',
-  defaultBody: ''
+  defaultBody: '',
+  activateCollapse: 0
 }
 const reportManager = {
   state: initState,
 
   mutations: {
+    setActivateCollapse(state, activateCollapse) {
+      state.activateCollapse = activateCollapse
+    },
     setContactSend(state, contactSend) {
       state.contactSend = contactSend
     },
@@ -1003,6 +1007,9 @@ const reportManager = {
     },
     getDefaultBody: (state) => {
       return state.defaultBody
+    },
+    getIsActiateCollapse: (state) => {
+      return state.activateCollapse
     }
   }
 }