Update welcome.html

🚀 Layui v2.11.0
2025-04-22 16:04:04 +08:00 · 2025-04-22 15:46:10 +08:00 · 2025-04-22 15:26:25 +08:00 · 2025-04-21 18:03:39 +08:00 · 2025-04-18 15:16:06 +08:00 · 2025-04-17 17:25:06 +08:00
28 changed files with 509 additions and 165 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ Thumbs.db
 /vendor
 /.settings
 /.buildpath
-/.project
+/.project
--- a/app/admin/service/curd/BuildCurd.php
+++ b/app/admin/service/curd/BuildCurd.php
@@ -355,6 +355,7 @@ class BuildCurd
            if (!empty($bindSelectField) && !in_array($bindSelectField, array_column($columns, 'Field'))) {
                throw new TableException("关联表{$relationTable}不存在该字段: {$bindSelectField}");
            }
+            $onlyFields = [];
            foreach ($columns as $vo) {
                if (empty($primaryKey) && $vo['Key'] == 'PRI') {
                    $primaryKey = $vo['Field'];
@@ -362,6 +363,7 @@ class BuildCurd
                if (!empty($onlyShowFields) && !in_array($vo['Field'], $onlyShowFields)) {
                    continue;
                }
+                if (!empty($onlyShowFields)) $onlyFields[] = $vo['Field'];
                $colum = [
                    'type'    => $vo['Type'],
                    'comment' => $vo['Comment'],
@@ -388,6 +390,7 @@ class BuildCurd
                'bindSelectField' => $bindSelectField,
                'delete'          => $delete,
                'tableColumns'    => $formatColumns,
+                'onlyFields'      => $onlyFields,
            ];
            if (!empty($bindSelectField)) {
                $relationArray                                      = explode('\\', $modelFilename);
@@ -1038,7 +1041,7 @@ class BuildCurd
            $relationCode = '';
            foreach ($this->relationArray as $key => $val) {
                $relation     = CommonTool::lineToHump($key);
-                $relationCode = "->withJoin('{$relation}', 'LEFT')\r";
+                $relationCode = "withJoin('{$relation}', 'LEFT')";
                if (!empty($val['bindSelectField']) && !empty($val['primaryKey'])) {
                    $constructRelation = '$notes["' . lcfirst($val['foreignKey']) . '"] = \app\admin\model\\' . $val['modelFilename'] . '::column("' . $val['bindSelectField'] . '", "' . $val['primaryKey'] . '");';
                }
@@ -1092,16 +1095,17 @@ class BuildCurd
        $relationList = '';
        if (!empty($this->relationArray)) {
            foreach ($this->relationArray as $key => $val) {
-                $relation = CommonTool::lineToHump($key);
-                //                $relationCode = CommonTool::replaceTemplate(
-                //                    $this->getTemplate("model{$this->DS}relation"),
-                //                    [
-                //                        'relationMethod' => $relation,
-                //                        'relationModel'  => "\app\admin\model\\{$val['modelFilename']}",
-                //                        'foreignKey'     => $val['foreignKey'],
-                //                        'primaryKey'     => $val['primaryKey'],
-                //                    ]);
-                //                $relationList .= $relationCode;
+                $relation     = CommonTool::lineToHump($key);
+                $relationCode = CommonTool::replaceTemplate(
+                    $this->getTemplate("model{$this->DS}relation"),
+                    [
+                        'relationMethod' => $relation,
+                        'relationModel'  => "{$val['modelFilename']}::class",
+                        'foreignKey'     => $val['foreignKey'],
+                        'primaryKey'     => $val['primaryKey'],
+                        'relationFields' => empty($val['onlyFields']) ? "" : "->field('{$val['primaryKey']}," . implode(',', $val['onlyFields']) . "')",
+                    ]);
+                $relationList .= $relationCode;
            }
        }

@@ -1343,6 +1347,15 @@ class BuildCurd
        );
        $this->fileList[$viewEditFile] = $viewEditValue;

+        $viewRecycleFile                  = "{$this->rootDir}app{$this->DS}admin{$this->DS}view{$this->DS}{$this->viewFilename}{$this->DS}recycle.html";
+        $viewRecycleValue                 = CommonTool::replaceTemplate(
+            $this->getTemplate("view{$this->DS}recycle"),
+            [
+                'controllerUrl' => $this->controllerUrl,
+                'notesScript'   => $this->formatNotesScript(),
+            ]
+        );
+        $this->fileList[$viewRecycleFile] = $viewRecycleValue;
        return $this;
    }

@@ -1363,7 +1376,7 @@ class BuildCurd
                $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.image}";
            } elseif ($val['formType'] == 'datetime') {
                $templateValue = "{field: '{$field}', search: 'range', title: '{$val['comment']}'}";
-            }  elseif ($val['formType'] == 'images') {
+            } elseif ($val['formType'] == 'images') {
                continue;
            } elseif ($val['formType'] == 'file') {
                $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.url}";
@@ -1390,13 +1403,12 @@ class BuildCurd
            } else {
                $templateValue = "{field: '{$field}', title: '{$val['comment']}'}";
            }
-
            $indexCols .= $this->formatColsRow("{$templateValue},\r");
        }

        // 关联表
        foreach ($this->relationArray as $table => $tableVal) {
-            $table = CommonTool::lineToHump($table);
+            $table = CommonTool::humpToLine($table);
            foreach ($tableVal['tableColumns'] as $field => $val) {
                if ($val['formType'] == 'image') {
                    $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', templet: ea.table.image}";
@@ -1417,20 +1429,22 @@ class BuildCurd
                } elseif (in_array($field, $this->sortFields)) {
                    $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', edit: 'text'}";
                } else {
-                    $templateValue = "";
+                    $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}'}";
                }

                if ($templateValue) $indexCols .= $this->formatColsRow("{$templateValue},\r");
            }
        }

-        $indexCols .= $this->formatColsRow("{width: 250, title: '操作', templet: ea.table.tool},\r");
+        $recycleCols = $indexCols;
+        $indexCols   .= $this->formatColsRow("{width: 250, title: '操作', templet: ea.table.tool},\r");

        $jsValue                 = CommonTool::replaceTemplate(
            $this->getTemplate("static{$this->DS}js"),
            [
                'controllerUrl' => $this->controllerUrl,
                'indexCols'     => $indexCols,
+                'recycleCols'   => $recycleCols,
            ]
        );
        $this->fileList[$jsFile] = $jsValue;
--- a/app/admin/service/curd/templates/controller/controller.code
+++ b/app/admin/service/curd/templates/controller/controller.code
@@ -17,8 +17,9 @@ class {{controllerName}} extends AdminController
    {
        parent::__construct($app);
        self::$model = {{modelFilename}}::class;
-        $this->notes = $notes = self::$model::$notes;
+        $notes = self::$model::$notes;
        {{constructRelation}}
+        $this->notes =$notes;
        $this->assign(compact('notes'));
    }

