From b03aaf62764b2e82ff67c2961ba8ba375498ddb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 25 Dec 2023 19:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/admin.js             | 8 ++++----
 public/static/plugs/admin/excel.js | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/static/admin.js b/public/static/admin.js
index 6be0ef8ec..cd6fad4f6 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -358,17 +358,17 @@ $(function () {
             }, load, tips);
         };
         /*! 打开 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 + ')');
-            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;
         };
         /*! 加载 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) {
                 if (typeof area === 'string' && area.indexOf('[') === 0) area = eval('(' + area + ')');
                 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) {
                         defer.notify('modal.success', $dom) && typeof call === 'function' && call.call($.form, $dom);
                         $.form.reInit($dom.off('click', '[data-close]').on('click', '[data-close]', function () {
diff --git a/public/static/plugs/admin/excel.js b/public/static/plugs/admin/excel.js
index 3e604aee7..bdd1c2f2c 100644
--- a/public/static/plugs/admin/excel.js
+++ b/public/static/plugs/admin/excel.js
@@ -40,6 +40,7 @@ define(function () {
     // </script>
     Excel.prototype.bind = function (done, filename, selector, options) {
         let that = this;
+        this.options = options || {}
         $('body').off('click', selector || '[data-form-export]').on('click', selector || '[data-form-export]', function () {
             let form = $(this).parents('form');
             let name = this.dataset.filename || filename;
@@ -50,7 +51,7 @@ define(function () {
                 location += (location.indexOf('?') > -1 ? '&' : '?') + '_order_=' + sortType + '&_field_=' + sortField;
             }
             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) {
                 $.msg.tips(ret || '文件导出失败');
             });
@@ -117,11 +118,10 @@ define(function () {
 
         // 设置表格行宽高，需要设置最后的行或列宽高，否则部分不生效 ？？？
         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),
             '!rows': layui.excel.makeRowConfig(rowsC, defaultHeight || 28),
-        };
-
+        }, this.options.extend || {});
         return data;
     }