Fix: Favorites Panel Options (User) (PanJiaChen#2166)

Author: elsiosanchez

src/api/ADempiere/security/index.ts

@@ -153,7 +153,8 @@ export function requestMenu({
       language,
       role_id: roleId,
       client_id: clientId,
-      user_id: userId
+      user_id: userId,
+      page_size: 100
     }
   })
 }

src/components/ADempiere/TabManager/TabPanel/modeDesktop.vue

@@ -339,16 +339,18 @@ export default defineComponent({
     }
 
     function loadOpenWindows() {
-      if (root.$route.query.options === 'listRecords') {
+      if (root.$route.query.options === 'listRecords' && currentTab.value.isParentTab) {
         showedTableRecords(true)
-      } else if (root.$route.query.options === 'create-new') {
+      } else if (root.$route.query.options === 'create-new' && currentTab.value.isParentTab) {
+        const { parentUuid, containerUuid } = props.tabAttributes
         showedTableRecords(false)
-        const { parentUuid, containerUuid } = currentTab.value
-        createNewRecord.createNewRecord({
-          parentUuid,
-          containerUuid,
-          isCopyValues: false
-        })
+        setTimeout(() => {
+          createNewRecord.createNewRecord({
+            parentUuid,
+            containerUuid,
+            isCopyValues: false
+          })
+        }, 500)
       }
     }
 

src/components/ADempiere/TabManager/index.vue

@@ -482,15 +482,15 @@ export default defineComponent({
       if (tabNumber !== currentTab.value) {
         currentTab.value = tabNumber
       }
-      router.push({
+      setValuesPath({
         query: {
           ...currentRoute.query,
           [queryProperty]: currentTab.value
         },
         params: {
           ...currentRoute.params
         }
-      }, () => {})
+      })
 
       return tabNumber
     }
@@ -607,8 +607,7 @@ export default defineComponent({
           row
         })
         const recordId = currentRecordId.value
-        router.push({
-          name: currentRoute.name,
+        setValuesPath({
           query: {
             ...currentRoute.query,
             recordId
@@ -618,7 +617,7 @@ export default defineComponent({
             filter: {},
             recordId
           }
-        }, () => {})
+        })
       })
     }
 
@@ -634,18 +633,18 @@ export default defineComponent({
     }
     watch(currentRecordLogs, (newValue, oldValue) => {
       const recordId = newValue[currentTabTableName.value + '_ID']
-      router.push({
-        name: currentRoute.name,
+      const { query, params } = currentRoute
+      setValuesPath({
         query: {
-          ...currentRoute.query,
           action: newValue.UUID,
+          ...query,
           recordId
         },
         params: {
-          ...currentRoute.params,
+          ...params,
           recordId
         }
-      }, () => {})
+      })
     })
     // if changed tab and not records in stored, get records from server
     watch(tabUuid, (newValue, oldValue) => {
@@ -858,6 +857,20 @@ export default defineComponent({
         .catch(() => {})
     }
 
+    /**
+     * Set Values in the Path
+     */
+    const setValuesPath = ({ query, params }) => {
+      if (query.options === 'create-new') {
+        delete query.recordId
+        delete params.recordId
+      }
+      router.push({
+        query: query,
+        params: params
+      }, () => {})
+    }
+
     const tabMetadata = computed(() => {
       return store.getters.getStoredTab(
         props.parentUuid,
@@ -936,6 +949,7 @@ export default defineComponent({
       // methods
       handleClick,
       changeShowedRecords,
+      setValuesPath,
       findRecordLogs,
       openRecordLogs,
       isDisabledTab,

src/styles/sidebar.scss

@@ -39,7 +39,7 @@
 
     &.has-logo {
       .el-scrollbar {
-        height: calc(100% - 50px);
+        height: calc(100% - 80px);
       }
     }