feat: Crud的index,read,delete支持扩展

Author: lg970044

Diff for: .example.env

@@ -23,10 +23,10 @@ REDIS_SELECT = 0
 
 [FILESYSTEM]
 DRIVER = qiniu
-QINIU_ACCESS_KEY = aaaaa
-QINIU_SECRET_KEY = sssss
-QINIU_BUCKET = resstdp
-QINIU_DOMAIN = resstdp.51os.xyz
+QINIU_ACCESS_KEY = ak
+QINIU_SECRET_KEY = sk
+QINIU_BUCKET = res-gen-51os
+QINIU_DOMAIN = res.gen.51os.xyz
 
 [JWT]
 SECRET = c884cf72e91cd5cb5fdc2e76d424257c

Diff for: README.md

@@ -1,4 +1,4 @@
-标准化项目实践
+Gen接口端
 ===============
 
 > 运行环境要求PHP7.4+，兼容PHP8.0。

Diff for: admin.http

@@ -15,29 +15,29 @@ content-type: application/json
 
 ###
 #CRUD - CRUD列表
-GET {{baseUrl}}/crud/admin_log
+GET {{baseUrl}}/crud/product_brand
 Authorization: Bearer {{token}}
 
 ###
 #CRUD - CRUD读取
-GET {{baseUrl}}/crud/admin_log/1
+GET {{baseUrl}}/crud/product_brand/1
 Authorization: Bearer {{token}}
 
 
 ###
 #CRUD - CRUD更新
-PUT {{baseUrl}}/crud/admin_log/1
+PUT {{baseUrl}}/crud/product_brand/1
 Authorization: Bearer {{token}}
 
 
 ###
 #REST - GET操作
-GET {{baseUrl}}/rest/admin_log/act/1
+GET {{baseUrl}}/rest/product_brand/act/1
 Authorization: Bearer {{token}}
 
 ###
 #REST - POST操作
-POST {{baseUrl}}/rest/admin_log/act/1
+POST {{baseUrl}}/rest/product_brand/act/1
 Authorization: Bearer {{token}}
 
 ###

Diff for: app/controller/admin/Crud.php

@@ -34,16 +34,31 @@ public function index()
             $table->cols->filter(fn($col) => empty($col->hide_in_search))->column('data_index'),
             ['filter', 'sorter']
         ), 'get');
+
         $total = $this->model->withSearch(array_keys($search), $search)->count();
-        $list = $this->model->withSearch(array_keys($search), $search)->with(
+        $objs = $this->model->withSearch(array_keys($search), $search)->with(
             $table->cols->filter(fn($col) => empty($col->hide_in_table) && !empty($col->relation_name))->column('relation_name') ?: []
         )->page($current, $pageSize)->select();
+        $data = [];
+        foreach ($objs as $obj) {
+            $data[] = array_merge_recursive($obj->visible(array_merge([$this->model->getPk()], $table->crud_index_cols))->toArray(), $this->mergeIndex($obj));
+        }
 
         return $this->success([
             'total' => $total,
-            'data'  => $list->visible(array_merge([$this->model->getPk()], $table->crud_index_cols))->toArray()
+            'data'  => $data
         ]);
     }
+    /**
+     * 列表的合并数据(扩展列表返回)
+     * @access public
+     * @param  \think\Model  $obj  模型对象
+     * @return array
+     */
+    public function mergeIndex($obj)
+    {
+        return [];
+    }
 
     /**
      * @api {POST} /crud/:table 创建
@@ -57,7 +72,6 @@ public function create()
         $table = TableModel::find(parse_name(string_remove_prefix($this->request->controller(), 'admin.'), 0));
         $data = $this->request->post($table->cols->filter(fn($col) => empty($col->hide_in_form))->column('data_index'));
 
-        // 创建
         $this->model->create($data);
 
         return $this->success();
@@ -78,7 +92,19 @@ public function read($id)
             throw new ModelNotFoundException('数据不存在');
         }
 
-        return $this->success($obj->visible(array_merge([$this->model->getPk()], $table->crud_read_cols))->toArray());
+        return $this->success(
+            array_merge_recursive($obj->visible(array_merge([$this->model->getPk()], $table->crud_read_cols))->toArray(), $this->mergeRead($obj))
+        );
+    }
+    /**
+     * 读取的合并数据(扩展读取返回)
+     * @access public
+     * @param  \think\Model  $obj  模型对象
+     * @return array
+     */
+    public function mergeRead($obj)
+    {
+        return [];
     }
 
     /**
@@ -116,8 +142,18 @@ public function delete($ids)
         }
 
         foreach ($objs as $obj) {
-            $obj->delete();
+            $this->eachDelete($obj);
         }
+
         return $this->success();
     }
+    /**
+     * 删除的模型处理(扩展删除操作)
+     * @access public
+     * @param  \think\Model  $obj  模型对象
+     */
+    public function eachDelete($obj)
+    {
+        $obj->delete();
+    }
 }

Diff for: app/model/Col.php

@@ -94,6 +94,21 @@ public function getFormilySchemaAttr($value, $data)
             array_keys(system_dict($data['value_enum_dict_key'])),
             array_values(system_dict($data['value_enum_dict_key']))
         );
+        if ($data['value_type'] == 'avatar') {
+            $schema['x-component-props'] = [
+                'accept' => 'image/*',
+                'listType' => 'picture-card',
+                'multiple' => false,
+                'maxCount' => 1,
+            ];
+        }
+        if ($data['value_type'] == 'image') {
+            $schema['x-component-props'] = [
+                'accept' => 'image/*',
+                'listType' => 'picture-card',
+                'multiple' => true,
+            ];
+        }
         return $schema;
     }
 

Diff for: composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "stdp/stdp-tp6",
+    "name": "3xdev/gen-tp6",
     "description": "standard project by thinkphp6",
     "type": "project",
     "keywords": [