Fix: About Pestana Daughter (#2887)

* Fix: About Pestana Daughter * remove console
solop-develop · Oct 29, 2024 · 3b81551 · 3b81551
1 parent 4fefa8d
commit 3b81551
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 27 deletions.
diff --git a/src/components/ADempiere/FieldDefinition/FieldOptions/fieldOptionsList.js b/src/components/ADempiere/FieldDefinition/FieldOptions/fieldOptionsList.js
@@ -55,7 +55,7 @@ export const zoomInOptionItem = {
   componentRender: () => import('@/components/ADempiere/FieldDefinition/FieldOptions/EmptyOption'),
   executeMethod: ({ containerManager, window, fieldAttributes, value, zoom }) => {
     const { parentUuid, containerUuid, reference } = fieldAttributes
-    let children
+    let children, recordIdChildren
     let zoom_windows = reference.zoom_windows
     if (isEmptyValue(zoom_windows)) {
       zoom_windows = zoom.zoom_windows
@@ -107,13 +107,21 @@ export const zoomInOptionItem = {
       columnName = zoom.parentTab.key_column
       currentValue = zoom.parentTab.record_id
       children = windowToZoom
+      recordIdChildren = store.getters.getValueOfFieldOnContainer({
+        parentUuid,
+        containerUuid,
+        columnName: zoom.key_columns
+      })
     }
 
     zoomIn({
       attributeValue: `window_${windowToZoom.id}`,
       attributeName: 'containerKey',
       query: {
-        [columnName]: currentValue
+        [columnName]: currentValue,
+        columnName: zoom.key_columns,
+        recordIdChildren,
+        childrenZoom: zoom
       },
       params: {
         [columnName]: currentValue,

diff --git a/src/components/ADempiere/TabManager/tabChild.vue b/src/components/ADempiere/TabManager/tabChild.vue
@@ -408,13 +408,24 @@ export default defineComponent({
         }
 
         // set first record
+        if (
+          !isEmptyValue(root.$route.query) &&
+          !isEmptyValue(root.$route.query.columnName)
+        ) {
+          row = responseData.find(row => row[root.$route.query.columnName] === Number(root.$route.query.recordIdChildren))
+          setRecordRoute({
+            row,
+            recordChildId: Number(root.$route.query.recordIdChildren)
+          })
+        }
         if (isEmptyValue(row)) {
           row = responseData[0]
-          props.containerManager.seekRecord({
-            parentUuid: props.parentUuid,
-            containerUuid,
-            row
-          })
+          // props.containerManager.seekRecord({
+          //   parentUuid: props.parentUuid,
+          //   containerUuid,
+          //   row
+          // })
+          setRecordRoute({ row })
         }
 
         // set values in panel
@@ -502,7 +513,7 @@ export default defineComponent({
           index: indexTab
         })
       }
-    }, 2000)
+    }, 100)
 
     watch(showedTabsList, (newValue, oldValue) => {
       if (newValue) {
@@ -519,25 +530,6 @@ export default defineComponent({
       }
     })
 
-    // unsuscribeChangeParentRecord = store.subscribeAction({
-    //   after: (action, state) => {
-    //     if (action.type === 'setTabDefaultValues' && action.payload) {
-    //       const currentChildTab = currentTabMetadata.value
-    //       if (action.payload.parentUuid === currentChildTab.parentUuid) {
-    //         const isChangeParentTab = currentChildTab.parentTabs.some(tabItem => {
-    //           return tabItem.uuid === action.payload.containerUuid
-    //         })
-    //         if (isChangeParentTab) {
-    //           store.dispatch('setTabDefaultValues', {
-    //             parentUuid: action.payload.parentUuid,
-    //             containerUuid: currentChildTab.containerUuid
-    //           })
-    //         }
-    //       }
-    //     }
-    //   }
-    // })
-
     setTabNumber(currentTabNo.value)
 
     // remove susbscriptions
@@ -551,6 +543,21 @@ export default defineComponent({
       })
     }
 
+    function setRecordRoute({
+      row,
+      recordChildId
+    }) {
+      props.containerManager.seekRecord({
+        parentUuid: props.parentUuid,
+        containerUuid: tabUuid.value,
+        row
+      })
+      if (isEmptyValue(recordChildId)) return
+      setRecordPath({
+        recordChildId
+      })
+    }
+
     return {
       tabUuid,
       currentTabNo,
@@ -571,6 +578,7 @@ export default defineComponent({
       // methods
       handleClick,
       isDisabledTab,
+      setRecordRoute,
       changeShowedRecords,
       selectTab
     }