From 2fc1c239345fb59616d7f7d4509fea32c817c45c Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Wed, 12 Oct 2022 16:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8F=AF=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/traits/Curd.php                 | 8 +++++++-
 app/common/controller/AdminController.php | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/admin/traits/Curd.php b/app/admin/traits/Curd.php
index 3987b41..44ebcf1 100644
--- a/app/admin/traits/Curd.php
+++ b/app/admin/traits/Curd.php
@@ -122,7 +122,13 @@ trait Curd
 
         $content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
 
-        return download($content, $this->model->getName() . date('YmdHis') . '.xlsx', true);
+        $export_file_name = $this->exportFileName;
+
+        if (empty($export_file_name)) {
+            $export_file_name = $this->model->getName();
+        }
+
+        return download($content,  $export_file_name . date('YmdHis') . '.xlsx', true);
     }
 
     /**
diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php
index 7ec8204..fe5b16c 100644
--- a/app/common/controller/AdminController.php
+++ b/app/common/controller/AdminController.php
@@ -94,6 +94,13 @@ class AdminController extends BaseController
 
     protected $batchValidate = false;
 
+    /**
+     * 导出文件的名称，支持中文，为空则获取模型名称
+     *
+     * @var string
+     */
+    protected $exportFileName = null;
+
     /**
      * 初始化方法
      */