diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php
index 30ffd13e52..4c0242ef41 100644
--- a/module/datatable/view/ajaxcustom.html.php
+++ b/module/datatable/view/ajaxcustom.html.php
@@ -63,7 +63,7 @@
$col):?>
' data-key='' data-fixed='' data-width=''>
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index a9bb635b20..137dc5e90e 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -44,3 +44,5 @@ canvas {height: 28px;}
.table thead .c-left.text-right {padding-right: 8px;}
#executionsForm td.c-name {padding-right: 5px;}
#executionsForm td.c-name.delay {padding-right: 55px;}
+#myTable .dtable-header, #executionsForm .dtable-rows {z-index: 4;}
+#executionsForm .table-header .btn-toolbar {background: rgb(241, 245, 249);}
diff --git a/module/execution/model.php b/module/execution/model.php
index 060ee57b4f..9372c44f95 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5165,13 +5165,12 @@ class executionModel extends model
{
$this->loadModel('datatable');
- $setting = '';
- if(isset($this->config->datatable->executionAll->cols)) $setting = json_decode($this->config->datatable->executionAll->cols);
+ $setting = $this->datatable->getSetting('execution');
$fieldList = $this->config->execution->datatable->fieldList;
foreach($fieldList as $field => $items)
- {
+ {
$title = zget($this->lang->execution, $items['title'], zget($this->lang, $items['title'], $items['title']));
$fieldList[$field]['title'] = $title;
}
@@ -5207,9 +5206,30 @@ class executionModel extends model
{
foreach($setting as $key => $set)
{
+ if(empty($set->show))
+ {
+ unset($setting[$key]);
+ continue;
+ }
+
if($set->id == 'actions') $set->width = $fieldList[$set->id]['width'];
+
+ $set->name = $set->id;
$set->title = $fieldList[$set->id]['title'];
- if(isset($fieldList[$id]['sortType'])) $set->sortType = $fieldList[$id]['sortType'];
+
+ if(isset($fieldList[$set->id]['checkbox'])) $set->nestedToggle = $fieldList[$set->id]['checkbox'];
+ if(isset($fieldList[$set->id]['nestedToggle'])) $set->nestedToggle = $fieldList[$set->id]['nestedToggle'];
+ if(isset($fieldList[$set->id]['fixed'])) $set->fixed = $fieldList[$set->id]['fixed'];
+ if(isset($fieldList[$set->id]['width'])) $set->width = $fieldList[$set->id]['width'];
+ if(isset($fieldList[$set->id]['type'])) $set->type = $fieldList[$set->id]['type'];
+ if(isset($fieldList[$set->id]['sortType'])) $set->sortType = $fieldList[$set->id]['sortType'];
+ if(isset($fieldList[$set->id]['flex'])) $set->flex = $fieldList[$set->id]['flex'];
+ if(isset($fieldList[$set->id]['minWidth'])) $set->minWidth = $fieldList[$set->id]['minWidth'];
+ if(isset($fieldList[$set->id]['maxWidth'])) $set->maxWidth = $fieldList[$set->id]['maxWidth'];
+ if(isset($fieldList[$set->id]['pri'])) $set->pri = $fieldList[$set->id]['pri'];
+
+ unset($set->id);
+
}
}
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 3c7b625efd..b5bee89e77 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -1,4 +1,5 @@
+
loadModel('common')->checkNotCN())