继续重构模块列表前端样式

app/Gdoo/System/Controllers/SettingController.php

@@ -131,6 +131,13 @@ class SettingController extends DefaultController
                 'filter' => false,
             ],
         ];
+
+        $header['buttons'] = [
+            ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
+            ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
+        ];
+
+        $header['search_form'] = $search;
         $query = $search['query'];
 
         if (Request::method() == 'POST') {
@@ -142,22 +149,14 @@ class SettingController extends DefaultController
             }
             $model->selectRaw('*, id as master_id');
             $rows = $model->paginate($query['limit'])->appends($query);
-            return $rows->toJson();
+            $ret = $rows->toArray();
+            $ret['header'] = Grid::getColumns($header);
+            return $ret;
         }
 
-        $header['buttons'] = [
-            ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
-            ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
-        ];
-
-        $header['search_form'] = $search;
-        $header['js'] = Grid::js($header);
-
         return $this->display([
             'header' => $header,
         ]);
-
-        return $this->display();
     }
 
     public function createAction()