From e407beb1daf9df019c29224297fa73a11d0115c6 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Sat, 6 May 2023 11:08:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemRoute.php | 6 +++--- .../services/system/SystemRouteServices.php | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php b/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php index 66208ac36..a8d175401 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php @@ -80,12 +80,12 @@ class SystemRoute extends AuthController */ public function tree() { - $where = $this->request->getMore([ + [$name, $appName] = $this->request->getMore([ ['name_like', ''], ['app_name', 'adminapi'] - ]); + ], true); - return app('json')->success($this->services->getTreeList($where)); + return app('json')->success($this->services->getTreeList($appName, $name)); } diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php index 56c76d472..077a9d903 100644 --- a/crmeb/app/services/system/SystemRouteServices.php +++ b/crmeb/app/services/system/SystemRouteServices.php @@ -76,20 +76,21 @@ class SystemRouteServices extends BaseServices /** * 获取tree数据 * @param string $appName - * @return array - * @author 等风来 - * @email 136327134@qq.com - * @date 2023/4/7 + * @param string $name + * @return mixed + * @author 吴汐 + * @email 442384644@qq.com + * @date 2023/05/06 */ - public function getTreeList(array $where, string $appName = 'adminapi') + public function getTreeList(string $appName = 'adminapi', string $name = '') { - return $this->cacheDriver()->remember('ROUTE_LIST', function () use ($where, $appName) { + return $this->cacheDriver()->remember('ROUTE_LIST' . strtoupper($appName), function () use ($name, $appName) { $list = app()->make(SystemRouteCateServices::class) ->selectList(['app_name' => $appName], '*', 0, 0, 'id asc,sort desc', [ - 'children' => function ($query) use ($where) { - $query->where('app_name', $where['app_name']) - ->when('' !== $where['name_like'], function ($q) use ($where) { - $q->where('name|path', 'LIKE', '%' . $where['name_like'] . '%'); + 'children' => function ($query) use ($name, $appName) { + $query->where('app_name', $appName) + ->when('' !== $name, function ($q) use ($name) { + $q->where('name|path', 'LIKE', '%' . $name . '%'); }); } ]) From 92585d2b808a59eef8c9b9b78a7ce37796245f6d Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sat, 6 May 2023 11:08:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90crud=20?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 7a0ee053f..0ec90f6cf 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -502,6 +502,7 @@ class SystemCrudServices extends BaseServices $data['softDelete'] = false; + $tableInfo = null; //先检查表存在则 if ($id) { $this->updateFromCommon($tableName, $tableComment); From 2e6a2c00621538d35477d8bc95a987395232ce3b Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sat, 6 May 2023 11:14:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?crud=20=E7=94=9F=E6=88=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 0ec90f6cf..d28898910 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -526,21 +526,15 @@ class SystemCrudServices extends BaseServices $data['softDelete'] = true; } } - - //读取表结构 - $column = $this->getColumnNamesList($tableName); - if (!$column) { - throw new AdminException(500049, ['_name' => $tableName]); - } - + //读取字段 //读取数据库字段信息 $tableInfo = $this->getTableInfo($tableName); //获取主键 - foreach ($column as $value) { + foreach ($tableField as $value) { if ($value['primaryKey']) { - $data['key'] = $value['name']; + $data['key'] = $value['field']; break; } } From c606337076c2838bacb5bcc77310666dd9466a9d Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Sat, 6 May 2023 11:50:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9C=86=E5=BD=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=EF=BC=8C5px=E6=94=BE=E4=B8=8A=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/theme/element.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/theme/element.scss b/template/admin/src/theme/element.scss index 65b638a4f..12a001a2c 100644 --- a/template/admin/src/theme/element.scss +++ b/template/admin/src/theme/element.scss @@ -190,7 +190,7 @@ } .columns-round { .el-menu-item { - margin: 0 5px 5px 5px; + margin: 5px 5px 0px 5px; border-radius: 5px; } .el-submenu {