From ab4d7573a56e9b75b878bed3d755f00066070896 Mon Sep 17 00:00:00 2001
From: elsiosanchez <elsiossanches@gmail.com>
Date: Wed, 9 Feb 2022 12:30:25 -0400
Subject: [PATCH 1/3] #1454

---
 .../ADempiere/DefaultTable/index.vue          | 24 +++++++++++++++++--
 src/views/ADempiere/Browser/index.vue         |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/ADempiere/DefaultTable/index.vue b/src/components/ADempiere/DefaultTable/index.vue
index 835e0b7f09a..11a288705b5 100644
--- a/src/components/ADempiere/DefaultTable/index.vue
+++ b/src/components/ADempiere/DefaultTable/index.vue
@@ -19,7 +19,7 @@
 <template>
   <el-main class="default-table">
     <el-row>
-      <el-col :span="23">
+      <el-col v-if="isShowSearch" :span="23">
         <el-input
           v-model="valueToSearch"
           clearable
@@ -32,7 +32,7 @@
           />
         </el-input>
       </el-col>
-      <el-col :span="1">
+      <el-col :span="sizeOption" :style="styleOption">
         <columns-display-option
           :option="currentOption"
         />
@@ -154,6 +154,10 @@ export default defineComponent({
     isTableSelection: {
       type: Boolean,
       default: true
+    },
+    isShowSearch: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -179,6 +183,20 @@ export default defineComponent({
       })
     })
 
+    const sizeOption = computed(() => {
+      if (props.isShowSearch) {
+        return 1
+      }
+      return 24
+    })
+
+    const styleOption = computed(() => {
+      if (props.isShowSearch) {
+        return ''
+      }
+      return 'text-align: end; padding-right: 5px;'
+    })
+
     /**
      * Selection columns to be taken into account during the search
      */
@@ -302,6 +320,8 @@ export default defineComponent({
       valueToSearch,
       // computeds
       headerList,
+      sizeOption,
+      styleOption,
       recordsWithFilter,
       currentOption,
       keyColumn,
diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue
index 6c4d1cc075a..1e594dc2da4 100644
--- a/src/views/ADempiere/Browser/index.vue
+++ b/src/views/ADempiere/Browser/index.vue
@@ -63,6 +63,7 @@
         :header="tableHeader"
         :data-table="recordsList"
         :record-count="recordCount"
+        :is-show-search="false"
       />
     </el-main>
   </el-container>

From 2e1dace315c9be9cec033a192301bbd7e45cb308 Mon Sep 17 00:00:00 2001
From: elsiosanchez <elsiossanches@gmail.com>
Date: Wed, 9 Feb 2022 14:10:49 -0400
Subject: [PATCH 2/3] minimal changes

---
 .../ADempiere/DefaultTable/index.vue          | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/components/ADempiere/DefaultTable/index.vue b/src/components/ADempiere/DefaultTable/index.vue
index 11a288705b5..9a0603ddafd 100644
--- a/src/components/ADempiere/DefaultTable/index.vue
+++ b/src/components/ADempiere/DefaultTable/index.vue
@@ -18,27 +18,6 @@
 
 <template>
   <el-main class="default-table">
-    <el-row>
-      <el-col v-if="isShowSearch" :span="23">
-        <el-input
-          v-model="valueToSearch"
-          clearable
-          size="mini"
-          class="input-search"
-        >
-          <i
-            slot="prefix"
-            class="el-icon-search el-input__icon"
-          />
-        </el-input>
-      </el-col>
-      <el-col :span="sizeOption" :style="styleOption">
-        <columns-display-option
-          :option="currentOption"
-        />
-      </el-col>
-    </el-row>
-
     <el-table
       ref="multipleTable"
       style="width: 100%; height: 88% !important;"
@@ -70,7 +49,7 @@
           :column-key="fieldAttributes.columnName"
           :prop="fieldAttributes.columnName"
           sortable
-          min-width="200"
+          min-width="210"
           :fixed="fieldAttributes.isFixedTableColumn"
         >
           <template slot-scope="scope">
@@ -85,6 +64,16 @@
           </template>
         </el-table-column>
       </template>
+      <el-table-column
+        fixed="right"
+        width="40"
+      >
+        <template slot="header">
+          <columns-display-option
+            :option="currentOption"
+          />
+        </template>
+      </el-table-column>
     </el-table>
 
     <!-- pagination table, set custom or use default change page method -->

From 7f4231a3374dbc126574c724d9196ffa5b102734 Mon Sep 17 00:00:00 2001
From: elsiosanchez <elsiossanches@gmail.com>
Date: Wed, 9 Feb 2022 14:27:04 -0400
Subject: [PATCH 3/3] fixe style

---
 .../ADempiere/DefaultTable/index.vue           | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/components/ADempiere/DefaultTable/index.vue b/src/components/ADempiere/DefaultTable/index.vue
index 9a0603ddafd..8b9c6184086 100644
--- a/src/components/ADempiere/DefaultTable/index.vue
+++ b/src/components/ADempiere/DefaultTable/index.vue
@@ -18,6 +18,22 @@
 
 <template>
   <el-main class="default-table">
+    <el-row>
+      <el-col v-if="isShowSearch" :span="24">
+        <el-input
+          v-model="valueToSearch"
+          clearable
+          size="mini"
+          class="input-search"
+        >
+          <i
+            slot="prefix"
+            class="el-icon-search el-input__icon"
+          />
+        </el-input>
+      </el-col>
+    </el-row>
+
     <el-table
       ref="multipleTable"
       style="width: 100%; height: 88% !important;"
@@ -66,7 +82,7 @@
       </template>
       <el-table-column
         fixed="right"
-        width="40"
+        width="50"
       >
         <template slot="header">
           <columns-display-option