From d92041ddacaa01bed5ddd799822caad150335619 Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Tue, 25 Apr 2023 22:17:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0lay-upload=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E5=85=B3=E9=97=AD=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/BaseController.php               | 4 +++-
 public/static/system/module/admin.js | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/BaseController.php b/app/BaseController.php
index 838f786..5d02c9d 100644
--- a/app/BaseController.php
+++ b/app/BaseController.php
@@ -381,8 +381,10 @@ class BaseController
             $columns = Db::query("SHOW FULL COLUMNS FROM {$table}");
             $titles = array_column($columns, 'Comment', 'Field');
             $data = $this->model->limit($limit)->page($page)->select()->toArray();
+            if (empty($data)) {
+                return $this->error('没有可导出的数据！');
+            }
             $folder = date('Y-m-d', time());
-
             // 使用表注释为文件名称
             $tableInfo = Db::query("SHOW TABLE STATUS LIKE '{$table}'");
             $Comment = $tableInfo[0]['Comment'] ?: '数据_';
diff --git a/public/static/system/module/admin.js b/public/static/system/module/admin.js
index c2a246c..ee32f62 100644
--- a/public/static/system/module/admin.js
+++ b/public/static/system/module/admin.js
@@ -1136,6 +1136,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
                     type = $(elem).data('type') || 'normal',
                     size = $(elem).data('size') || 102400,
                     accept = $(elem).data('accept') || 'images',
+                    chunk = $(elem).data('chunk') || false,
                     multiple = $(elem).data('multiple') || false,
                     chunkSize = typeof _upload_chunkSize != 'undefined' ? _upload_chunkSize : '2097152',
                     callback = $(elem).attr('callback') || undefined,
@@ -1189,8 +1190,8 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
                                 layer.error('文件大小超过限制，最大不超过' + size + 'KB');
                                 return false;
                             }
-
-                            if (file.size <= chunkSize) {
+                            // 使用data-chunk="close"关闭分片上传
+                            if (file.size <= chunkSize || chunk === 'close') {
                                 obj.upload(index, file)
                                 delete files[index];
                             } else {