修复代码生成无法打包到zip,以及增加可选独立打包前后端区分种子数据

Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -47,8 +47,12 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=1300000000309, DictTypeId=1300000000103, Value="Guid", Code="Guid", OrderNo=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000310, DictTypeId=1300000000103, Value="DateTimeOffset", Code="DateTimeOffset", OrderNo=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=1300000000401, DictTypeId=1300000000104, Value="下载压缩包", Code="1", OrderNo=1, Remark="下载压缩包", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=1300000000402, DictTypeId=1300000000104, Value="生成到本项目", Code="2", OrderNo=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000401, DictTypeId=1300000000104, Value="下载压缩包", Code="100", OrderNo=1, Remark="下载压缩包", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000402, DictTypeId=1300000000104, Value="生成到本项目", Code="2", OrderNo=4, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000403, DictTypeId=1300000000104, Value="下载压缩包(前端)", Code="111", OrderNo=2, Remark="下载压缩包(前端)", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000404, DictTypeId=1300000000104, Value="下载压缩包(后端)", Code="121", OrderNo=3, Remark="下载压缩包(后端)", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000405, DictTypeId=1300000000104, Value="生成到本项目(前端)", Code="211", OrderNo=5, Remark="生成到本项目(前端)", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000406, DictTypeId=1300000000104, Value="生成到本项目(后端)", Code="221", OrderNo=6, Remark="生成到本项目(后端)", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
             new SysDictData{ Id=1300000000501, DictTypeId=1300000000105, Value="EntityBaseId【基础实体Id】", Code="EntityBaseId", OrderNo=1, Remark="【基础实体Id】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000502, DictTypeId=1300000000105, Value="EntityBase【基础实体】", Code="EntityBase", OrderNo=1, Remark="【基础实体】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -223,7 +223,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             input.GenerateType = "200";
 
         // 先删除该表已生成的菜单列表
-        var templatePathList = GetTemplatePathList();
+        var templatePathList = GetTemplatePathList(input);
         List<string> targetPathList;
         var zipPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "CodeGen", input.TableName);
         if (input.GenerateType.StartsWith('1'))
@@ -282,7 +282,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             if (File.Exists(downloadPath))
                 File.Delete(downloadPath);
             ZipFile.CreateFromDirectory(zipPath, downloadPath);
-            return new { url = $"{App.HttpContext.Request.Scheme}://{App.HttpContext.Request.Host}/sysCodeGen/downCode/{input.TableName}.zip" };
+            return new { url = $"{App.HttpContext.Request.Scheme}://{App.HttpContext.Request.Host}/CodeGen/{input.TableName}.zip" };
         }
     }
 

Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -85,7 +85,7 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="生成方式" prop="generateType">
 							<el-select v-model="state.ruleForm.generateType" filterable class="w100">
-								<el-option v-for="item in state.codeGenTypeList" :key="item.value" :label="item.label" :value="item.value" />
+								<el-option v-for="item in state.codeGenTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
 						</el-form-item>
 					</el-col>

Web/src/views/system/codeGen/index.vue

@@ -30,11 +30,11 @@
 				<el-table-column prop="authorName" label="作者姓名" show-overflow-tooltip />
 				<el-table-column prop="generateType" label="生成方式" show-overflow-tooltip>
 					<template #default="scope">
-						<el-tag v-if="scope.row.generateType === 100"> 下载压缩包 </el-tag>
-						<el-tag v-else-if="scope.row.generateType === 111"> 下载压缩包(前端) </el-tag>
-						<el-tag v-else-if="scope.row.generateType === 121"> 下载压缩包(后端) </el-tag>
-						<el-tag v-else-if="scope.row.generateType === 211"> 生成到本项目(前端) </el-tag>
-						<el-tag v-else-if="scope.row.generateType === 221"> 生成到本项目(后端) </el-tag>
+						<el-tag v-if="scope.row.generateType == 100"> 下载压缩包 </el-tag>
+						<el-tag v-else-if="scope.row.generateType == 111"> 下载压缩包(前端) </el-tag>
+						<el-tag v-else-if="scope.row.generateType == 121"> 下载压缩包(后端) </el-tag>
+						<el-tag v-else-if="scope.row.generateType == 211"> 生成到本项目(前端) </el-tag>
+						<el-tag v-else-if="scope.row.generateType == 221"> 生成到本项目(后端) </el-tag>
 						<el-tag type="danger" v-else> 生成到本项目 </el-tag>
 					</template>
 				</el-table-column>