gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎清理无效代码（待完善）

Browse Source
This commit is contained in:
zuohuaijun 2024-12-19 14:04:07 +08:00
parent 69b1052474
commit 8d9dfe73cd
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -46,7 +46,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1144" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1145" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

2
Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs
View File

@ -68,6 +68,8 @@ public class CustomViewEngine : ViewEngineModel
private List<ColumnOuput> ColumnList { get; set; } private List<ColumnOuput> ColumnList { get; set; }
public List<TableUniqueConfigItem> TableUniqueConfigList { get; set; }
public string GetColumnNetType(object tbName, object colName) public string GetColumnNetType(object tbName, object colName)
{ {
if (tbName == null || colName == null) return null; if (tbName == null || colName == null) return null;

1
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
View File

@ -582,6 +582,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
ClassName = input.TableName!, // 类名称 ClassName = input.TableName!, // 类名称
PagePath = input.PagePath!, // 页面目录 PagePath = input.PagePath!, // 页面目录
ProjectLastName = input.NameSpace!.Split('.').Last(), // 项目最后个名称，生成的时候赋值 ProjectLastName = input.NameSpace!.Split('.').Last(), // 项目最后个名称，生成的时候赋值
TableUniqueConfigList = input.TableUniqueList ?? new(), // 唯一字段列表
QueryWhetherList = queryWhetherList, // 查询条件 QueryWhetherList = queryWhetherList, // 查询条件
TableField = tableFieldList, // 表字段配置信息 TableField = tableFieldList, // 表字段配置信息
IsJoinTable = joinTableList.Count > 0,//是否联表 IsJoinTable = joinTableList.Count > 0,//是否联表

6
Web/src/views/system/codeGen/component/editCodeGenDialog.vue
View File

@ -166,7 +166,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-divider border-style="dashed" content-position="center">
<!-- <el-divider border-style="dashed" content-position="center">
<div style="color: #b1b3b8">数据唯一性配置</div> <div style="color: #b1b3b8">数据唯一性配置</div>
</el-divider> </el-divider>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@ -203,7 +204,7 @@
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
</el-col> </el-col> -->
</el-row> </el-row>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
@ -393,6 +394,7 @@ const submit = () => {
activeTab.value = 'template'; activeTab.value = 'template';
return; return;
} }
let codeGenTemplateIds: any[] = []; let codeGenTemplateIds: any[] = [];
multipleSelection.value.forEach((item: any) => { multipleSelection.value.forEach((item: any) => {
codeGenTemplateIds.push(item.id); codeGenTemplateIds.push(item.id);