From bd033be4d1947f00f3b91ca2f546d308a45ca425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 6 Dec 2022 18:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt | 2 +-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index 0707dc0..1fb2b44 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -155,7 +155,7 @@ $if(replaceDto.ShowBtnExport)
             {
                 return ToResponse(ResultCode.FAIL, "没有要导出的数据");
             }
-            string sFileName = ExportExcel(list, "${replaceDto.ModelTypeName}", "${genTable.FunctionName}");
+            string sFileName = ExportExcel(list, "${genTable.FunctionName}", "${genTable.FunctionName}");
             return ExportExcel("export", sFileName);
         }
 $end
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 9465a14..7c59d2a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -281,7 +281,6 @@ $end
 
 <script setup name="${genTable.BusinessName.ToLower()}">
 import { list${genTable.BusinessName}, add${genTable.BusinessName}, del${genTable.BusinessName}, update${genTable.BusinessName}, get${genTable.BusinessName}, 
-$if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end
 $if(replaceDto.ShowBtnTruncate) clear${genTable.BusinessName}, $end 
 $if(showCustomInput) changeSort $end } 
 from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
@@ -570,13 +569,13 @@ $if(replaceDto.ShowBtnExport)
 // 导出按钮操作
 function handleExport() {
   proxy
-    .${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
+    .${confirm}confirm("是否确认导出${genTable.functionName}数据项?", "警告", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
       type: "warning",
     })
     .then(async () => {
-      await export${genTable.BusinessName}(queryParams)
+      await proxy.downFile('/${genTable.ModuleName}/${genTable.BusinessName}/export', { ...queryParams })
     })
 }
 $end