From ac96903dc81b738fc50a7028acc005787554ea58 Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Sat, 10 Dec 2022 22:01:21 +0800
Subject: [PATCH] save

---
 src/plugin/admin/app/controller/Crud.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/plugin/admin/app/controller/Crud.php b/src/plugin/admin/app/controller/Crud.php
index 5039767..5dfecf7 100644
--- a/src/plugin/admin/app/controller/Crud.php
+++ b/src/plugin/admin/app/controller/Crud.php
@@ -69,24 +69,6 @@ class Crud extends Base
         return $this->json(0);
     }
 
-    /**
-     * 摘要
-     * @param Request $request
-     * @return Response
-     */
-    /*public function schema(Request $request): Response
-    {
-        $table = $this->model->getTable();
-        $data = Util::getSchema($table);
-
-        return $this->json(0, 'ok', [
-            'table' => $data['table'],
-            'columns' => array_values($data['columns']),
-            'forms' => array_values($data['forms']),
-            'keys' => array_values($data['keys']),
-        ]);
-    }*/
-
     /**
      * 查询前置
      * @param Request $request
@@ -101,6 +83,8 @@ class Crud extends Base
         $limit = $request->get('limit', $format === 'tree' ? 1000 : 10);
         $order = $order === 'asc' ? 'asc' : 'desc';
         $where = $request->get();
+        $page = (int)$request->get('page');
+        $page = $page > 0 ? $page : 1;
         $table = $this->model->getTable();
 
         $allow_column = Util::db()->select("desc `$table`");
@@ -122,7 +106,7 @@ class Crud extends Base
             $where[$this->dataLimitField] = admin_id();
         }
 
-        return [$where, $format, $limit, $field, $order];
+        return [$where, $format, $limit, $field, $order, $page];
     }
 
     /**