优化导出功能,根据查询参数导出;

This commit is contained in:
2022-04-17 13:09:46 +08:00
parent ca63703851
commit fbf55bca4b

View File

@@ -202,7 +202,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
options.limit = options.limit || 15; options.limit = options.limit || 15;
options.limits = options.limits || [10, 15, 20, 25, 50, 100]; options.limits = options.limits || [10, 15, 20, 25, 50, 100];
options.cols = options.cols || []; 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: '搜索', title: '搜索',
layEvent: 'TABLE_SEARCH', layEvent: 'TABLE_SEARCH',
icon: 'layui-icon-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' + $(elem).before('<fieldset id="searchFieldset_' + tableId + '" class="table-search-fieldset layui-hide">\n' +
'<legend>条件搜索</legend>\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 + formHtml +
'<div class="layui-form-item layui-inline" style="margin-left: 115px">\n' + '<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' + '<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) { filePreview: function (data) {
console.log(data);
if (!data.mime_type) { if (!data.mime_type) {
return admin.table.url(data); return admin.table.url(data);
@@ -1251,10 +1250,20 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
// excel导出 // excel导出
$('body').on('click', '[data-table-export]', function () { $('body').on('click', '[data-table-export]', function () {
var tableId = $(this).attr('data-table-export'), var tableId = $(this).attr('data-table-export') || init.table_render_id,
url = $(this).attr('data-url'); 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 () { 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); layer.close(index);
}); });
}); });