blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

同步更新代码

Browse Source
This commit is contained in:
邹景立 2023-12-25 19:23:45 +08:00
parent 2aeb944c94
commit b03aaf6276
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/static/admin.js
View File

@ -358,17 +358,17 @@ $(function () {
}, load, tips); }, load, tips);
}; };
/*! 打开 IFRAME 窗口 */ /*! 打开 IFRAME 窗口 */
this.iframe = function (url, name, area, offset, destroy, success, isfull) { this.iframe = function (url, name, area, offset, destroy, success, isfull, maxmin) {
if (typeof area === 'string' && area.indexOf('[') === 0) area = eval('(' + area + ')'); if (typeof area === 'string' && area.indexOf('[') === 0) area = eval('(' + area + ')');
this.idx = layer.open({title: name || '窗口', type: 2, area: area || ['800px', '580px'], end: destroy || null, offset: offset, fixed: true, maxmin: false, content: url, success: success}); this.idx = layer.open({title: name || '窗口', type: 2, area: area || ['800px', '580px'], end: destroy || null, offset: offset, fixed: true, maxmin: maxmin || false, content: url, success: success});
return isfull && layer.full(this.idx), this.idx; return isfull && layer.full(this.idx), this.idx;
}; };
/*! 加载 HTML 到弹出层，返回 refer 对象 */ /*! 加载 HTML 到弹出层，返回 refer 对象 */
this.modal = function (url, data, name, call, load, tips, area, offset, isfull) { this.modal = function (url, data, name, call, load, tips, area, offset, isfull, maxmin) {
return this.load(url, data, 'GET', function (res, time, defer) { return this.load(url, data, 'GET', function (res, time, defer) {
if (typeof area === 'string' && area.indexOf('[') === 0) area = eval('(' + area + ')'); if (typeof area === 'string' && area.indexOf('[') === 0) area = eval('(' + area + ')');
return typeof res === 'object' ? $.msg.auto(res) : $.msg.mdx.push(this.idx = layer.open({ return typeof res === 'object' ? $.msg.auto(res) : $.msg.mdx.push(this.idx = layer.open({
type: 1, btn: false, area: area || '800px', offset: offset || 'auto', resize: false, content: res, type: 1, btn: false, area: area || '800px', offset: offset || 'auto', resize: false, content: res, maxmin: maxmin,
title: name === 'false' ? '' : name, end: () => defer.notify('modal.close'), success: function ($dom, idx) { title: name === 'false' ? '' : name, end: () => defer.notify('modal.close'), success: function ($dom, idx) {
defer.notify('modal.success', $dom) && typeof call === 'function' && call.call($.form, $dom); defer.notify('modal.success', $dom) && typeof call === 'function' && call.call($.form, $dom);
$.form.reInit($dom.off('click', '[data-close]').on('click', '[data-close]', function () { $.form.reInit($dom.off('click', '[data-close]').on('click', '[data-close]', function () {

8
public/static/plugs/admin/excel.js
View File

@ -40,6 +40,7 @@ define(function () {
// </script> // </script>
Excel.prototype.bind = function (done, filename, selector, options) { Excel.prototype.bind = function (done, filename, selector, options) {
let that = this; let that = this;
this.options = options || {}
$('body').off('click', selector || '[data-form-export]').on('click', selector || '[data-form-export]', function () { $('body').off('click', selector || '[data-form-export]').on('click', selector || '[data-form-export]', function () {
let form = $(this).parents('form'); let form = $(this).parents('form');
let name = this.dataset.filename || filename; let name = this.dataset.filename || filename;
@ -50,7 +51,7 @@ define(function () {
location += (location.indexOf('?') > -1 ? '&' : '?') + '_order_=' + sortType + '&_field_=' + sortField; location += (location.indexOf('?') > -1 ? '&' : '?') + '_order_=' + sortType + '&_field_=' + sortField;
} }
that.load(location, form.serialize(), method).then(function (data) { that.load(location, form.serialize(), method).then(function (data) {
that.export(done.call(that, data, []), name, options || {}); that.export(done.call(that, data, []), name);
}).fail(function (ret) { }).fail(function (ret) {
$.msg.tips(ret || '文件导出失败'); $.msg.tips(ret || '文件导出失败');
}); });
@ -117,11 +118,10 @@ define(function () {
// 设置表格行宽高，需要设置最后的行或列宽高，否则部分不生效 ？？？ // 设置表格行宽高，需要设置最后的行或列宽高，否则部分不生效 ？？？
let rowsC = {1: 33}, colsC = Object.assign({}, defaC, {A: 60}, colsWidth || {}); let rowsC = {1: 33}, colsC = Object.assign({}, defaC, {A: 60}, colsWidth || {});
rowsC[data.length] = defaultHeight || 28, this.options.extend = { rowsC[data.length] = defaultHeight || 28, this.options.extend = Object.assign({}, {
'!cols': layui.excel.makeColConfig(colsC, defaultWidth || 99), '!cols': layui.excel.makeColConfig(colsC, defaultWidth || 99),
'!rows': layui.excel.makeRowConfig(rowsC, defaultHeight || 28), '!rows': layui.excel.makeRowConfig(rowsC, defaultHeight || 28),
}; }, this.options.extend || {});
return data; return data;
} }