--- a/app/admin/service/curd/templates/controller/indexMethod.code
+++ b/app/admin/service/curd/templates/controller/indexMethod.code
@@ -0,0 +1,21 @@
+
+    #[NodeAnnotation(title: '列表', auth: true)]
+    public function index(\app\Request $request): \think\response\Json|string
+    {
+        if ($request->isAjax()) {
+            if (input('selectFields')) {
+                return $this->selectList();
+            }
+            list($page, $limit, $where) = $this->buildTableParams();
+            $count = self::$model::where($where)->{{relationIndexMethod}}->count();
+            $list  = self::$model::where($where)->{{relationIndexMethod}}->page($page, $limit)->order($this->sort)->select()->toArray();
+            $data  = [
+                'code'  => 0,
+                'msg'   => '',
+                'count' => $count,
+                'data'  => $list,
+            ];
+            return json($data);
+        }
+        return $this->fetch();
+    }
--- a/app/admin/service/curd/templates/model/model.code
+++ b/app/admin/service/curd/templates/model/model.code
@@ -18,4 +18,6 @@ class {{modelName}} extends TimeModel

    public static array $notes = {{selectArrays}};

+    {{relationList}}
+
 }
--- a/app/admin/service/curd/templates/model/relation.code
+++ b/app/admin/service/curd/templates/model/relation.code
@@ -1,5 +1,5 @@

    public function {{relationMethod}}()
    {
-        return $this->belongsTo('{{relationModel}}', '{{foreignKey}}', '{{primaryKey}}');
+        return $this->belongsTo({{relationModel}}, '{{foreignKey}}', '{{primaryKey}}'){{relationFields}};
    }
--- a/app/admin/service/curd/templates/static/js.code
+++ b/app/admin/service/curd/templates/static/js.code
@@ -9,6 +9,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
        delete_url: '{{controllerUrl}}/delete',
        export_url: '{{controllerUrl}}/export',
        modify_url: '{{controllerUrl}}/modify',
+        recycle_url: '{{controllerUrl}}/recycle',
    };

    return {
@@ -29,5 +30,62 @@ define(["jquery", "easy-admin"], function ($, ea) {
        edit: function () {
            ea.listen();
        },
+        recycle: function () {
+            init.index_url = init.recycle_url;
+            ea.table.render({
+                init: init,
+                toolbar: ['refresh',
+                    [{
+                        class: 'layui-btn layui-btn-sm',
+                        method: 'get',
+                        field: 'id',
+                        icon: 'fa fa-refresh',
+                        text: '全部恢复',
+                        title: '确定恢复？',
+                        auth: 'recycle',
+                        url: init.recycle_url + '?type=restore',
+                        checkbox: true
+                    }, {
+                        class: 'layui-btn layui-btn-danger layui-btn-sm',
+                        method: 'get',
+                        field: 'id',
+                        icon: 'fa fa-delete',
+                        text: '彻底删除',
+                        title: '确定彻底删除？',
+                        auth: 'recycle',
+                        url: init.recycle_url + '?type=delete',
+                        checkbox: true
+                    }], 'export',
+                ],
+                cols: [[
+                {{recycleCols}}
+                    {
+                        width: 250,
+                        title: '操作',
+                        templet: ea.table.tool,
+                        operat: [
+                            [{
+                                title: '确认恢复？',
+                                text: '恢复数据',
+                                filed: 'id',
+                                url: init.recycle_url + '?type=restore',
+                                method: 'get',
+                                auth: 'recycle',
+                                class: 'layui-btn layui-btn-xs layui-btn-success',
+                            }, {
+                                title: '想好了吗？',
+                                text: '彻底删除',
+                                filed: 'id',
+                                method: 'get',
+                                url: init.recycle_url + '?type=delete',
+                                auth: 'recycle',
+                                class: 'layui-btn layui-btn-xs layui-btn-normal layui-bg-red',
+                            }]]
+                    }
+                ]],
+            });
+
+            ea.listen();
+        },
    };
 });
--- a/app/admin/service/curd/templates/view/index.code
+++ b/app/admin/service/curd/templates/view/index.code
@@ -4,6 +4,7 @@
               data-auth-add="{:auth('{{controllerUrl}}/add')}"
               data-auth-edit="{:auth('{{controllerUrl}}/edit')}"
               data-auth-delete="{:auth('{{controllerUrl}}/delete')}"
+               data-auth-recycle="{:auth('{{controllerUrl}}/recycle')}"
               lay-filter="currentTable">
               <!-- searchTableShow="false" 隐藏搜索框 -->
        </table>
--- a/app/admin/service/curd/templates/view/recycle.code
+++ b/app/admin/service/curd/templates/view/recycle.code
@@ -0,0 +1,13 @@
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <table id="currentTable" class="layui-table layui-hide"
+               data-auth-recycle="{:auth('{{controllerUrl}}/recycle')}"
+               lay-filter="currentTable">
+               <!-- searchTableShow="false" 隐藏搜索框 -->
+        </table>
+    </div>
+</div>
+
+<script>
+{{notesScript}}
+</script>
--- a/app/admin/traits/Curd.php
+++ b/app/admin/traits/Curd.php
@@ -5,6 +5,7 @@ namespace app\admin\traits;
 use app\admin\service\annotation\NodeAnnotation;
 use app\admin\service\tool\CommonTool;
 use app\Request;
+use think\db\exception\PDOException;
 use think\facade\Db;
 use think\response\Json;

@@ -154,4 +155,49 @@ trait Curd
        $this->success('保存成功');
    }

+    #[NodeAnnotation(title: '回收站', auth: true)]
+    public function recycle(Request $request): Json|string
+    {
+        if (!$request->isAjax()) {
+            return $this->fetch();
+        }
+        $id              = $request->param('id', []);
+        $type            = $request->param('type', '');
+        $deleteTimeField = (new self::$model)->getOption('deleteTime'); // 获取软删除字段
+        $defaultErrorMsg = 'Model 中未设置软删除 deleteTime 对应字段 或 数据表中不存在该字段';
+        if (!$deleteTimeField) $this->success($defaultErrorMsg);
+        switch ($type) {
+            case 'restore':
+                self::$model::withTrashed()->whereIn('id', $id)->strict(false)->update([$deleteTimeField => null, 'update_time' => time()]);
+                $this->success('success');
+                break;
+            case 'delete':
+                self::$model::destroy($id, true);
+                $this->success('success');
+                break;
+            default:
+                list($page, $limit, $where) = $this->buildTableParams();
+                try {
+                    $count = self::$model::withTrashed()->where($where)->whereNotNull($deleteTimeField)->count();
+                    $list  = self::$model::withTrashed()->where($where)->page($page, $limit)->order($this->sort)->whereNotNull($deleteTimeField)->select()->toArray();
+                    $data  = [
+                        'code'  => 0,
+                        'msg'   => '',
+                        'count' => $count,
+                        'data'  => $list,
+                    ];
+                } catch (\Throwable $e) {
+                    $error = $e->getMessage();
+                    if ($e instanceof PDOException) $error .= '<br>' . $defaultErrorMsg;
+                    $data = [
+                        'code'  => -1,
+                        'msg'   => $error,
+                        'count' => 0,
+                        'data'  => [],
+                    ];
+                }
+                return json($data);
+        }
+
+    }
 }
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -91,8 +91,8 @@
        <div class="layuimini-site-mobile"><i class="layui-icon"></i></div>

        <div class="layui-body">
-            <div class="layuimini-tab layui-tab-rollTool layui-tab" lay-filter="layuiminiTab" lay-allowclose="true">
-                <ul class="layui-tab-title">
+            <div class="layuimini-tab layui-tabs-rollTool layui-tabs" lay-filter="layuiminiTab" id="layuiminiTab">
+                <ul class="layui-tabs-header">
                    <li class="layui-this" id="layuiminiHomeTabId" lay-id=""></li>
                </ul>
                <div class="layui-tab-control">
