From 69360dad761beb8df864fe9481b6ee1db5901839 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Fri, 30 Jun 2023 15:45:20 +0800
Subject: [PATCH] * Modify export button near fieldSettings.

---
 module/dataview/css/querybase.css       | 1 +
 module/dataview/view/query.html.php     | 1 -
 module/dataview/view/querybase.html.php | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/dataview/css/querybase.css b/module/dataview/css/querybase.css
index d3a994f5f5..62487e527a 100644
--- a/module/dataview/css/querybase.css
+++ b/module/dataview/css/querybase.css
@@ -16,6 +16,7 @@
 
 #queryTable .titleResult {padding:20px 0px 10px 20px;}
 .fieldSettings {margin: -8px 10px; border: none;}
+.dataview-export {margin: -8px 0px; border: none;}
 #edit select[name^='relatedTable'] + div .picker-selections:first-child {border-right: none;}
 #edit select[name^='relatedTable'] + div.picker-focus .picker-selections {border-right: 1px solid #2e7fff;}
 
diff --git a/module/dataview/view/query.html.php b/module/dataview/view/query.html.php
index f6c7c7af11..6c8d805f5e 100644
--- a/module/dataview/view/query.html.php
+++ b/module/dataview/view/query.html.php
@@ -31,7 +31,6 @@ window.DataStorage = initStorage(
     </div>
   </div>
   <div class="create-action pull-right">
-    <?php if(common::hasPriv('dataview', 'export')) echo html::a('#', "<i class='icon icon-export'></i> {$lang->dataview->export}", '', "id='export' class='hidden btn btn-link'");?>
     <?php if($app->rawMethod == 'create') echo html::a($saveLink, '<i class="icon icon-save"></i> ' . $lang->save, '', "class='btn btn-primary' id='saveButton'");?>
     <?php if($app->rawMethod != 'create') echo '<button type="button" class="btn btn-primary" id="save"><i class="icon icon-save"></i> ' . $lang->save. '</button>';?>
   </div>
diff --git a/module/dataview/view/querybase.html.php b/module/dataview/view/querybase.html.php
index e72aa37b64..d0c13dcc3b 100644
--- a/module/dataview/view/querybase.html.php
+++ b/module/dataview/view/querybase.html.php
@@ -32,6 +32,9 @@
     <div class='btn-active-text'>
       <span class='text'><?php echo $lang->dataview->result;?></span>
       <button type="button" class="btn btn-link fieldSettings pull-right"><i class='icon icon-cog-outline'></i> <?php echo $lang->dataview->fieldSettings;?></button>
+      <?php if(common::hasPriv('dataview', 'export')):?>
+      <button type="button" id='export' class="btn btn-link hidden dataview-export pull-right"><i class='icon icon-export'></i> <?php echo $lang->dataview->export;?></button>
+      <?php endif;?>
     </div>
   </div>
   <div class="table-empty-tip">