From c52459388f7378ebaf39c76e93e30a793e0bef4a Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Fri, 21 Apr 2023 12:04:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=BF=AB?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemCrud.php | 17 ++++++++++++----- .../app/services/system/SystemCrudServices.php | 2 ++ crmeb/crmeb/services/crud/Service.php | 5 +++-- .../crud/stubs/service/CrudService.stub | 1 + .../crud/stubs/service/GetCrudForm.stub | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index d7fde728e..fe112999f 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -69,6 +69,7 @@ class SystemCrud extends AuthController ['pid', 0], ['menuName', ''], ['tableName', ''], + ['modelName', ''], ['tableComment', ''],//表备注 ['tableField', []],//表字段 ['tableIndex', []],//索引 @@ -411,18 +412,24 @@ class SystemCrud extends AuthController } } - $columns = []; + $columns = [ + [ + 'title' => 'ID', + 'key' => $key, + 'from_type' => '', + ] + ]; foreach ((array)$info->field['tableField'] as $item) { - if (isset($item['from_type']) && $item['from_type']) { + if (isset($item['is_table']) && $item['is_table']) { $columns[] = [ - 'title' => $item['table_name'], + 'title' => $item['table_name'] ?: $item['comment'], 'key' => $item['field'], 'from_type' => $item['from_type'], ]; } } - $routeList = $newRoute; - return app('json')->success(compact('key', 'routeList', 'columns')); + $route = $newRoute; + return app('json')->success(compact('key', 'route', 'columns')); } /** diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 5ae4cf8b5..e4eb4c573 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -378,6 +378,7 @@ class SystemCrudServices extends BaseServices $res = $this->dao->save([ 'pid' => $data['pid'], 'name' => $data['menuName'], + 'model_name' => $data['modelName'], 'table_name' => $tableName, 'table_comment' => $tableInfo['TABLE_COMMENT'] ?? '', 'table_collation' => $tableInfo['TABLE_COLLATION'] ?? '', @@ -529,6 +530,7 @@ class SystemCrudServices extends BaseServices $service->setFilePathName($filePath['service'] ?? '')->setbasePath($basePath)->handle($tableName, [ 'field' => $options['fromField'], 'usePath' => $dao->getUsePath(), + 'modelName' => $options['modelName'], ]); //生成验证器 $validate = app()->make(Validate::class); diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php index c8273d6a9..2bc02dead 100644 --- a/crmeb/crmeb/services/crud/Service.php +++ b/crmeb/crmeb/services/crud/Service.php @@ -47,6 +47,7 @@ class Service extends Make $path = $options['path'] ?? ''; $this->value['use-php'] = $this->getDaoClassName($name, $path); + $this->value['modelName'] = $options['modelName'] ?? $name; $action = $options['action'] ?? []; $field = $options['field'] ?? []; @@ -63,7 +64,7 @@ class Service extends Make //生成form表单 if (in_array('save', $action) || in_array('update', $action)) { - $var = ['{%date%}', '{%route%}', '{%form-php%}', '{%menus%}']; + $var = ['{%date%}', '{%route%}', '{%form-php%}', '{%modelName%}']; $value = [$this->value['date'], Str::snake($options['route'] ?? $name)]; $from = []; foreach ($field as $item) { @@ -86,7 +87,7 @@ class Service extends Make } else { $value[] = ''; } - $value[] = $options['menus'] ?? $name; + $value[] = $options['modelName'] ?? $options['menus'] ?? $name; if ($value && $var) { $contentAction = str_replace($var, $value, $contentAction); diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudService.stub b/crmeb/crmeb/services/crud/stubs/service/CrudService.stub index 4849dcd46..6a3570bd1 100644 --- a/crmeb/crmeb/services/crud/stubs/service/CrudService.stub +++ b/crmeb/crmeb/services/crud/stubs/service/CrudService.stub @@ -23,6 +23,7 @@ use think\exception\ValidateException; {%use-php%} /** + * {%modelName%} * Class CrudService * @date {%date%} * @package app\services\crud{%path%} diff --git a/crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub b/crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub index e2df175e1..515cfde34 100644 --- a/crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub +++ b/crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub @@ -19,5 +19,5 @@ {%form-php%} - return create_form('{%menus%}', $rule, $url, $id ? 'PUT' : 'POST'); + return create_form('{%modelName%}', $rule, $url, $id ? 'PUT' : 'POST'); } From 0ef348dbb316b9c7140f1198dd5394f34e4df8af Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Fri, 21 Apr 2023 12:15:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index e4eb4c573..3711ce6d0 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -73,7 +73,7 @@ class SystemCrudServices extends BaseServices public function getList() { [$page, $limit] = $this->getPageValue(); - $list = $this->dao->selectList([], 'add_time,id,name,table_name,table_comment,table_comment', $page, $limit, 'id desc'); + $list = $this->dao->selectList([], 'add_time,id,name,table_name,table_comment,table_collation', $page, $limit, 'id desc'); $count = $this->dao->count(); return compact('list', 'count'); From cab9c835883242d1f401a9c5c0e68851824acce6 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Fri, 21 Apr 2023 12:19:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemCrud.php | 1 + crmeb/app/services/system/SystemCrudServices.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index fe112999f..85bddd781 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -207,6 +207,7 @@ class SystemCrud extends AuthController $make = $this->services->makeFile($info->table_name, $routeName, false, [ 'menuName' => $info->name, + 'modelName' => $info->model_name, 'key' => $key, 'softDelete' => $softDelete, 'fromField' => $info->field['fromField'] ?? [], diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 3711ce6d0..8c2ff222d 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -530,7 +530,7 @@ class SystemCrudServices extends BaseServices $service->setFilePathName($filePath['service'] ?? '')->setbasePath($basePath)->handle($tableName, [ 'field' => $options['fromField'], 'usePath' => $dao->getUsePath(), - 'modelName' => $options['modelName'], + 'modelName' => $options['modelName'] ?? '', ]); //生成验证器 $validate = app()->make(Validate::class); From 0c806a0d2bd9e22652eb0f6980d477f19ef41019 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Fri, 21 Apr 2023 12:32:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E8=83=BD=E8=A2=AB=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 8c2ff222d..c902257aa 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -52,7 +52,9 @@ class SystemCrudServices extends BaseServices 'system_crud', 'wechat_key', 'user_label_relation', 'user_brokerage_frozen', 'user_brokerage', 'store_product_cate', 'store_bargain_user_help', 'shipping_templates_region', 'shipping_templates_no_delivery', 'shipping_templates_free', 'other_order_status', 'lang_code', - 'lang_country', 'app_version', + 'lang_country', 'app_version', 'user', 'wechat_user', 'template_message', 'store_order', 'other_order', + 'store_order_cart_info', 'store_order_economize', 'store_order_invoice', 'store_order_refund', + 'store_order_status', 'store_pink' ]; /** From cbdfcaea82432473973db23f3b075da9a82b76b9 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 14:36:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/route/route.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/route/route.php b/crmeb/route/route.php index 65503abc0..49ea79f88 100644 --- a/crmeb/route/route.php +++ b/crmeb/route/route.php @@ -25,7 +25,7 @@ Route::miss(function () { return view(app()->getRootPath() . 'public' . DS . 'index.html'); default: if (!request()->isMobile()) { - if (is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('type')) { + if (is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('mdType')) { return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html'); } else { if (request()->get('type')) {