refactor(admin): enhance delete method to support custom primary keys

- Update delete method in Curd trait to accept Request parameter
- Add support for deleting multiple records using 'id' parameter
- Improve error handling for non-existent data

app/admin/controller/Index.php

@@ -141,7 +141,7 @@ class Index extends AdminController
             $old_secret = $row->ga_secret;
             $secret     = $ga->createSecret(32);
             $ga_title   = $this->isDemo ? 'EasyAdmin8演示环境' : '可自定义修改显示标题';
-            $dataUri    = $ga->getQRCode($ga_title, $secret)->getDataUri();
+            $dataUri    = $ga->getQRCode($ga_title, $secret);
             $this->assign(compact('row', 'dataUri', 'old_secret', 'secret'));
             return $this->fetch();
         }

app/admin/controller/mall/Goods.php

@@ -20,6 +20,12 @@ use think\response\Json;
 class Goods extends AdminController
 {
 
+    /**
+     * 过滤不需要生成的权限节点 默认 CURD 中会自动生成部分节点 可以在此处过滤
+     * @var array[]
+     */
+    protected array $ignoreNode = ['export'];
+
     public function __construct(App $app)
     {
         parent::__construct($app);

app/admin/controller/system/Admin.php

@@ -150,9 +150,10 @@ class Admin extends AdminController
     /**
      * @NodeAnnotation(title="删除")
      */
-    public function delete($id): void
+    public function delete(Request $request): void
     {
         $this->checkPostRequest();
+        $id  = $request->post('id');
         $row = $this->model->whereIn('id', $id)->select();
         $row->isEmpty() && $this->error('数据不存在');
         $id == AdminConstant::SUPER_ADMIN_ID && $this->error('超级管理员不允许修改');

app/admin/controller/system/Menu.php

@@ -132,9 +132,10 @@ class Menu extends AdminController
     /**
      * @NodeAnnotation(title="删除")
      */
-    public function delete($id): void
+    public function delete(Request $request): void
     {
         $this->checkPostRequest();
+        $id  = $request->post('id');
         $row = $this->model->whereIn('id', $id)->select();
         empty($row) && $this->error('数据不存在');
         try {

app/admin/middleware/SystemLog.php

@@ -56,8 +56,8 @@ class SystemLog
                     $pathInfoExp = explode('.', $pathInfoExp[0] ?? '');
                     $_name       = $pathInfoExp[0] ?? '';
                     $_controller = ucfirst($pathInfoExp[1] ?? '');
-                    if ($_name && $_controller && $_action) {
+                    $className   = $_controller ? "app\admin\controller\\{$_name}\\{$_controller}" : "app\admin\controller\\{$_name}";
-                        $className       = "app\admin\controller\\{$_name}\\{$_controller}";
+                    if ($_name && $_action) {
                         $reflectionClass = new \ReflectionClass($className);
                         $properties      = $reflectionClass->getDefaultProperties();
                         $ignoreLog       = $properties['ignoreLog'] ?? [];

app/admin/service/auth/Node.php

@@ -67,6 +67,12 @@ class Node
 
                 // 遍历读取所有方法的注释的参数信息
                 foreach ($methods as $method) {
+
+                    // 忽略的节点
+                    $properties = $reflectionClass->getDefaultProperties();
+                    $ignoreNode = $properties['ignoreNode'] ?? [];
+                    if (!empty($ignoreNode)) if (in_array($method->name, $ignoreNode)) continue;
+
                     // 读取NodeAnnotation的注解
                     $nodeAnnotation = $reader->getMethodAnnotation($method, NodeAnnotation::class);
                     if (!empty($nodeAnnotation)) {

app/admin/service/curd/exceptions/CurdException.php

@@ -1,8 +1,8 @@
 <?php
+declare(strict_types = 1);
 
-namespace EasyAdmin\curd\exceptions;
+namespace app\admin\service\curd\exceptions;
 
 class CurdException extends \Exception
 {
-
 }

app/admin/service/curd/exceptions/FileException.php

@@ -1,8 +1,8 @@
 <?php
+declare(strict_types = 1);
 
-namespace EasyAdmin\curd\exceptions;
+namespace app\admin\service\curd\exceptions;
 
 class FileException extends \Exception
 {
-
 }

app/admin/service/curd/exceptions/TableException.php

@@ -1,8 +1,8 @@
 <?php
+declare(strict_types = 1);
 
 namespace app\admin\service\curd\exceptions;
 
 class TableException extends \Exception
 {
-
 }

app/admin/traits/Curd.php

@@ -88,8 +88,10 @@ trait Curd
     /**
      * @NodeAnnotation(title="删除")
      */
-    public function delete($id): void
+    public function delete(Request $request): void
     {
+        // 如果不是id作为主键 请在对应的控制器中覆盖重写
+        $id = $request->param('id', []);
         $this->checkPostRequest();
         $row = $this->model->whereIn('id', $id)->select();
         $row->isEmpty() && $this->error('数据不存在');

app/admin/view/login/index.html

@@ -41,7 +41,7 @@
                     <a href="javascript:" class="forget-password">忘记密码？</a>
                 </div>
                 <div class="layui-form-item" style="text-align:center; width:100%;height:100%;margin:0px;">
-                    <button class="login-btn" lay-submit>立即登录</button>
+                    <button type="button" class="login-btn" lay-submit>立即登录</button>
                 </div>
             </form>
         </div>

app/common/command/OssStatic.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace app\common\command;
-
-use EasyAdmin\console\CliEcho;
-use EasyAdmin\tool\CommonTool;
-use EasyAdmin\upload\driver\alioss\Oss;
-use think\console\Command;
-use think\console\Input;
-use think\console\input\Option;
-use think\console\Output;
-
-class OssStatic extends Command
-{
-
-    protected function configure()
-    {
-        $this->setName('OssStatic')
-            ->setDescription('将静态资源上传到oss上');
-    }
-
-    protected function execute(Input $input, Output $output)
-    {
-        $output->writeln("========正在上传静态资源到OSS上：========" . date('Y-m-d H:i:s'));
-        $dir = root_path() . 'public' . DIRECTORY_SEPARATOR . 'static';
-        $list = CommonTool::readDirAllFiles($dir);
-        $uploadConfig = sysConfig('upload');
-        $uploadPrefix = config('app.oss_static_prefix', 'oss_static_prefix');
-        foreach ($list as $key => $val) {
-            list($objectName, $filePath) = [$uploadPrefix . DIRECTORY_SEPARATOR . $key, $val];
-            try {
-                $upload = Oss::instance($uploadConfig)
-                    ->save($objectName, $filePath);
-            } catch (\Exception $e) {
-                CliEcho::error('文件上传失败：' . $filePath . '。错误信息：' . $e->getMessage());
-                continue;
-            }
-            if ($upload['save'] == true) {
-                CliEcho::success('文件上传成功：' . $filePath . '。上传地址：' . $upload['url']);
-            } else {
-                CliEcho::error('文件上传失败：' . $filePath . '。错误信息：' . $upload['msg']);
-            }
-        }
-        $output->writeln("========已完成静态资源上传到OSS上：========" . date('Y-m-d H:i:s'));
-    }
-
-}

app/common/service/AuthService.php

@@ -3,7 +3,6 @@
 namespace app\common\service;
 
 use app\common\constants\AdminConstant;
-use EasyAdmin\tool\CommonTool;
 use think\facade\Db;
 
 /**

app/index/controller/Install.php

@@ -91,12 +91,11 @@ class Install extends BaseController
         $installPath = config_path() . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR;
         $sqlPath     = file_get_contents($installPath . 'sql' . DIRECTORY_SEPARATOR . 'install.sql');
         $sqlArray    = $this->parseSql($sqlPath, $config['prefix'], 'ea_');
-        $conn        = mysqli_connect($config['host'], $config['username'], $config['password'], null, $config['port']);
+        $dsn         = $this->pdoDsn($config, true);
         try {
-            mysqli_set_charset($conn, $config['charset']);
+            $pdo = new \PDO($dsn, $config['username'] ?? 'root', $config['password'] ?? '');
-            mysqli_select_db($conn, $config['database']);
             foreach ($sqlArray as $sql) {
-                mysqli_query($conn, $sql);
+                $pdo->query($sql);
             }
             $_password = password($password);
             $tableName = 'system_admin';
@@ -108,9 +107,8 @@ class Install extends BaseController
                 'update_time' => time()
             ];
             foreach ($update as $_k => $_up) {
-                mysqli_query($conn, "UPDATE {$config['prefix']}{$tableName} SET {$_k} = '{$_up}' WHERE id = 1");
+                $pdo->query("UPDATE {$config['prefix']}{$tableName} SET {$_k} = '{$_up}' WHERE id = 1");
             }
-            mysqli_close($conn);
             //  处理安装文件
             !is_dir($installPath) && @mkdir($installPath);
             !is_dir($installPath . 'lock' . DIRECTORY_SEPARATOR) && @mkdir($installPath . 'lock' . DIRECTORY_SEPARATOR);
@@ -161,11 +159,11 @@ class Install extends BaseController
 
     protected function createDatabase($database, $config): bool
     {
+        $dsn = $this->pdoDsn($config);
         try {
-            $con = mysqli_connect($config['host'] ?? '127.0.0.1', $config['username'] ?? 'root', $config['password'] ?? '', null, $config['port'] ?? '');
+            $pdo = new \PDO($dsn, $config['username'] ?? 'root', $config['password'] ?? '');
-            mysqli_query($con, "CREATE DATABASE IF NOT EXISTS `{$database}` DEFAULT CHARACTER SET {$config['charset']} COLLATE=utf8mb4_general_ci");
+            $pdo->query("CREATE DATABASE IF NOT EXISTS `{$database}` DEFAULT CHARACTER SET {$config['charset']} COLLATE=utf8mb4_general_ci");
-            mysqli_close($con);
+        }catch (\PDOException $e) {
-        }catch (\Throwable $e) {
             return false;
         }
         return true;
@@ -187,19 +185,32 @@ class Install extends BaseController
 
     protected function checkConnect(array $config): ?bool
     {
+        $dsn = $this->pdoDsn($config);
         try {
-            $con          = mysqli_connect($config['host'] ?? '127.0.0.1', $config['username'] ?? 'root', $config['password'] ?? '', null, $config['port'] ?? '');
+            $pdo      = new \PDO($dsn, $config['username'] ?? 'root', $config['password'] ?? '');
-            $res          = mysqli_query($con, 'select VERSION()');
+            $res      = $pdo->query('select VERSION()');
-            $mysqlVersion = mysqli_fetch_row($res);
+            $_version = $res->fetch()[0] ?? 0;
-            mysqli_close($con);
-            $_version = $mysqlVersion[0] ?? 0;
             if (version_compare($_version, '5.7.0', '<')) {
                 $this->error('mysql版本最低要求 5.7.x');
             }
-        }catch (\mysqli_sql_exception $e) {
+        }catch (\PDOException $e) {
             $this->error($e->getMessage());
         }
         return true;
     }
 
+    /**
+     * @param array $config
+     * @param bool $needDatabase
+     * @return string
+     */
+    protected function pdoDsn(array $config, bool $needDatabase = false): string
+    {
+        $host     = $config['host'] ?? '127.0.0.1';
+        $database = $config['database'] ?? '';
+        $port     = $config['port'] ?? '3306';
+        $charset  = $config['charset'] ?? 'utf8mb4';
+        if ($needDatabase) return "mysql:host=$host;port=$port;dbname=$database;charset=$charset";
+        return "mysql:host=$host;port=$port;charset=$charset";
+    }
 }

composer.json

@@ -23,7 +23,7 @@
         "php": ">=8.0.0",
         "topthink/framework": "^8.0",
         "topthink/think-orm": "^3.0",
-        "topthink/think-multi-app": "^1.0",
+        "topthink/think-multi-app": "^1.1.0",
         "topthink/think-view": "^2.0",
         "topthink/think-captcha": "^3.0",
         "topthink/think-filesystem": "^2.0",
@@ -38,7 +38,7 @@
         "ext-mysqli": "*",
         "ext-pdo": "*",
         "wolf-leo/phplogviewer": "^0.11.3",
-        "wolfcode/authenticator": "^0.0.3"
+        "wolfcode/authenticator": "^0.0.6"
     },
     "require-dev": {
         "symfony/var-dumper": ">=4.2",

config/install/sql/install.sql

@@ -108,7 +108,7 @@ CREATE TABLE `ea_system_admin`
 -- Records of ea_system_admin
 -- ----------------------------
 INSERT INTO `ea_system_admin`
-VALUES ('1', null, '/static/admin/images/head.jpg', 'admin', 'a33b679d5581a8692988ec9f92ad2d6a2259eaa7', 'admin', 'admin', '0', '0', '1', '1589454169', '1589476815', null);
+VALUES ('1', null, '/static/admin/images/head.jpg', 'admin', 'a33b679d5581a8692988ec9f92ad2d6a2259eaa7', 'admin', 'admin', '0', '0', '1', '1589454169', '1589476815', null,1,'');
 
 -- ----------------------------
 -- Table structure for ea_system_auth

config/route.php

@@ -42,4 +42,6 @@ return [
     'default_jsonp_handler' => 'jsonpReturn',
     // 默认JSONP处理方法
     'var_jsonp_handler'     => 'callback',
+    // 操作方法的参数绑定方式 route get param
+    'action_bind_param'     => 'param',
 ];

public/static/admin/js/mall/goods.js

@@ -57,6 +57,10 @@ define(["jquery", "easy-admin"], function ($, ea) {
                         templet: ea.table.tool,
                         operat: [
                             [{
+                                templet: function (d) {
+                                    return `<button type="button" class="layui-btn layui-btn-xs">自定义 ${d.id}</button>`
+                                }
+                            }, {
                                 text: '编辑',
                                 url: init.edit_url,
                                 method: 'open',

public/static/plugs/easy-admin/easy-admin.js

@@ -399,6 +399,15 @@ define(["jquery", "tableSelect"], function ($, tableSelect) {
                                     '</div>\n' +
                                     '</div>';
                                 break;
+                            case 'date':
+                                d.searchOp = '=';
+                                formHtml += `<div class="layui-form-item layui-inline">
+                                                <label class="layui-form-label">${d.title}</label>
+                                                <div class="layui-input-inline">
+                                                    <input data-date data-date-type="date" id="c-${d.fieldAlias}" name="${d.fieldAlias}" data-search-op="${d.searchOp}"  value="${d.searchValue}" placeholder="${d.searchTip}" class="layui-input">
+                                                </div>
+                                            </div>`
+                                break;
                         }
                         newCols.push(d);
                     }
@@ -663,6 +672,12 @@ define(["jquery", "tableSelect"], function ($, tableSelect) {
 
                         $.each(item, function (i, operat) {
                             if (typeof operat !== 'object') return
+
+                            if ('function' === typeof operat.templet) {
+                                html += operat.templet(data);
+                                return true;
+                            }
+
                             operat.class = operat.class || '';
                             operat.icon = operat.icon || '';
                             operat.auth = operat.auth || '';

public/static/plugs/lay-module/layuimini/layuimini.css

@@ -700,14 +700,6 @@
     margin-top: -6px !important;
 }
 
-.layuimini-menu-left .layui-nav .layui-nav-mored,.layuimini-menu-left .layui-nav-itemed>a .layui-nav-more{
-    margin-top: -9px!important;
-}
-
-.layuimini-menu-left-zoom.layui-nav .layui-nav-mored,.layuimini-menu-left-zoom.layui-nav-itemed>a .layui-nav-more{
-    margin-top: -9px!important;
-}
-
 .layuimini-menu-left .layui-nav-more:before,.layuimini-menu-left-zoom .layui-nav-more:before {
     content: "\e61a";
 }