From 06696bcd0e349550117e57de891b1350eefe05be Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 16 Feb 2023 16:05:28 +0800
Subject: [PATCH 1/2] * Add setCookie for execution export.

---
 module/execution/view/all.html.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 85839bdd8d..23d70c16a9 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -102,7 +102,6 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
   <script>
   cols = JSON.parse(cols);
   data = JSON.parse(data);
-  console.log(cols);
   const options = {
       height: 'auto',
       striped: true,
@@ -124,7 +123,6 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
   function toggleActions(changes)
   {
       checkItems = this.getChecks();
-      $.cookie('checkedItem', checkItems.join(','), {expires: config.cookieLife, path: config.webRoot});
 
       if(checkItems.length > 0)
       {
@@ -136,6 +134,13 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN());
       }
   }
 
+  $(".export").modalTrigger({width:650, type:'iframe', shown: setCookie});
+
+  function setCookie()
+  {
+      $.cookie('checkedItem', checkItems.join(','), {expires: config.cookieLife, path: config.webRoot});
+  }
+
   $('#myTable').dtable(options);
 
   $('#batchEditBtn').click(function()

From 58fb367739ff530a15ccee12c9e9547bbaf2257e Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 16 Feb 2023 16:11:53 +0800
Subject: [PATCH 2/2] * Adjust dtable scroll bar and pager z-index.

---
 module/execution/css/all.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 302fbd069d..2b631af971 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -6,3 +6,4 @@ body {margin-bottom: 25px;}
 #myTable input[type=checkbox] {margin: 0px}
 
 .table-footer .pager{z-index: 10}
+#myTable .scrollbar {z-index: 11}