@@ -111,8 +111,8 @@
                        </ul>
                    </li>
                </div>
-                <div class="layui-tab-content">
-                    <div id="layuiminiHomeTabIframe" class="layui-tab-item layui-show"></div>
+                <div class="layui-tabs-body">
+                    <div id="layuiminiHomeTabIframe" class="layui-tab-item layui-tabs-item layui-show"></div>
                </div>
            </div>
        </div>
--- a/app/admin/view/index/welcome.html
+++ b/app/admin/view/index/welcome.html
@@ -16,8 +16,8 @@
                                                    <span class="layui-badge layui-bg-cyan pull-right ">实时</span>
                                                    <div class="panel-content">
                                                        <h5>用户统计</h5>
-                                                        <h1>1234</h1>
-                                                        <h6>当前分类总记录数</h6>
+                                                        <h2>1234</h2>
+                                                        <h6>记录数</h6>
                                                    </div>
                                                </div>
                                            </div>
@@ -28,8 +28,8 @@
                                                    <span class="layui-badge layui-bg-purple pull-right ">实时</span>
                                                    <div class="panel-content">
                                                        <h5>商品统计</h5>
-                                                        <h1>1234</h1>
-                                                        <h6>当前分类总记录数</h6>
+                                                        <h2>1234</h2>
+                                                        <h6>记录数</h6>
                                                    </div>
                                                </div>
                                            </div>
@@ -40,8 +40,8 @@
                                                    <span class="layui-badge layui-bg-orange pull-right ">实时</span>
                                                    <div class="panel-content">
                                                        <h5>浏览统计</h5>
-                                                        <h1>1234</h1>
-                                                        <h6>当前分类总记录数</h6>
+                                                        <h2>1234</h2>
+                                                        <h6>记录数</h6>
                                                    </div>
                                                </div>
                                            </div>
@@ -52,8 +52,8 @@
                                                    <span class="layui-badge layui-bg-red pull-right ">实时</span>
                                                    <div class="panel-content">
                                                        <h5>订单统计</h5>
-                                                        <h1>1234</h1>
-                                                        <h6>当前分类总记录数</h6>
+                                                        <h2>1234</h2>
+                                                        <h6>记录数</h6>
                                                    </div>
                                                </div>
                                            </div>
@@ -199,7 +199,7 @@
                    <div class="layui-card-header"><i class="fa fa-paper-plane-o icon"></i>作者心语</div>
                    <div class="layui-card-body layui-text">
                        <p>
-                            本模板基于layui2.9.x以及font-awesome-4.7.0进行实现。
+                            本模板基于layui2.x以及font-awesome-4.7.0进行实现。
                            <a class="layui-btn layui-btn-xs layui-btn-danger" style="vertical-align: baseline;" target="_blank" href="http://layui.dev/docs">layui文档</a>
                        </p>
                        <hr>
--- a/app/admin/view/mall/goods/add.html
+++ b/app/admin/view/mall/goods/add.html
@@ -91,6 +91,14 @@
                    </div>
                </div>

+                <!-- 文档：https://xm-select.com/file/xm-select/v1.2.4/#/basic/use -->
+                <div class="layui-form-item">
+                    <label class="layui-form-label">模拟多选</label>
+                    <div class="layui-input-block">
+                        <div id="demo1" class="xm-select-demo"></div>
+                    </div>
+                </div>
+
                <div class="layui-form-item layui-form-text">
                    <label class="layui-form-label">备注信息</label>
                    <div class="layui-input-block">
--- a/app/admin/view/mall/goods/edit.html
+++ b/app/admin/view/mall/goods/edit.html
@@ -35,7 +35,7 @@
                                </div>
                            </div>
                            <div class="layui-col-xs2">
-                                <button class="layui-btn layui-bg-purple layui-btn-fluid" type="button" lay-on="AiOptimization">AI优化</button>
+                                <button class="layui-btn layui-bg-purple" type="button" lay-on="AiOptimization">AI优化</button>
                            </div>
                        </div>
                    </div>
@@ -92,6 +92,14 @@
                    </div>
                </div>

+                <!-- 文档：https://xm-select.com/file/xm-select/v1.2.4/#/basic/use -->
+                <div class="layui-form-item">
+                    <label class="layui-form-label">模拟多选</label>
+                    <div class="layui-input-block">
+                        <div id="demo1" class="xm-select-demo"></div>
+                    </div>
+                </div>
+
                <div class="layui-form-item layui-form-text">
                    <label class="layui-form-label">备注信息</label>
                    <div class="layui-input-block">
--- a/app/admin/view/mall/goods/index.html
+++ b/app/admin/view/mall/goods/index.html
@@ -5,6 +5,7 @@
               data-auth-edit="{:auth('mall.goods/edit')}"
               data-auth-delete="{:auth('mall.goods/delete')}"
               data-auth-stock="{:auth('mall.goods/stock')}"
+               data-auth-recycle="{:auth('mall.goods/recycle')}"
               lay-filter="currentTable">
        </table>
    </div>
--- a/app/admin/view/mall/goods/recycle.html
+++ b/app/admin/view/mall/goods/recycle.html
@@ -0,0 +1,11 @@
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <table id="currentTable" class="layui-table layui-hide"
+               data-auth-recycle="{:auth('mall.goods/recycle')}"
+               lay-filter="currentTable">
+        </table>
+    </div>
+</div>
+<script>
+    let cateSelects = JSON.parse('{$cate|json_encode=256|raw}')
+</script>
--- a/extend/.gitignore
+++ b/extend/.gitignore
@@ -1,2 +1,2 @@
 *
-!.gitignore
+!.gitignore
--- a/public/static/admin/css/public.css
+++ b/public/static/admin/css/public.css
@@ -4,6 +4,10 @@
@import url("../css/themes/index.css");
@import url("../css/iconfont.css");

+:root {
+    --ea8-theme-main-color: #16b777;
+}
+
 html,
 body {
    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -75,8 +79,8 @@ body {

 /**重写layui表格自适应*/
 .layuimini-container .layui-table-cell {
-    height: 100%;
-    max-width: 100%;
+    height: 50px;
+    line-height: 42px;
 }

 /**数据表格-搜索表单样式*/
@@ -304,9 +308,17 @@ table样式
 }

 .layui-form-select dl {
-    border: 1px #16b777 solid;
+    border: 1px var(--ea8-theme-main-color) solid;
    border-top: none;
    z-index: 99999;
+    padding: 0;
+    border-radius: 0;
+}
+
+.layui-form-select dl dd.layui-this {
+    background-color: var(--ea8-theme-main-color);
+    border-top: none;
+    color: #ffffff;
 }

 .form-search .layui-form-select dl {
@@ -517,4 +529,12 @@ table样式
 .wangEditor_div {
    z-index: 99999;
    border: 1px solid var(--w-e-textarea-slight-border-color);
+}
+
+.layui-input:focus, .layui-textarea:focus {
+    border-color: var(--ea8-theme-main-color) !important;
+}
+
+.layui-tabs-item {
+    height: 100%;
 }
--- a/public/static/admin/js/mall/goods.js
+++ b/public/static/admin/js/mall/goods.js
@@ -10,6 +10,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
        export_url: 'mall.goods/export',
        modify_url: 'mall.goods/modify',
        stock_url: 'mall.goods/stock',
+        recycle_url: 'mall.goods/recycle',
    };

    return {
@@ -27,7 +28,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
                        icon: 'fa fa-plus ',
                        extend: 'data-width="90%" data-height="95%"',
                    }],
