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

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'));
     }
 

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;

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>

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);

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();
+}
+

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

@@ -373,7 +373,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 +396,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,8 +874,10 @@ 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,