fix: Zoom lookup. (PanJiaChen#2087)

* fix: Zoom lookup. * fix key column.
EdwinBetanc0urt · Apr 8, 2024 · e784ba4 · e784ba4
1 parent ae6424c
commit e784ba4
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 29 deletions.
diff --git a/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue
@@ -112,17 +112,19 @@
       </el-form>
     </el-scrollbar>
 
-    <span v-for="(zoomItem, index) in fieldAttributes.reference.zoomWindows" :key="index">
-      <el-button
-        :key="index"
-        type="text"
-        @click="redirect({ window: zoomItem })"
-      >
-        <i class="el-icon-zoom-in" />
-        {{ $t('page.processActivity.zoomIn') }}
-        {{ zoomItem.name }}
-      </el-button>
-    </span>
+    <template v-if="!isEmptyValue(fieldAttributes.reference) && !isEmptyValue(fieldAttributes.reference.zoom_windows)">
+      <span v-for="(zoomItem, index) in fieldAttributes.reference.zoom_windows" :key="index">
+        <el-button
+          :key="index"
+          type="text"
+          @click="redirect({ window: zoomItem })"
+        >
+          <i class="el-icon-zoom-in" />
+          {{ $t('page.processActivity.zoomIn') }}
+          {{ zoomItem.name }}
+        </el-button>
+      </span>
+    </template>
   </el-card>
 </template>
 

diff --git a/src/components/ADempiere/FieldDefinition/FieldOptions/fieldOptionsList.js b/src/components/ADempiere/FieldDefinition/FieldOptions/fieldOptionsList.js
@@ -1,6 +1,6 @@
 /**
  * ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
- * Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
+ * Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
  * Contributor(s): Edwin Betancourt [email protected] https://github.com/EdwinBetanc0urt
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,26 +55,26 @@ export const zoomInOptionItem = {
   componentRender: () => import('@/components/ADempiere/FieldDefinition/FieldOptions/EmptyOption'),
   executeMethod: ({ containerManager, window, fieldAttributes, value }) => {
     const { parentUuid, containerUuid, reference } = fieldAttributes
-    const { zoomWindows } = reference
+    const { zoom_windows } = reference
 
     let windowToZoom = window
     if (isEmptyValue(windowToZoom)) {
       const isSOTrx = isSalesTransaction({
         parentUuid,
         containerUuid
       })
-      windowToZoom = zoomWindows.find(zoomWindow => {
+      windowToZoom = zoom_windows.find(zoomWindow => {
         // Is Sales Transaction Window or Is Purchase Transaction Window
         return zoomWindow.isSalesTransaction === isSOTrx
       })
       if (isEmptyValue(windowToZoom)) {
-        windowToZoom = zoomWindows.at(0)
+        windowToZoom = zoom_windows.at(0)
       }
     }
 
     let currentValue = value
 
-    let columnName = reference.keyColumnName
+    let columnName = reference.key_column_name
       .match(/(\.)(\b\w*)/ig)
       .toString()
       .replace('.', '')
@@ -87,7 +87,7 @@ export const zoomInOptionItem = {
       }
     }
 
-    // TODO: Evaluate reference.keyColumnName: AD_Ref_List.Value
+    // TODO: Evaluate reference.key_column_name: AD_Ref_List.Value
     if (fieldAttributes.displayType === LIST.id) {
       columnName = 'AD_Reference_ID'
       // TODO: Direct query is deprecated

diff --git a/src/components/ADempiere/FieldDefinition/FieldOptions/index.vue b/src/components/ADempiere/FieldDefinition/FieldOptions/index.vue
@@ -290,7 +290,7 @@ export default defineComponent({
 
       if (isSupportLookup(field.displayType)) {
         menuOptions.push(refreshLookup)
-        if (field.reference && !isEmptyValue(field.reference.zoomWindows)) {
+        if (field.reference && !isEmptyValue(field.reference.zoom_windows)) {
           menuOptions.push(zoomInOptionItem)
         }
       }

diff --git a/src/store/modules/ADempiere/dictionary/window/getters.js b/src/store/modules/ADempiere/dictionary/window/getters.js
@@ -294,7 +294,7 @@ export default {
                 const storedLookupList = rootGetters.getStoredLookupList({
                   parentUuid,
                   containerUuid,
-                  contextColumnNames: fieldItem.reference.contextColumnNames,
+                  contextColumnNames: fieldItem.reference.context_column_names,
                   uuid,
                   id
                 })

diff --git a/src/utils/ADempiere/dictionary/browser/templateBrowser.js b/src/utils/ADempiere/dictionary/browser/templateBrowser.js
@@ -60,11 +60,11 @@ export function templateFields(field) {
     default_value_to: default_value_to,
     isQueryCriteria: is_query_criteria,
     elementColumnName: element_column_name,
-    contextColumnNames: context_column_names,
-    reference: {
-      tableName: '',
-      contextColumnNames: context_column_names
-    }
+    contextColumnNames: context_column_names
+    // reference: {
+    //   tableName: '',
+    //   contextColumnNames: context_column_names
+    // }
   }
 }
 

diff --git a/src/utils/ADempiere/dictionary/window/templatesWindow.js b/src/utils/ADempiere/dictionary/window/templatesWindow.js
@@ -43,11 +43,11 @@ export function templateFields(field) {
     default_value_to: default_value_to,
     isQueryCriteria: is_query_criteria,
     elementColumnName: element_column_name,
-    contextColumnNames: context_column_names,
-    reference: {
-      tableName: '',
-      contextColumnNames: context_column_names
-    }
+    contextColumnNames: context_column_names
+    // reference: {
+    //   tableName: '',
+    //   contextColumnNames: context_column_names
+    // }
   }
 }