-                    'delete', 'export'],
+                    'delete', 'export', 'recycle'],
                cols: [[
                    {type: "checkbox"},
                    {field: 'id', width: 80, title: 'ID', searchOp: '='},
@@ -92,6 +93,25 @@ define(["jquery", "easy-admin"], function ($, ea) {
                    aiOptimization(data)
                },
            })
+
+            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)]},
+                data: [
+                    {name: 'Make', value: 1},
+                    {name: 'PHP', value: 2},
+                    {name: 'Great Again', value: 3},
+                ]
+            })
+
            ea.listen();
        },
        edit: function () {
@@ -102,11 +122,102 @@ define(["jquery", "easy-admin"], function ($, ea) {
                    aiOptimization(data)
                },
            })
+
+            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)]},
+                data: [
+                    {name: 'Make', value: 1},
+                    {name: 'PHP', value: 2, selected: true,},
+                    {name: 'Great Again', value: 3, selected: true,},
+                ]
+            })
+
            ea.listen();
        },
        stock: function () {
            ea.listen();
        },
+        recycle: function () {
+            init.index_url = init.recycle_url;
+            ea.table.render({
+                init: init,
+                toolbar: ['refresh',
+                    [{
+                        class: 'layui-btn layui-btn-sm',
+                        method: 'get',
+                        field: 'id',
+                        icon: 'fa fa-refresh',
+                        text: '全部恢复',
+                        title: '确定恢复？',
+                        auth: 'recycle',
+                        url: init.recycle_url + '?type=restore',
+                        checkbox: true
+                    }, {
+                        class: 'layui-btn layui-btn-danger layui-btn-sm',
+                        method: 'get',
+                        field: 'id',
+                        icon: 'fa fa-delete',
+                        text: '彻底删除',
+                        title: '确定彻底删除？',
+                        auth: 'recycle',
+                        url: init.recycle_url + '?type=delete',
+                        checkbox: true
+                    }], 'export',
+                ],
+                cols: [[
+                    {type: "checkbox"},
+                    {field: 'id', width: 80, title: 'ID', searchOp: '='},
+                    {field: 'sort', width: 80, title: '排序', edit: 'text'},
+                    {field: 'cate_id', minWidth: 80, title: '商品分类', search: 'select', selectList: cateSelects, laySearch: true},
+                    {field: 'title', minWidth: 80, title: '商品名称'},
+                    {field: 'logo', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image},
+                    {field: 'status', title: '状态', width: 85, selectList: {0: '禁用', 1: '启用'}},
+                    // 演示多选，实际数据库并无 status2 字段，搜索后会报错
+                    {
+                        field: 'status2', title: '演示多选', width: 105, search: 'xmSelect', selectList: {1: '模拟选项1', 2: '模拟选项2', 3: '模拟选项3', 4: '模拟选项4', 5: '模拟选项5'},
+                        searchOp: 'in', templet: function (res) {
+                            // 根据自己实际项目进行输出
+                            return res?.status2 || '模拟数据'
+                        }
+                    },
+                    {field: 'create_time', minWidth: 80, title: '创建时间', search: 'range'},
+                    {field: 'delete_time', minWidth: 80, title: '删除时间', search: 'range'},
+                    {
+                        width: 250,
+                        title: '操作',
+                        templet: ea.table.tool,
+                        operat: [
+                            [{
+                                title: '确认恢复？',
+                                text: '恢复数据',
+                                filed: 'id',
+                                url: init.recycle_url + '?type=restore',
+                                method: 'get',
+                                auth: 'recycle',
+                                class: 'layui-btn layui-btn-xs layui-btn-success',
+                            }, {
+                                title: '想好了吗？',
+                                text: '彻底删除',
+                                filed: 'id',
+                                method: 'get',
+                                url: init.recycle_url + '?type=delete',
+                                auth: 'recycle',
+                                class: 'layui-btn layui-btn-xs layui-btn-normal layui-bg-red',
+                            }]]
+                    }
+                ]],
+            });
+            ea.listen();
+        },
    };

    function aiOptimization(data) {
--- a/public/static/admin/js/system/node.js
+++ b/public/static/admin/js/system/node.js
@@ -49,7 +49,11 @@ define(["jquery", "easy-admin"], function ($, ea) {
                    }
                    ]],
                cols: [[
-                    {field: 'node', minWidth: 200, align: 'left', title: '系统节点'},
+                    {
+                        field: 'node', minWidth: 200, align: 'left', title: '系统节点', templet: function (d) {
+                            return `<span>${d.node}</span>`;
+                        }
+                    },
                    {field: 'title', minWidth: 80, title: '节点名称 <i class="table-edit-tips color-red">*</i>', edit: 'text'},
                    {field: 'update_time', minWidth: 80, title: '更新时间', search: 'range'},
                    {field: 'is_auth', title: '节点控制', width: 85, search: 'select', selectList: {0: '禁用', 1: '启用'}, templet: ea.table.switch},
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -8,6 +8,7 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                iframe.contentWindow.onInitElemStyle();
            }
        });
+        miniTheme.changeThemeMainColor();
    };
    window.onInitElemStyle();

@@ -253,7 +254,7 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                }

                // 初始化表格左上方工具栏
-                options.toolbar = options.toolbar || ['refresh', 'add', 'delete', 'export'];
+                options.toolbar = options.toolbar || ['refresh', 'add', 'delete', 'export', 'recycle'];
                options.toolbar = admin.table.renderToolbar(options.toolbar, options.elem, options.id, options.init);

                // 判断是否有操作列表权限
@@ -312,6 +313,14 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                            if (admin.checkAuth('export', elem)) {
                                toolbarHtml += '<button class="layui-btn layui-btn-sm layui-btn-success easyadmin-export-btn" data-url="' + init.export_url + '" data-table-export="' + tableId + '"><i class="fa fa-file-excel-o"></i> 导出</button>\n';
                            }
