fix(admin): update password hashing method- Replace password function with password_hash for secure password storage- Use PASSWORD_DEFAULT algorithm for hashing

- Improve password security in admin controller Signed-off-by: wolfcode <wolfcode@88.com>
fix(curd): improve form element rendering and validation
2025-06-28 10:15:07 +08:00 · 2025-06-25 18:55:43 +08:00 · 2025-06-23 11:24:27 +08:00 · 2025-06-19 09:40:41 +08:00 · 2025-06-18 11:51:12 +08:00 · 2025-06-12 15:21:35 +08:00
31 changed files with 144 additions and 76 deletions
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -109,7 +109,7 @@ class Index extends AdminController

            try {
                $save = $row->save([
-                    'password' => password($post['password']),
+                    'password' => password_hash($post['password'], PASSWORD_DEFAULT),
                ]);
            }catch (Exception $e) {
                $this->error('保存失败');
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -53,7 +53,7 @@ class Login extends AdminController
        if (empty($admin)) {
            $this->error('用户不存在');
        }
-        if (password($post['password']) != $admin->password) {
+        if (!password_verify($post['password'], $admin->password)) {
            $this->error('密码输入有误');
        }
        if ($admin->status == 0) {
--- a/app/admin/controller/mall/Goods.php
+++ b/app/admin/controller/mall/Goods.php
@@ -24,7 +24,7 @@ class Goods extends AdminController
    public function __construct(App $app)
    {
        parent::__construct($app);
-        self::$model = MallGoods::class;
+        self::$model = new MallGoods();
        $this->assign('cate', MallCate::column('title', 'id'));
    }

--- a/app/admin/controller/system/Admin.php
+++ b/app/admin/controller/system/Admin.php
@@ -63,7 +63,7 @@ class Admin extends AdminController
            $rule             = [];
            $this->validate($post, $rule);
            if (empty($post['password'])) $post['password'] = '123456';
-            $post['password'] = password($post['password']);
+            $post['password'] = password_hash($post['password'],PASSWORD_DEFAULT);
            try {
                $save = self::$model::create($post);
            }catch (\Exception $e) {
@@ -114,7 +114,7 @@ class Admin extends AdminController
            }
            try {
                $save = $row->save([
-                    'password' => password($post['password']),
+                    'password' => password_hash($post['password'], PASSWORD_DEFAULT),
                ]);
            }catch (\Exception $e) {
                $this->error('保存失败');
--- a/app/admin/service/curd/BuildCurd.php
+++ b/app/admin/service/curd/BuildCurd.php
@@ -1217,6 +1217,7 @@ class BuildCurd
            } elseif ($val['formType'] == 'images') {
                $templateFile = "view{$this->DS}module{$this->DS}images";
                $define       = $val['define'] ?? '|';
+                if (strlen($define) > 5) $define = '|';
            } elseif ($val['formType'] == 'file') {
                $templateFile = "view{$this->DS}module{$this->DS}file";
            } elseif ($val['formType'] == 'files') {
@@ -1234,12 +1235,12 @@ class BuildCurd
            } elseif ($val['formType'] == 'radio') {
                $templateFile = "view{$this->DS}module{$this->DS}radio";
                if (!empty($val['define'])) {
-                    $define = $this->buildRadioView($field, '{in name="k" value="' . $val['default'] . '"}checked=""{/in}');
+                    $define = $this->buildRadioView($field, '');
                }
            } elseif ($val['formType'] == 'checkbox') {
                $templateFile = "view{$this->DS}module{$this->DS}checkbox";
                if (!empty($val['define'])) {
-                    $define = $this->buildCheckboxView($field, '{in name="k" value="' . $val['default'] . '"}checked=""{/in}');
+                    $define = $this->buildCheckboxView($field, '');
                }
            } elseif ($val['formType'] == 'select') {
                $templateFile = "view{$this->DS}module{$this->DS}select";
@@ -1308,19 +1309,19 @@ class BuildCurd
            } elseif ($val['formType'] == 'radio') {
                $templateFile = "view{$this->DS}module{$this->DS}radio";
                if (!empty($val['define'])) {
-                    $define = $this->buildRadioView($field, '{in name="k" value="$row.' . $field . '"}checked=""{/in}');
+                    $define = $this->buildRadioView($field, '{if in_array($k, $row.' . $field . ')}checked{/if}');
                }
            } elseif ($val['formType'] == 'checkbox') {
                $templateFile = "view{$this->DS}module{$this->DS}checkbox";
                if (!empty($val['define'])) {
-                    $define = $this->buildCheckboxView($field, '{in name="k" value="$row.' . $field . '"}checked=""{/in}');
+                    $define = $this->buildCheckboxView($field, '{if in_array($k, $row.' . $field . ')}checked{/if}');
                }
            } elseif ($val['formType'] == 'select') {
                $templateFile = "view{$this->DS}module{$this->DS}select";
                if (isset($val['bindRelation'])) {
-                    $define = $this->buildOptionView($field, '{in name="k" value="$row.' . $field . '"}selected=""{/in}');
+                    $define = $this->buildOptionView($field, '{if $row.' . $field . '==$k}selected{/if}');
                } elseif (!empty($val['define'])) {
-                    $define = $this->buildOptionView($field, '{in name="k" value="$row.' . $field . '"}selected=""{/in}');
+                    $define = $this->buildOptionView($field, '{if $row.' . $field . '==$k}selected{/if}');
                }
            } elseif ($field == 'remark' || $val['formType'] == 'textarea') {
                $templateFile = "view{$this->DS}module{$this->DS}textarea";
--- a/app/admin/service/curd/templates/controller/controller.code
+++ b/app/admin/service/curd/templates/controller/controller.code
@@ -16,7 +16,7 @@ class {{controllerName}} extends AdminController
    public function __construct(App $app)
    {
        parent::__construct($app);
-        self::$model = {{modelFilename}}::class;
+        self::$model = new {{modelFilename}}();
        $notes = self::$model::$notes;
        {{constructRelation}}
        $this->notes =$notes;
--- a/app/admin/view/index/edit_admin.html
+++ b/app/admin/view/index/edit_admin.html
@@ -8,7 +8,7 @@
                <div class="layui-input-block layuimini-upload">
                    <input name="head_img" class="layui-input layui-col-xs6" lay-reqtext="请上传用户头像" placeholder="请上传用户头像" value="{$row.head_img|default=''}">
                    <div class="layuimini-upload-btn">
-                        <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg"><i class="fa fa-upload"></i> 上传</a></span>
+                        <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
                        <span><a class="layui-btn layui-btn-normal" id="select_head_img" data-upload-select="head_img" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                    </div>
                </div>
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -38,7 +38,7 @@
                    <li class="layui-nav-item mobile layui-hide-xs" lay-unselect>
                        <a href="javascript:;" data-check-screen="full"><i class="fa fa-arrows-alt"></i></a>
                    </li>
-                    <li class="layui-nav-item" lay-unselect>
+                    <li class="layui-nav-item mobile layui-hide-xs" lay-unselect>
                        <div class="layui-form ws-header-theme" lay-filter="header-theme">
                            <input type="checkbox" name="theme-mode" lay-filter="header-theme-mode" lay-skin="switch">
                            <div lay-checkbox>
--- a/app/admin/view/mall/cate/add.html
+++ b/app/admin/view/mall/cate/add.html
@@ -13,8 +13,8 @@
            <div class="layui-input-block layuimini-upload">
                <input name="image" class="layui-input layui-col-xs6" lay-verify="required"  placeholder="请上传分类图片" value="">
                <div class="layuimini-upload-btn">
-                    <span><a class="layui-btn" data-upload="image" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                    <span><a class="layui-btn layui-btn-normal" id="select_image" data-upload-select="image" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                    <span><a class="layui-btn" data-upload="image" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_image" data-upload-select="image" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                </div>
            </div>
        </div>
--- a/app/admin/view/mall/cate/edit.html
+++ b/app/admin/view/mall/cate/edit.html
@@ -13,8 +13,8 @@
            <div class="layui-input-block layuimini-upload">
                <input name="image" class="layui-input layui-col-xs6" lay-verify="required" lay-reqtext="请上传分类图片" placeholder="请上传分类图片" value="{$row.image|default=''}">
                <div class="layuimini-upload-btn">
-                    <span><a class="layui-btn" data-upload="image" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                    <span><a class="layui-btn layui-btn-normal" id="select_image" data-upload-select="image" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                    <span><a class="layui-btn" data-upload="image" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_image" data-upload-select="image" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                </div>
            </div>
        </div>
--- a/app/admin/view/mall/goods/add.html
+++ b/app/admin/view/mall/goods/add.html
@@ -46,8 +46,8 @@
                    <div class="layui-input-block layuimini-upload">
                        <input name="logo" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传分类图片" value="">
                        <div class="layuimini-upload-btn">
-                            <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                            <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                            <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                            <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                        </div>
                    </div>
                </div>
@@ -57,8 +57,8 @@
                    <div class="layui-input-block layuimini-upload">
                        <input name="images" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传商品图片" value="">
                        <div class="layuimini-upload-btn">
-                            <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                            <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                            <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                            <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more"><i class="fa fa-list"></i> 选择</a></span>
                        </div>
                    </div>
                </div>
--- a/app/admin/view/mall/goods/edit.html
+++ b/app/admin/view/mall/goods/edit.html
@@ -47,8 +47,8 @@
                    <div class="layui-input-block layuimini-upload">
                        <input name="logo" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传分类图片" value="{$row.logo|default=''}">
                        <div class="layuimini-upload-btn">
-                            <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                            <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                            <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                            <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                        </div>
                    </div>
                </div>
@@ -58,8 +58,8 @@
                    <div class="layui-input-block layuimini-upload">
                        <input name="images" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传商品图片" value="{$row.images|default=''}">
                        <div class="layuimini-upload-btn">
-                            <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                            <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                            <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                            <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more"><i class="fa fa-list"></i> 选择</a></span>
                        </div>
                    </div>
                </div>
--- a/app/admin/view/system/admin/add.html
+++ b/app/admin/view/system/admin/add.html
@@ -6,8 +6,8 @@
            <div class="layui-input-block layuimini-upload">
                <input name="head_img" class="layui-input layui-col-xs6" lay-verify="required" lay-reqtext="请上传用户头像" placeholder="请上传用户头像" value="">
                <div class="layuimini-upload-btn">
-                    <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
-                    <span><a class="layui-btn layui-btn-normal" id="select_head_img" data-upload-select="head_img" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                    <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_head_img" data-upload-select="head_img" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                </div>
            </div>
        </div>
--- a/app/admin/view/system/admin/edit.html
+++ b/app/admin/view/system/admin/edit.html
@@ -6,7 +6,7 @@
            <div class="layui-input-block layuimini-upload">
                <input name="head_img" class="layui-input layui-col-xs6" lay-verify="required" lay-reqtext="请上传用户头像" placeholder="请上传用户头像" value="{$row.head_img|default=''}">
                <div class="layuimini-upload-btn">
-                    <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn" data-upload="head_img" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
                    <span><a class="layui-btn layui-btn-normal" id="select_head_img" data-upload-select="head_img" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
                </div>
            </div>
--- a/app/admin/view/system/config/logo.html
+++ b/app/admin/view/system/config/logo.html
@@ -13,7 +13,7 @@
        <div class="layui-input-block layuimini-upload">
            <input name="logo_image" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传LOGO图标" value="{:sysConfig('site','logo_image')}">
            <div class="layuimini-upload-btn">
-                <span><a class="layui-btn" data-upload="logo_image" data-upload-number="one" data-upload-exts="ico|png|jpg|jpeg"><i class="fa fa-upload"></i> 上传</a></span>
+                <span><a class="layui-btn" data-upload="logo_image" data-upload-number="one" data-upload-exts="ico|png|jpg|jpeg" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
                <span><a class="layui-btn layui-btn-normal" id="select_logo_image" data-upload-select="logo_image" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
            </div>
        </div>
--- a/app/admin/view/system/config/site.html
+++ b/app/admin/view/system/config/site.html
@@ -13,7 +13,7 @@
        <div class="layui-input-block layuimini-upload">
            <input name="site_ico" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传浏览器图标,ico类型" value="{:sysConfig('site','site_ico')}">
            <div class="layuimini-upload-btn">
-                <span><a class="layui-btn" data-upload="site_ico" data-upload-number="one" data-upload-exts="ico"><i class="fa fa-upload"></i> 上传</a></span>
+                <span><a class="layui-btn" data-upload="site_ico" data-upload-number="one" data-upload-exts="ico" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
                <span><a class="layui-btn layui-btn-normal" id="select_site_ico" data-upload-select="site_ico" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
            </div>
        </div>
@@ -24,7 +24,7 @@
        <div class="layui-input-block layuimini-upload">
            <input name="admin_background" class="layui-input layui-col-xs6" placeholder="不填默认#333333" value="{:sysConfig('site','admin_background')}">
            <div class="layuimini-upload-btn">
-                <span><a class="layui-btn" data-upload="admin_background" data-upload-number="one" data-upload-exts="png|jpg|jpeg"><i class="fa fa-upload"></i> 上传</a></span>
+                <span><a class="layui-btn" data-upload="admin_background" data-upload-number="one" data-upload-exts="png|jpg|jpeg" data-upload-mimetype="image/*"><i class="fa fa-upload"></i> 上传</a></span>
                <span><a class="layui-btn layui-btn-normal" id="select_admin_background" data-upload-select="admin_background" data-upload-number="one"><i class="fa fa-list"></i> 选择</a></span>
            </div>
        </div>
--- a/app/admin/view/system/menu/index.html
+++ b/app/admin/view/system/menu/index.html
@@ -20,4 +20,5 @@
    <button class="layui-btn layui-btn-sm layuimini-btn-primary" data-treetable-refresh><i class="fa fa-refresh"></i></button>
    <button class="layui-btn layui-btn-normal layui-btn-sm {if !auth('system.menu/add')}layui-hide{/if}" data-open="system.menu/add" data-title="添加"><i class="fa fa-plus"></i> 添加</button>
    <button class="layui-btn layui-btn-sm layui-btn-danger {if !auth('system.menu/delete')}layui-hide{/if}" data-url="system.menu/delete" data-treetable-delete="currentTableRenderId"><i class="fa fa-trash-o"></i> 删除</button>
+    <button class="layui-btn layui-btn-sm" type="button" data-treetable-arrow data-arrow="up"><i class="fa fa-arrow-up"></i> 一键折叠</button>
 </script>
--- a/app/index/controller/Install.php
+++ b/app/index/controller/Install.php
@@ -24,8 +24,8 @@ class Install extends BaseController
            $errorInfo = '已安装系统，如需重新安装请删除文件：/config/install/lock/install.lock，或者删除 /install 路由';
        }elseif (version_compare(phpversion(), '8.1.0', '<')) {
            $errorInfo = 'PHP版本不能小于8.1.0';
-        }elseif (!extension_loaded("PDO")) {
-            $errorInfo = '当前未开启PDO，无法进行安装';
+        }elseif (!extension_loaded("pdo_mysql")) {
+            $errorInfo = '当前未开启pdo_mysql，无法进行安装';
        }
        if (!is_file(root_path() . '.env')) {
            $errorInfo = '.env 文件不存在，请先配置 .env 文件';
@@ -105,12 +105,12 @@ class Install extends BaseController
            foreach ($sqlArray as $sql) {
                $pdo->query($sql);
            }
-            $_password = password($password);
-            $tableName = 'system_admin';
-            $update    = [
+            $hashedPassword = password_hash($password, PASSWORD_DEFAULT);
+            $tableName      = 'system_admin';
+            $update         = [
                'username'    => $username,
                'head_img'    => '/static/admin/images/head.jpg',
-                'password'    => $_password,
+                'password'    => $hashedPassword,
                'create_time' => time(),
                'update_time' => time()
            ];
--- a/config/install/sql/install.sql
+++ b/config/install/sql/install.sql
@@ -88,7 +88,7 @@ CREATE TABLE `ea_system_admin`
    `auth_ids`    varchar(255)         DEFAULT NULL COMMENT '角色权限ID',
    `head_img`    varchar(255)         DEFAULT NULL COMMENT '头像',
    `username`    varchar(50) NOT NULL DEFAULT '' COMMENT '用户登录名',
-    `password`    char(40)    NOT NULL DEFAULT '' COMMENT '用户登录密码',
+    `password`    varchar(255)    NOT NULL DEFAULT '' COMMENT '用户登录密码',
    `phone`       varchar(16)          DEFAULT NULL COMMENT '联系手机号',
    `remark`      varchar(255)         DEFAULT '' COMMENT '备注说明',
    `login_num`   bigint(20) unsigned DEFAULT '0' COMMENT '登录次数',
--- a/public/static/admin/js/index.js
+++ b/public/static/admin/js/index.js
@@ -146,7 +146,7 @@ define(["jquery", "easy-admin", "echarts", "echarts-theme", "miniAdmin", "miniTh
                showComposerInfo: function () {
                    // <div style="padding: 25px;">12313</div>
                    let html = ``
-                    ea.request.post({
+                    ea.request.get({
                        url: ea.url('ajax/composerInfo'),
                    }, function (success) {
                        let data = success.data
--- a/public/static/admin/js/login.js
+++ b/public/static/admin/js/login.js
@@ -27,6 +27,12 @@ define(["jquery", "easy-admin"], function ($, ea) {
                    }
                });

+                document.addEventListener('keydown', function (event) {
+                    if (event.key === 'Enter' || event.keyCode === 13) {
+                        $('.login-btn').trigger('click')
+                    }
+                });
+
                $('.login-tip').on('click', function () {
                    $('.icon-nocheck').click();
                });
--- a/public/static/admin/js/mall/goods.js
+++ b/public/static/admin/js/mall/goods.js
@@ -94,17 +94,10 @@ define(["jquery", "easy-admin"], function ($, ea) {
                },
            })

-            let colors = [
-                '#f10f0f', //  红色
-                '#ffaf00', //  橙色
-                '#FF69B4', //  猛男粉
-                '#0087ff', //  蓝色
-                '#00ff00', //  青青草原
-            ];
            var demo1 = xmSelect.render({
                el: '#demo1',
                name: 'xxx', // form表单提交的name
-                theme: {color: colors[Math.floor(Math.random() * colors.length)]},
+                theme: {color: getComputedStyle(document.documentElement).getPropertyValue('--ea8-theme-main-color') || '#16b777'},
                data: [
                    {name: 'Make', value: 1},
                    {name: 'PHP', value: 2},
@@ -123,17 +116,10 @@ define(["jquery", "easy-admin"], function ($, ea) {
                },
            })

-            let colors = [
-                '#f10f0f', //  红色
-                '#ffaf00', //  橙色
-                '#FF69B4', //  猛男粉
-                '#0087ff', //  蓝色
-                '#00ff00', //  青青草原
-            ];
            var demo1 = xmSelect.render({
                el: '#demo1',
                name: 'xxx', // form表单提交的name
-                theme: {color: colors[Math.floor(Math.random() * colors.length)]},
+                theme: {color: getComputedStyle(document.documentElement).getPropertyValue('--ea8-theme-main-color') || '#16b777'},
                data: [
                    {name: 'Make', value: 1},
                    {name: 'PHP', value: 2, selected: true,},
--- a/public/static/admin/js/system/menu.js
+++ b/public/static/admin/js/system/menu.js
@@ -121,6 +121,22 @@ define(["jquery", "easy-admin", "treetable", "iconPickerFa", "autocomplete"], fu
                return false;
            });

+            $('body').on('click', '[data-treetable-arrow]', function () {
+                const $icon = $(this).find('i');
+                const $textNode = $icon[0].nextSibling;
+                if ($icon.hasClass('fa-arrow-up')) {
+                    treetable.foldAll(init.table_elem);
+                    $icon.removeClass('fa-arrow-up').addClass('fa-arrow-down');
+                    $textNode.textContent = ' 一键展开';
+                    $(this).attr('data-arrow', 'down');
+                } else {
+                    treetable.expandAll(init.table_elem);
+                    $icon.removeClass('fa-arrow-down').addClass('fa-arrow-up');
+                    $textNode.textContent = ' 一键折叠';
+                    $(this).attr('data-arrow', 'up');
+                }
+            })
+
            ea.table.listenSwitch({filter: 'status', url: init.modify_url});

            ea.table.listenEdit(init, 'currentTable', init.table_render_id, true);
--- a/public/static/common/js/admin.js
+++ b/public/static/common/js/admin.js
@@ -154,4 +154,46 @@ function prettyFormat(str) {
        return ''
    }
    return "<pre>" + result + "</pre>"
-}
+}
+
+if (self === top) {
+    console.group('温馨提示');
+    console.log(`%c
+
+                                                        ▄▄                    ▄▄
+▀███▀▀▀███                               ██           ▀███                    ██             ▄█▄▀▄██▄
+  ██    ▀█                              ▄██▄            ██                                  ██     ██
+  ██   █   ▄█▀██▄  ▄██▀█████▀   ▀██▀   ▄█▀██▄      ▄█▀▀███ ▀████████▄█████▄ ▀███ ▀████████▄ ▀██▄  ▄▄█
+  ██████  ██   ██  ██   ▀▀ ██   ▄█    ▄█  ▀██    ▄██    ██   ██    ██    ██   ██   ██    ██  ▄█████▄
+  ██   █  ▄▄█████  ▀█████▄  ██ ▄█     ████████   ███    ██   ██    ██    ██   ██   ██    ██ ██   ▀███
+  ██     ▄██   ██  █▄   ██   ███     █▀      ██  ▀██    ██   ██    ██    ██   ██   ██    ██ ██    ▀██
+▄██████████████▀██▄██████▀   ▄█    ▄███▄   ▄████▄ ▀████▀███▄████  ████  ████▄████▄████  ████▄███████
+                           ▄█
+                         ██▀
+%c
+
+官方网站：https://easyadmin8.top
+
+官方文档：https://edocs.easyadmin8.top
+
+问答社区：https://meta.easyadmin8.top
+
+%c重要事情说3遍：
+%c
+常见问题：https://easyadmin8.top/guide/question.html
+
+常见问题：https://easyadmin8.top/guide/question.html
+
+常见问题：https://easyadmin8.top/guide/question.html
+
+%c遇到问题先把 DEBUG 模式打开，然后把错误信息找出来，当不能解决的时候再去社区提问或者QQ群交流
+`,
+        "color:#4290f7;font-weight:bold;font-size:10px;",
+        "color:#5672cd;",
+        "color:#ff5722;font-weight:bold;font-size:1rem;",
+        "color:#5672cd;",
+        "color:#ff5722;font-weight:bold;font-size:1rem;background:#f9de97;",
+    );
+    console.groupEnd();
+}
+
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -2,13 +2,16 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function

    //切换日夜模式
    window.onInitElemStyle = function () {
-        miniTheme.renderElemStyle();
-        $('iframe').each(function (index, iframe) {
-            if (typeof iframe.contentWindow.onInitElemStyle == "function") {
-                iframe.contentWindow.onInitElemStyle();
-            }
-        });
-        miniTheme.changeThemeMainColor();
+        try {
+            miniTheme.renderElemStyle();
+            $('iframe').each(function (index, iframe) {
+                if (typeof iframe.contentWindow.onInitElemStyle == "function") {
+                    iframe.contentWindow.onInitElemStyle();
+                }
+            });
+            miniTheme.changeThemeMainColor();
+        } catch (e) {
+        }
    };
    window.onInitElemStyle();

@@ -373,7 +376,7 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                                var selectHtml = '';
                                $.each(d.selectList, function (sI, sV) {
                                    var selected = '';
-                                    if (sI === d.searchValue) {
+                                    if (sI == d.searchValue) {
                                        selected = 'selected=""';
                                    }
                                    selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
@@ -396,7 +399,7 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                                formHtml += '\t<div class="layui-form-item layui-inline">\n' +
                                    '<label class="layui-form-label">' + d.title + '</label>\n' +
                                    '<div class="layui-input-inline">\n' +
-                                    '<div id="c-' + d.fieldAlias + '" class="tableSearch-xmSelect xmSelect-' + d.fieldAlias + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp + '"></div>\n' +
+                                    '<div id="c-' + d.fieldAlias + '" class="tableSearch-xmSelect xmSelect-' + d.fieldAlias + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp + '" data-search-value="' + d.searchValue + '"></div>\n' +
                                    '</div>\n' +
                                    '</div>';
                                init.xmSelectList[d.fieldAlias] = d.selectList
@@ -874,12 +877,15 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
            listenTableSearch: function (tableId) {
                if (Object.keys(init.xmSelectList).length > 0) {
                    $.each(init.xmSelectList, function (index, value) {
+                        let xmSearchValue = $('#c-' + index).data('search-value') || [];
+                        if (!Array.isArray(xmSearchValue)) xmSearchValue = (xmSearchValue.toString()).split(',')
                        const keysArray = Object.keys(value).map((key) => {
-                            return {name: value[key], value: key}
+                            return {name: value[key], value: key, selected: xmSearchValue.indexOf(key) !== -1}
                        })
                        init.xmSelectModel[index] = xmSelect.render({
                            el: '.xmSelect-' + index, language: 'zn', data: keysArray, name: index,
-                            filterable: true, paging: true, pageSize: 10, theme: {color: '#16b777'}, toolbar: {show: true},
+                            filterable: true, paging: true, pageSize: 10, toolbar: {show: true},
+                            theme: {color: getComputedStyle(document.documentElement).getPropertyValue('--ea8-theme-main-color') || '#16b777'}
                        })
                    })
                }
--- a/public/static/plugs/lay-module/layuimini/layuimini.css
+++ b/public/static/plugs/lay-module/layuimini/layuimini.css
@@ -83,6 +83,7 @@
    display: inline-block;
    height: 40px;
    vertical-align: middle;
+    border-radius: 50%;
 }

 .layui-layout-admin .layuimini-logo h1 {
@@ -637,9 +638,10 @@
 .layuimini-tab-mousedown {
    display: none;
    width: 80px;
-    position: absolute;
-    top: 0px !important;
-    left: 0px !important;
+    position: fixed;
+    top: 55px !important;
+    left: 0 !important;
+    z-index: 99999;
 }

 .layuimini-tab-mousedown dd a {
--- a/public/static/plugs/lay-module/layuimini/miniAdmin.js
+++ b/public/static/plugs/lay-module/layuimini/miniAdmin.js
@@ -360,7 +360,7 @@ define(["jquery", "miniMenu", "miniTheme", "miniTab", "colorMode"], function ($,
             * 刷新
             */
            $('body').on('click', '[data-refresh]', function () {
-                $(".layui-tab-item.layui-show").find("iframe")[0].contentWindow.location.reload();
+                $(".layui-tabs-item.layui-show").find("iframe")[0].contentWindow.location.reload();
                miniAdmin.success('刷新成功');
            });

--- a/public/static/plugs/lay-module/layuimini/miniMenu.js
+++ b/public/static/plugs/lay-module/layuimini/miniMenu.js
@@ -94,7 +94,14 @@ define(["jquery"], function ($) {
        renderLeftMenu :function(leftMenus,options){
            options = options || {};
            var me = this ;
-            var leftMenusHtml =  me.each(leftMenus || [],function (idx,leftMenu) { // 左侧菜单遍历
+            let _i = 0
+            // 左侧菜单遍历
+            var leftMenusHtml =  me.each(leftMenus || [],function (idx,leftMenu) {
+                $(leftMenu).each(function (index, child) {
+                    options.childOpenClass = ''
+                    if (child.child && child.child.length && _i === 0) options.childOpenClass = ' layui-nav-itemed'
+                    _i++
+                })
                var children = me.renderChildrenMenu(leftMenu.child, { childOpenClass:options.childOpenClass });
                var leftMenuHtml = me.compileMenu({
                    href:leftMenu.href,
--- a/public/static/plugs/lay-module/layuimini/miniTab.js
+++ b/public/static/plugs/lay-module/layuimini/miniTab.js
@@ -313,9 +313,10 @@ define(["jquery"], function ($) {
             * 注册鼠标右键
             */
            $('body').on('mousedown', '.layuimini-tab .layui-tabs-header li', function (e) {
-                var left = $(this).offset().left - $('.layuimini-tab ').offset().left + ($(this).width() / 2),
+                var left = e.pageX ,
                    tabId = $(this).attr('lay-id');
                if (e.which === 3) {
+                    e.preventDefault();
                    miniTab.openTabRignMenu(tabId, left);
                }
            });
--- a/public/static/plugs/layui-v2.x/css/layui.css
+++ b/public/static/plugs/layui-v2.x/css/layui.css
--- a/public/static/plugs/layui-v2.x/layui.js
+++ b/public/static/plugs/layui-v2.x/layui.js
Author	SHA1	Message	Date
wolfcode	e4ae29fed2	fix(admin): update password hashing method- Replace `password` function with `password_hash` for secure password storage- Use `PASSWORD_DEFAULT` algorithm for hashing - Improve password security in admin controller Signed-off-by: wolfcode <wolfcode@88.com>	2025-06-28 10:15:07 +08:00
wolfcode	c82e1c8ea3	fix(curd): improve form element rendering and validation - Add length validation for images form type - Update radio and checkbox view generation to use correct syntax- Improve select option view generation with more accurate conditions	2025-06-25 18:55:43 +08:00
wolfcode	3f718beacb	fix(admin): update password hashing method-Replace custom password function with PHP's built-in password_hash - Improve password security in admin controller	2025-06-23 11:24:27 +08:00
wolfcode	af44a9e7b8	🚀 Layui v2.11.3	2025-06-19 09:40:41 +08:00
wolfcode	4ed8237a00	refactor(auth): upgrade password hashing to PHP's password_hash - Replace custom password hashing function with PHP's built-in password_hash - Update password verification to use password_verify - Adjust database schema to accommodate new password hash length - Modify installation and login controllers to use new hashing method	2025-06-18 11:51:12 +08:00
wolfcode	216ca6e697	fix(install): update PDO extension check to pdo_mysql - Change extension check from PDO to pdo_mysql for MySQL database support - Improve error message for better user understanding	2025-06-12 15:21:35 +08:00
wolfcode	969a7a5ce5	fix(easy-admin): try-catch onInitElemStyle and hide theme switch on mobile - Add try-catch block around onInitElemStyle function to handle potential errors - Hide theme switch option on mobile devices to improve user experience	2025-06-09 14:37:58 +08:00
wolfcode	5593a20009	feat(layuimini): improve menu rendering and add keyboard event handling - Add border-radius to layuimini-logo for rounded corners - Implement Enter key event handling for login button- Enhance miniMenu rendering logic for better menu display	2025-06-04 11:14:55 +08:00
wolfcode	8a33a4fed3	fix(easy-admin): improve select component rendering and initialization - Update select component initialization to properly set selected values - Modify search value comparison to use loose equality for broader compatibility - Enhance xmSelect rendering with pre-selected values	2025-05-20 10:22:50 +08:00
wolfcode	a4e8a86045	🚀 Layui v2.11.2	2025-05-19 18:30:34 +08:00
wolfcode	61e622d2ad	refactor(controller): instantiate model class instead of assigning model name - Change {{modelFilename}}::class to new {{modelFilename}}() in controller constructor- This modification allows direct access to model properties and methods	2025-05-14 12:32:02 +08:00
wolfcode	1b3265aeb5	feat(menu): add toggle buttons for menu folding and unfolding - Add a new button for toggling menu folding and unfolding - Implement functionality to fold and unfold all menu items - Update button text and icon based on current state (folded/unfolded)	2025-05-13 14:06:20 +08:00
wolfcode	e1c0f6c881	feat(admin): add MIME type for logo upload - Add image MIME type to the logo upload input - This change improves file type restriction for logo uploads	2025-05-09 11:37:38 +08:00
wolfcode	3891cf8898	🚀 Layui v2.11.1	2025-05-06 15:59:24 +08:00
wolfcode	4ade618657	fix: correct class selector for tab item in refresh function - Update the class selector from "layui-tab-item" to "layui-tabs-item" in the refresh function - This change ensures that the correct tab item is targeted for refreshing	2025-04-30 11:10:29 +08:00
wolfcode	e7253e7de0	fix(layuimini): improve tab context menu positioning and behavior - Update tab context menu CSS to use fixed positioning with higher z-index - Modify JavaScript to prevent default context menu and use correct left position	2025-04-28 15:33:50 +08:00
wolfcode	063108a846	feat(easy-admin): dynamic theme color for xmSelect - Replace static color codes with dynamic theme color retrieval - Use getComputedStyle to fetch the '--ea8-theme-main-color' variable - Update xmSelect instances in easy-admin.js and goods.js to use dynamic color	2025-04-22 18:16:26 +08:00