From 913c876a9533c76d59ff0cd571cbd57254dec03d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 22 Mar 2024 16:12:43 +0800
Subject: [PATCH] * Finish task #114038.

---
 module/datatable/model.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/module/datatable/model.php b/module/datatable/model.php
index d5423e02c1..701d9cdc92 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -60,15 +60,9 @@ class datatableModel extends model
         /* Logic except open source version .*/
         if($this->config->edition != 'open')
         {
-            $fields = $this->loadModel('workflowfield')->getList($module);
-            foreach($fields as $field)
-            {
-                if($field->buildin) continue;
-                if($field->control == 'file') continue;
-
-                $fieldList[$field->field]['title'] = $field->name;
-                $fieldList[$field->field]['width'] = '120';
-            }
+            $fields            = $this->loadModel('workflowfield')->getList($module);
+            $workflowFieldList = $this->loadModel('flow')->buildDtableCols($fields, array(), array());
+            $fieldList         = array_merge($fieldList, $workflowFieldList);
         }
 
         return $fieldList;