From 866486a5a511f36d220bdb1cc5c891d6ebabd128 Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:40:54 +0800
Subject: [PATCH] Update easy-admin.js

---
 public/static/plugs/easy-admin/easy-admin.js | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index c7eda06..1f5a4c2 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -205,21 +205,24 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                 options.limit = options.limit || 15;
                 options.limits = options.limits || [10, 15, 20, 25, 50, 100];
                 options.cols = options.cols || [];
-                options.defaultToolbar = (options.defaultToolbar === undefined && !options.search) ? ['filter', 'print', 'exports'] : ['filter', 'print', 'exports', {
+                let searchBtn = options.search ? {
                     title: '搜索',
                     layEvent: 'TABLE_SEARCH',
                     icon: 'layui-icon-search',
                     extend: 'data-table-id="' + options.id + '"'
-                }];
-
+                } : []
+                options.defaultToolbar = options.defaultToolbar !== false ? (
+                    (options.defaultToolbar === undefined ? ['filter', 'print', 'exports'].concat(searchBtn) : options.defaultToolbar.concat(searchBtn))
+                ) : false;
                 // 判断是否为移动端
                 if (admin.checkMobile()) {
-                    options.defaultToolbar = !options.search ? ['filter'] : ['filter', {
-                        title: '搜索',
-                        layEvent: 'TABLE_SEARCH',
-                        icon: 'layui-icon-search',
-                        extend: 'data-table-id="' + options.id + '"'
-                    }];
+                    options.defaultToolbar = options.defaultToolbar !== false ? (
+                        !options.search ? ['filter'] : ['filter', {
+                            title: '搜索',
+                            layEvent: 'TABLE_SEARCH',
+                            icon: 'layui-icon-search',
+                            extend: 'data-table-id="' + options.id + '"'
+                        }]) : false;
                 }
 
                 // 判断元素对象是否有嵌套的