+                        } else if (v === 'recycle') {
+                            if (init.recycle_url === undefined) {
+                                console.warn('未定义回收站地址 init.recycle_url')
+                                return false
+                            }
+                            if (admin.checkAuth('recycle', elem)) {
+                                toolbarHtml += '<button class="layui-btn layui-btn-sm layui-bg-orange" data-open="' + init.recycle_url + '" data-title="回收站"><i class="fa fa-recycle"></i> 回收站</button>\n';
+                            }
                        } else if (typeof v === "object") {
                            $.each(v, function (ii, vv) {
                                vv.class = vv.class || '';
@@ -1785,7 +1794,7 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                layer.open({
                    'title': options?.title || 'AI建议',
                    type: 1,
-                    area: options?.area || ['42%', '60%'],
+                    area: options?.area || (admin.checkMobile() ? ['95%', '60%'] : ['50%', '60%']),
                    shade: options?.shade || 0,
                    shadeClose: options?.shadeClose || false,
                    scrollbar: options?.scrollbar || false,
@@ -1795,11 +1804,23 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                    success: function (layero, index) {
                        let elem = document.getElementById(id)
                        if (options?.stream) {
-                            clearTimeout(aiStreamTimeout)
-                            aiStreamCurrentIndex = 0
-                            setTimeout(() => {
-                                admin.ai.streamOutput(elem, content)
-                            }, 300)
+                            let index = 0;
+                            let lastTime = performance.now();
+                            const interval = options.interval || 100;
+
+                            function typeCharacter(currentTime) {
+                                if (index < content.length) {
+                                    if (currentTime - lastTime >= interval) {
+                                        elem.innerHTML += content.charAt(index);
+                                        index++;
+                                        lastTime = currentTime;
+                                        elem.scrollIntoView({behavior: "smooth", block: "end"});
+                                    }
+                                    requestAnimationFrame(typeCharacter);
+                                }
+                            }
+
+                            requestAnimationFrame(typeCharacter);
                        } else {
                            content = content.replace(/\r\n/g, '<br>').replace(/\n/g, '<br>')
                            setTimeout(() => {
@@ -1812,28 +1833,8 @@ define(["jquery", "tableSelect", "miniTheme", "xmSelect", "lazyload"], function
                    }
                })
            },
-            streamOutput: function (dom, htmlContent) {
-                const chunkSize = 1;
-                let length = htmlContent.length;
-                if (aiStreamCurrentIndex < length) {
-                    const endIndex = Math.min(aiStreamCurrentIndex + chunkSize, length);
-                    const chunk = htmlContent.slice(aiStreamCurrentIndex, endIndex);
-                    const tempDiv = document.createElement('div');
-                    tempDiv.innerHTML = chunk;
-                    while (tempDiv.firstChild) {
-                        dom.appendChild(tempDiv.firstChild);
-                    }
-                    aiStreamCurrentIndex = endIndex;
-                    aiStreamTimeout = setTimeout(() => {
-                        admin.ai.streamOutput(dom, htmlContent);
-                        dom.scrollIntoView({behavior: "smooth", block: "end"});
-                    }, 60);
-                }
-            }
        },
    };
-    var aiStreamCurrentIndex = 0;
-    var aiStreamTimeout = null;

    return admin;
 });
--- a/public/static/plugs/lay-module/layuimini/layuimini.css
+++ b/public/static/plugs/lay-module/layuimini/layuimini.css
@@ -123,43 +123,47 @@

 /**tab选项卡 */
 .layuimini-tab {
-    margin: 0px;
+    margin: 0;
    overflow: hidden;
    height: 100% !important;
 }

-.layuimini-tab .layui-tab-content {
+.layuimini-tab .layui-tabs-scroll {
+    position: marker;
+}
+
+.layuimini-tab .layui-tabs-body {
    height: calc(100% - 37px) !important;
 }

-.layuimini-tab .layui-tab-content .layui-tab-item {
+.layuimini-tab .layui-tabs-body .layui-tabs-item {
    height: 100%;
 }

-.layuimini-tab .layui-tab-content {
-    padding: 0px;
+.layuimini-tab .layui-tabs-body {
+    padding: 0;
 }

-.layuimini-tab .layui-tab-title {
+.layuimini-tab .layui-tabs-header {
    border: none;
    border: 1px solid whitesmoke;
    background-color: white;
 }

-.layuimini-tab .layui-tab-title li {
+.layuimini-tab .layui-tabs-header li {
    border-right: 1px solid whitesmoke;
    color: dimgray;
 }

-.layuimini-tab .layui-tab-title .layui-tab-bar {
+.layuimini-tab .layui-tabs-header .layui-tab-bar {
    display: none;
 }

-.layuimini-tab .layui-tab-title .layui-this:after {
+.layuimini-tab .layui-tabs-header .layui-this:after {
    display: none;
 }

-.layuimini-tab .layui-tab-title .layuimini-tab-active {
+.layuimini-tab .layui-tabs-header .layuimini-tab-active {
    display: inline-block;
    background-color: lightgray;
    width: 9px;
@@ -168,49 +172,52 @@
    margin-right: 5px;
 }

-.layuimini-tab .layui-tab-title .layui-this .layuimini-tab-active {
-    background-color: #1aa094;
+.layuimini-tab .layui-tabs-header .layui-this .layuimini-tab-active {
+    background-color: var(--ea8-theme-main-color);
 }

-.layuimini-tab > .layui-tab-title, .layuimini-tab > .close-box {
+.layuimini-tab > .layui-tabs-header, .layuimini-tab > .close-box {
    height: 35px !important;
 }

-.layuimini-tab > .layui-tab-title li, .layuimini-tab > .close-box li {
+.layuimini-tab > .layui-tabs-header li, .layuimini-tab > .close-box li {
    line-height: 35px !important;
 }

-.layuimini-tab .layui-tab-title span {
+.layuimini-tab .layui-tabs-header span {
    color: #acafb1;
 }

-.layuimini-tab .layui-tab-title .layui-this span {
+.layuimini-tab .layui-tabs-header .layui-this span {
    color: dimgray;
 }

-.layuimini-tab .layui-tab-title .layui-tab-close {
+.layuimini-tab .layui-tabs-header .layui-tab-close {
    font-size: 12px !important;
    width: 14px !important;
    height: 14px !important;
    line-height: 16px !important;
+    margin-left: 5px;
+    padding: 2px;
 }

-.layuimini-tab .layui-tab-title .layui-tab-close:hover {
+.layuimini-tab .layui-tabs-header .layui-tab-close:hover {
    border-radius: 4em;
    background: #ff5722;
+    color: #fff;
 }

-.layuimini-tab .layui-tab-title .disable-close + .layui-tab-close {
+.layuimini-tab .layui-tabs-header .disable-close + .layui-tab-close {
    display: none;
 }

-.layuimini-tab .layui-tab-title .able-close + .layui-tab-close {
+.layuimini-tab .layui-tabs-header .able-close + .layui-tab-close {
    display: inline-block;
 }

 .layuimini-tab .layui-tab-control > li {
    position: absolute;
-    top: 0px;
+    top: 0;
    height: 35px;
    line-height: 35px;
    width: 35px;
@@ -221,7 +228,7 @@
 }

 .layuimini-tab .layuimini-tab-roll-left {
-    left: 0px;
+    left: 0;
    border-right: whitesmoke 1px solid;
    border-left: whitesmoke 1px solid;
 }
@@ -232,7 +239,7 @@
 }

 .layuimini-tab .layui-tab-tool {
-    right: 0px;
+    right: 0;
    border-left: 1px solid whitesmoke;
 }

@@ -248,11 +255,11 @@
 }

 .layuimini-tab.layui-tab-roll .layui-tab-control .layuimini-tab-roll-right {
-    right: 0px;
+    right: 0;
    border-right: 1px solid whitesmoke;
 }

-.layuimini-tab.layui-tab-roll .layui-tab-title {
+.layuimini-tab.layui-tab-roll .layui-tabs-header {
    padding-left: 35px;
    padding-right: 35px;
 }
@@ -262,13 +269,13 @@
    display: block;
 }

-.layuimini-tab.layui-tab-tool .layui-tab-title {
-    padding-left: 0px;
+.layuimini-tab.layui-tab-tool .layui-tabs-header {
+    padding-left: 0;
    padding-right: 35px;
 }


-.layuimini-tab.layui-tab-rollTool .layui-tab-title {
+.layuimini-tab.layui-tab-rollTool .layui-tabs-header {
    padding-left: 35px;
    padding-right: 80px;
 }
@@ -451,7 +458,7 @@


 /**其它 */
-.layui-tab-item {
+.layui-tabs-item {
    width: 100% !important;
    height: 100% !important;
 }
@@ -466,7 +473,7 @@
 }

 .layui-tab {
-    margin: 0 0 0 0;
+    margin: 0;
    z-index: 99999;
 }

@@ -640,26 +647,28 @@
    color: #484545;
 }

-.layuimini-tab-make{
+.layuimini-tab-make {
    position: absolute;
    top: 36px;
-    bottom: 0px;
+    bottom: 0;
    width: 100%;
-    background: rgb(255, 255, 255,0);
-    padding: 0px;
+    background: rgb(255, 255, 255, 0);
+    padding: 0;
    overflow: hidden;
 }

 /**
 菜单缩放
 */
-.popup-tips .layui-layer-TipsG{
+.popup-tips .layui-layer-TipsG {
    display: none;
 }
-.popup-tips.layui-layer-tips .layui-layer-content{
+
+.popup-tips.layui-layer-tips .layui-layer-content {
    padding: 0;
 }
-.popup-tips .layui-nav-tree{
+
+.popup-tips .layui-nav-tree {
    width: 150px;
    border-radius: 10px;
 }
@@ -670,13 +679,13 @@
 }

 /**头部菜单字体间距*/
-.layui-layout-admin .layui-header .layuimini-header-menu.layuimini-pc-show,.layui-layout-admin .layui-header .layuimini-header-menu.layuimini-mobile-show {
+.layui-layout-admin .layui-header .layuimini-header-menu.layuimini-pc-show, .layui-layout-admin .layui-header .layuimini-header-menu.layuimini-mobile-show {
    letter-spacing: 1px;
 }


 /**左侧菜单更多下拉样式*/
-.layuimini-menu-left .layui-nav-more,.layuimini-menu-left-zoom .layui-nav-more {
+.layuimini-menu-left .layui-nav-more, .layuimini-menu-left-zoom .layui-nav-more {
    font-family: layui-icon !important;
    font-size: 12px;
    font-style: normal;
@@ -695,10 +704,11 @@
    margin-top: -6px !important;
 }

-.layuimini-menu-left .layui-nav-more:before,.layuimini-menu-left-zoom .layui-nav-more:before {
+.layuimini-menu-left .layui-nav-more:before, .layuimini-menu-left-zoom .layui-nav-more:before {
    content: "\e61a";
 }
-.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more,.layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more {
+
+.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more, .layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more {
    transform: rotate(180deg);
    -ms-transform: rotate(180deg);
    -moz-transform: rotate(180deg);
@@ -706,10 +716,10 @@
    -o-transform: rotate(180deg);
    width: 12px;
    text-align: center;
-    border-style:none;
+    border-style: none;
 }

-.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more:before,.layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more:before {
+.layuimini-menu-left .layui-nav-itemed > a > .layui-nav-more:before, .layuimini-menu-left-zoom .layui-nav-itemed > a > .layui-nav-more:before {
    content: '\e61a';
    background-color: transparent;
    display: inline-block;
@@ -717,7 +727,7 @@
 }

 /**修复左侧菜单字体不对齐的问题*/
-.layuimini-menu-left .layui-nav-item a .fa,.layuimini-menu-left .layui-nav-item a .layui-icon{
+.layuimini-menu-left .layui-nav-item a .fa, .layuimini-menu-left .layui-nav-item a .layui-icon {
    width: 20px;
 }

@@ -773,16 +783,18 @@
        left: 95px !important;
    }

-    .layuimini-pc-show{
+    .layuimini-pc-show {
        display: block;
    }
-    .layuimini-mobile-show{
+
+    .layuimini-mobile-show {
        display: none;
    }

    /**菜单缩放*/
-    .layuimini-mini .layuimini-menu-left .layui-nav-more,.layuimini-mini .layuimini-menu-left .layui-nav-child{
-        display: none;!important;
+    .layuimini-mini .layuimini-menu-left .layui-nav-more, .layuimini-mini .layuimini-menu-left .layui-nav-child {
+        display: none;
+    !important;
    }
 }

@@ -794,29 +806,31 @@
    /**
    todo 修复低版本IOS不能滑动问题, 但还是有问题, 低版本IOS部分情况下子页面无法自适应
    */
-    .layuimini-tab .layui-tab-content .layui-tab-item{
+    .layuimini-tab .layui-tabs-body .layui-tabs-item {
        -webkit-overflow-scrolling: touch;
        overflow: scroll;
-        width:100%;
-        height:100%;
+        width: 100%;
+        height: 100%;
    }

-    .layuimini-tab .layui-tab-content .layui-tab-item iframe {
+    .layuimini-tab .layui-tabs-body .layui-tabs-item iframe {
        height: 100%;
        width: 100%;
    }

-    .layuimini-pc-show{
+    .layuimini-pc-show {
        display: none;
    }
-    .layuimini-mobile-show{
+
+    .layuimini-mobile-show {
        display: block;
    }
+
    .layuimini-header-content {
        left: 0;
    }

-    .layui-layout-admin .layui-body .layui-tab-item.layui-show {
+    .layui-layout-admin .layui-body .layui-tabs-item.layui-show {
        border-top: 1px solid #e2e2e2;
    }

@@ -854,7 +868,7 @@
    }

    .layuimini-mini .layui-layout-admin .layui-body {
-        left: 0!important;
+        left: 0 !important;
        transition: left .2s;
        top: 0;
        z-index: 998;
@@ -905,7 +919,7 @@
    }
 }

-@media screen and (max-width: 550px){
+@media screen and (max-width: 550px) {

    /**头部右侧数据*/
    .layuimini-multi-module.layuimini-mini .layuimini-header-content .layui-layout-right {
--- a/public/static/plugs/lay-module/layuimini/miniTab.js
+++ b/public/static/plugs/lay-module/layuimini/miniTab.js
@@ -6,6 +6,7 @@
 */
 define(["jquery"], function ($) {
    var element = layui.element,
+        tabs = layui.tabs,
        $ = layui.$;


@@ -44,15 +45,14 @@ define(["jquery"], function ($) {
            options.title = options.title || null;
            options.isIframe = options.isIframe || false;
            options.maxTabNum = options.maxTabNum || 20;
-            if ($(".layuimini-tab .layui-tab-title li").length >= options.maxTabNum) {
+            if ($(".layuimini-tab .layui-tabs-header li").length >= options.maxTabNum) {
                layer.msg('Tab窗口已达到限定数量，请先关闭部分Tab');
                return false;
            }
-            var ele = element;
-            if (options.isIframe) ele = parent.layui.element;
-            ele.tabAdd('layuiminiTab', {
-                title: '<span class="layuimini-tab-active"></span><span>' + options.title + '</span><i class="layui-icon layui-unselect layui-tab-close">ဆ</i>' //用于演示
-                , content: '<iframe width="100%" height="100%" frameborder="no" border="0" marginwidth="0" marginheight="0"   src="' + options.href + '"></iframe>'
+            if (options.isIframe) tabs = parent.layui.tabs;
+            tabs.add('layuiminiTab', {
+                title: `<span class="layuimini-tab-active"></span><span>${options.title}</span><i class="layui-icon layui-unselect layui-tab-close">ဆ</i>`
+                , content: `<iframe width="100%" height="100%" frameborder="no" border="0" src="${options.href}" style="width: 100%; height:100%;"></iframe>`
                , id: options.tabId
            });
            $('.layuimini-menu-left').attr('layuimini-tab-tag', 'add');
@@ -65,7 +65,7 @@ define(["jquery"], function ($) {
         * @param tabId
         */
        change: function (tabId) {
-            element.tabChange('layuiminiTab', tabId);
+            tabs.change('layuiminiTab', tabId);
        },

        /**
@@ -74,13 +74,10 @@ define(["jquery"], function ($) {
         * @param isParent
         */
        delete: function (tabId, isParent) {
-            // todo 未知BUG，不知道是不是layui问题，必须先删除元素
-            $(".layuimini-tab .layui-tab-title .layui-unselect.layui-tab-bar").remove();
-
            if (isParent === true) {
-                parent.layui.element.tabDelete('layuiminiTab', tabId);
+                parent.layui.tabs.close('layuiminiTab', tabId);
            } else {
-                element.tabDelete('layuiminiTab', tabId);
+                tabs.close('layuiminiTab', tabId);
            }
        },

@@ -101,7 +98,7 @@ define(["jquery"], function ($) {
                    isIframe: true,
                });
            }
-            parent.layui.element.tabChange('layuiminiTab', options.href);
+            parent.layui.tabs.change('layuiminiTab', options.href);
            parent.layer.close(loading);
        },

@@ -109,7 +106,7 @@ define(["jquery"], function ($) {
         * 在iframe层关闭当前tab方法
         */
        deleteCurrentByIframe: function () {
-            var ele = $(".layuimini-tab .layui-tab-title li.layui-this", parent.document);
+            var ele = $(".layuimini-tab .layui-tabs-header li.layui-this", parent.document);
            if (ele.length > 0) {
                var layId = $(ele[0]).attr('lay-id');
                miniTab.delete(layId, true);
@@ -123,14 +120,14 @@ define(["jquery"], function ($) {
            // 判断选项卡上是否有
            var checkTab = false;
            if (isIframe === undefined || isIframe === false) {
-                $(".layui-tab-title li").each(function () {
+                $(".layui-tabs-header li").each(function () {
                    var checkTabId = $(this).attr('lay-id');
                    if (checkTabId != null && checkTabId === tabId) {
                        checkTab = true;
                    }
                });
            } else {
-                parent.layui.$(".layui-tab-title li").each(function () {
+                parent.layui.$(".layui-tabs-header li").each(function () {
                    var checkTabId = $(this).attr('lay-id');
                    if (checkTabId != null && checkTabId === tabId) {
                        checkTab = true;
@@ -155,7 +152,7 @@ define(["jquery"], function ($) {
                '</dl>\n' +
                '</div>';
            var makeHtml = '<div class="layuimini-tab-make"></div>';
-            $('.layuimini-tab .layui-tab-title').after(menuHtml);
+            $('.layuimini-tab .layui-tabs-header').after(menuHtml);
            $('.layuimini-tab .layui-tab-content').after(makeHtml);
        },

@@ -233,7 +230,7 @@ define(["jquery"], function ($) {
                        maxTabNum: options.maxTabNum,
                    });
                }
-                element.tabChange('layuiminiTab', tabId);
+                tabs.change('layuiminiTab', tabId);
                layer.close(loading);
            });

@@ -262,14 +259,14 @@ define(["jquery"], function ($) {
                        maxTabNum: options.maxTabNum,
                    });
                }
-                parent.layui.element.tabChange('layuiminiTab', tabId);
+                parent.layui.tabs.change('layuiminiTab', tabId);
                parent.layer.close(loading);
            });

            /**
             * 关闭选项卡
             **/
-            $('body').on('click', '.layuimini-tab .layui-tab-title .layui-tab-close', function () {
+            $('body').on('click', '.layuimini-tab .layui-tabs-header .layui-tab-close', function () {
                var loading = layer.load(0, {shade: false, time: 2 * 1000});
                var $parent = $(this).parent();
                var tabId = $parent.attr('lay-id');
@@ -285,7 +282,7 @@ define(["jquery"], function ($) {
            $('body').on('click', '[layuimini-tab-close]', function () {
                var loading = layer.load(0, {shade: false, time: 2 * 1000});
                var closeType = $(this).attr('layuimini-tab-close');
-                $(".layuimini-tab .layui-tab-title li").each(function () {
+                $(".layuimini-tab .layui-tabs-header li").each(function () {
                    var tabId = $(this).attr('lay-id');
                    var id = $(this).attr('id');
                    var isCurrent = $(this).hasClass('layui-this');
@@ -307,7 +304,7 @@ define(["jquery"], function ($) {
            /**
             * 禁用网页右键
             */
-            $(".layuimini-tab .layui-tab-title").unbind("mousedown").bind("contextmenu", function (e) {
+            $(".layuimini-tab .layui-tabs-header").unbind("mousedown").bind("contextmenu", function (e) {
                e.preventDefault();
                return false;
            });
@@ -315,7 +312,7 @@ define(["jquery"], function ($) {
            /**
             * 注册鼠标右键
             */
-            $('body').on('mousedown', '.layuimini-tab .layui-tab-title li', function (e) {
+            $('body').on('mousedown', '.layuimini-tab .layui-tabs-header li', function (e) {
                var left = $(this).offset().left - $('.layuimini-tab ').offset().left + ($(this).width() / 2),
                    tabId = $(this).attr('lay-id');
                if (e.which === 3) {
@@ -337,7 +334,7 @@ define(["jquery"], function ($) {
                var loading = layer.load(0, {shade: false, time: 2 * 1000});
                var closeType = $(this).attr('layuimini-tab-menu-close'),
                    currentTabId = $('.layuimini-tab-mousedown').attr('data-tab-id');
-                $(".layuimini-tab .layui-tab-title li").each(function () {
+                $(".layuimini-tab .layui-tabs-header li").each(function () {
                    var tabId = $(this).attr('lay-id');
                    var id = $(this).attr('id');
                    if (id !== 'layuiminiHomeTabId') {
@@ -368,7 +365,7 @@ define(["jquery"], function ($) {
            options.listenSwichCallback = options.listenSwichCallback || function () {

            };
-            element.on('tab(' + options.filter + ')', function (data) {
+            tabs.on('afterChange(layuiminiTab)', function (data) {
                var tabId = $(this).attr('lay-id');
                if (options.urlHashLocation) {
                    location.hash = tabId;
@@ -403,10 +400,10 @@ define(["jquery"], function ($) {
            options.menuList = options.menuList || [];
            if (!options.urlHashLocation) return false;
            var tabId = location.hash.replace(/^#/, '');
-            if (tabId === null || tabId === undefined || tabId ==='') return false;
+            if (tabId === null || tabId === undefined || tabId === '') return false;

            // 判断是否为首页
-            if(tabId ===options.homeInfo.href) return false;
+            if (tabId === options.homeInfo.href) return false;

            // 判断是否为右侧菜单
            var menu = miniTab.searchMenu(tabId, options.menuList);
@@ -419,7 +416,7 @@ define(["jquery"], function ($) {
                    maxTabNum: options.maxTabNum,
                });
                $('.layuimini-menu-left').attr('layuimini-tab-tag', 'no');
-                element.tabChange('layuiminiTab', tabId);
+                tabs.change('layuiminiTab', tabId);
                return false;
            }

@@ -436,7 +433,7 @@ define(["jquery"], function ($) {
                        maxTabNum: options.maxTabNum,
                    });
                    $('.layuimini-menu-left').attr('layuimini-tab-tag', 'no');
-                    element.tabChange('layuiminiTab', tabId);
+                    tabs.change('layuiminiTab', tabId);
                    isSearchMenu = true;
                    return false;
                }
@@ -452,7 +449,7 @@ define(["jquery"], function ($) {
                isIframe: false,
                maxTabNum: options.maxTabNum,
            });
-            element.tabChange('layuiminiTab', tabId);
+            tabs.change('layuiminiTab', tabId);
            return false;
        },

@@ -543,7 +540,7 @@ define(["jquery"], function ($) {
         * 自动定位
         */
        rollPosition: function () {
-            var $tabTitle = $('.layuimini-tab  .layui-tab-title');
+            var $tabTitle = $('.layuimini-tab  .layui-tabs-header');
            var autoLeft = 0;
            $tabTitle.children("li").each(function () {
                if ($(this).hasClass('layui-this')) {
@@ -562,7 +559,7 @@ define(["jquery"], function ($) {
         * @param direction
         */
        rollClick: function (direction) {
-            var $tabTitle = $('.layuimini-tab  .layui-tab-title');
+            var $tabTitle = $('.layuimini-tab  .layui-tabs-header');
            var left = $tabTitle.scrollLeft();
            if ('left' === direction) {
                $tabTitle.animate({
--- a/public/static/plugs/lay-module/layuimini/miniTheme.js
+++ b/public/static/plugs/lay-module/layuimini/miniTheme.js
@@ -41,7 +41,7 @@ define(["jquery"], function ($) {
                    headerRightBg: '#23262e', //头部右侧背景色
                    headerRightBgThis: '#0c0c0c', //头部右侧选中背景色,
                    headerRightColor: 'rgba(255,255,255,.7)', //头部右侧字体颜色,
-                    headerRightChildColor: 'rgba(255,255,255,.7)', //头部右侧下拉字体颜色,
+                    headerRightChildColor: '#676767', //头部右侧下拉字体颜色,
                    headerRightColorThis: 'rgba(255,255,255,.7)', //头部右侧鼠标选中,
                    headerRightNavMore: 'rgba(255,255,255,.7)', //头部右侧更多下拉颜色,
                    headerRightNavMoreBg: '#1aa094', //头部右侧更多下拉列表选中背景色,
@@ -295,6 +295,24 @@ define(["jquery"], function ($) {
            }
            miniTheme.buildBodyElemStyle(elemStyleName);
        },
+
+        changeThemeMainColor() {
+            let bgcolorId = localStorage.getItem('layuiminiBgColorId');
+            if (bgcolorId === null || bgcolorId === undefined || bgcolorId === '') return false;
+            let bgcolorData = miniTheme.config(bgcolorId);
+            let mainColor = bgcolorData.headerRightBg
+            if (bgcolorId == 0) mainColor = '#16b777';
+            const bgColor = window.getComputedStyle(document.documentElement).getPropertyValue('--ea8-theme-main-color');
+            document.documentElement.style.setProperty('--ea8-theme-main-color', mainColor);
+            const iframes = document.getElementsByTagName('iframe');
+            if (iframes.length === 0) return false;
+            $.each(iframes, (i, iframe) => {
+                if (iframe === '' || iframe === undefined) return false;
+                const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+                iframeDocument.documentElement.style.setProperty('--ea8-theme-main-color', mainColor);
+            })
+        },
+
        /**
         * 构建主题样式
         * @param bgcolorId
@@ -555,6 +573,7 @@ define(["jquery"], function ($) {
                    bgColorDefault: bgcolorId,
                    listen: false,
                });
+                miniTheme.changeThemeMainColor()
            });
            $('body').on('click', '[data-select-style]', function () {
                var elemStyleName = $(this).attr('data-select-style');
--- 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
--- a/route/app.php
+++ b/route/app.php
@@ -10,10 +10,4 @@
 // +----------------------------------------------------------------------
 use think\facade\Route;

-Route::get('think', function () {
-    return 'hello,ThinkPHP6!';
-});
-
-Route::get('hello/:name', 'index/hello');
-
 Route::any('install', '\app\index\controller\Install@index');
--- a/runtime/.gitignore
+++ b/runtime/.gitignore
@@ -1,2 +1,2 @@
 *
-!.gitignore
+!.gitignore
Author	SHA1	Message	Date
wolfcode	f41943320b	Update welcome.html	2025-04-22 16:04:04 +08:00
wolfcode	1f0064743e	🚀 Layui v2.11.0	2025-04-22 15:46:10 +08:00
wolfcode	115573a88c	🚀 Layui v2.11.0	2025-04-22 15:26:25 +08:00
wolfcode	253379f0c6	feat(theme): implement dynamic theme color change - Add functionality to change the main theme color dynamically - Update CSS to use a custom property for the main theme color - Modify JavaScript to set the main theme color based on user preference Adjust form select styles to match the new theme color	2025-04-21 18:03:39 +08:00
wolfcode	9a0ff912b5	feat(mall):新增表单中多选案例 add simulated multi-select feature - Add simulated multi-select functionality to goods add and edit pages - Integrate xm-select library for multi-select implementation - Add random color theme to the multi-select dropdown - Include predefined options for demonstration purposes	2025-04-18 15:16:06 +08:00
wolfcode	517fd191d3	refactor(curd): improve relation handling and query methods - Replace with() with withJoin() for more efficient left joins - Fix foreign key and primary key assignments in relations - Update index page queries to use relation index method-Modify relation method generation in model to use belongsTo instead of hasOne- Adjust table column definitions for relation fields	2025-04-17 17:25:06 +08:00
wolfcode	d1dfa8b49b	Update app.php	2025-04-16 18:40:37 +08:00
wolfcode	c819751a66	chore: update .gitignore files - Extend and runtime .gitignore: add space after '!' in .gitignore - Root .gitignore: remove .project file	2025-04-16 18:38:53 +08:00
wolfcode	3a2ee69d0f	feat(curd): 关联表优化支持 add relation support and optimize model associations - Add support for handling relations in CURD operations - Optimize model associations to use hasOne instead of belongsTo - Implement field selection for relations - Update controller to handle AJAX requests and return JSON data Modify model to include relation methods	2025-04-16 15:28:41 +08:00
wolfcode	d513177c74	feat(easy-admin): improve AI suggestion display and typing effect - Adjust the width of AI suggestion popup for mobile devices - Implement a more realistic typing effect for AI-generated content - Remove the 'fluid' class from the 'AI optimization' button in goods edit page	2025-04-11 15:23:15 +08:00
wolfcode	0705b9a38d	Update public.css	2025-04-10 18:30:57 +08:00
wolfcode	feb26660e8	style(admin): adjust table cell height and line height - Set table cell height to 47px instead of100% - Set table cell line-height to 40px	2025-04-10 16:51:57 +08:00
wolfcode	b8ccf1542b	feat(curd):支持CURD自动生成回收站功能 add recycle functionality for soft deleted items - Add recycle method to Curd trait for restoring or permanently deleting items - Implement recycle view and update index view to include recycle button-Add recycle URL and functionality to JavaScript table initialization - Create new recycle template files for view and JavaScript	2025-04-08 10:43:27 +08:00
wolfcode	74122885f1	feat(mall): 新增回收站功能 add recycle functionality for goods - Add recycle feature to goods management - Implement recycle button in toolbar - Create recycle page for deleted goods - Add functionality to restore or permanently delete goods	2025-04-07 13:44:12 +08:00