From fbf55bca4b0bd560221aa56355c8545c4f59fd75 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Sun, 17 Apr 2022 13:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=AF=BC=E5=87=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 8d0d001..9e76668 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -202,7 +202,7 @@ 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', {
+                options.defaultToolbar = (options.defaultToolbar === undefined && !options.search) ? ['filter', 'print'] : ['filter', 'print', {
                     title: '搜索',
                     layEvent: 'TABLE_SEARCH',
                     icon: 'layui-icon-search',
@@ -432,7 +432,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
 
                     $(elem).before('<fieldset id="searchFieldset_' + tableId + '" class="table-search-fieldset layui-hide">\n' +
                         '<legend>条件搜索</legend>\n' +
-                        '<form class="layui-form layui-form-pane form-search">\n' +
+                        '<form class="layui-form layui-form-pane form-search" lay-filter="' + tableId + '">\n' +
                         formHtml +
                         '<div class="layui-form-item layui-inline" style="margin-left: 115px">\n' +
                         '<button type="submit" class="layui-btn layui-btn-normal" data-type="tableSearch" data-table="' + tableId + '" lay-submit lay-filter="' + tableId + '_filter"> 搜 索</button>\n' +
@@ -728,7 +728,6 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                 }
             },
             filePreview: function (data) {
-                console.log(data);
 
                 if (!data.mime_type) {
                     return admin.table.url(data);
@@ -1251,10 +1250,20 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
 
             // excel导出
             $('body').on('click', '[data-table-export]', function () {
-                var tableId = $(this).attr('data-table-export'),
-                    url = $(this).attr('data-url');
+                var tableId = $(this).attr('data-table-export') || init.table_render_id,
+                    url = admin.url($(this).attr('data-url')),
+                    formatFilter = {},
+                    formatOp = {};
+                $.each(form.val(tableId), function (key, val) {
+                    if (val !== '') {
+                        formatFilter[key] = val;
+                        var op = $('[id=\'c-' + key + '\']').attr('data-search-op');
+                        op = op || '%*%';
+                        formatOp[key] = op;
+                    }
+                });
                 var index = admin.msg.confirm('根据查询进行导出，确定导出？', function () {
-                    window.location = admin.url(url);
+                    window.location = url + (url.indexOf('?') !== -1 ? '&' : '?') + 'filter=' + JSON.stringify(formatFilter) + '&op=' + JSON.stringify(formatOp);
                     layer.close(index);
                 });
             });