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

😎1、调整默认字典ID（重新生成字典表即可，先删再自动重建） 2、清理代码及升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-03-04 01:26:06 +08:00
parent d14ea3494e
commit 46221a7a0d
6 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.20" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.20" />
<PackageReference Include="Furion.Pure" Version="4.9.7.20" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.21" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.21" />
<PackageReference Include="Furion.Pure" Version="4.9.7.21" />
<PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -45,7 +45,7 @@
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.8" />
<PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="7.1.1" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1189" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1190" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

15
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
View File

@ -69,13 +69,14 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
new SysDictData{ Id=1300000000601, DictTypeId=1300000000106, Label="不需要", Value="off", OrderNo=100, Remark="不需要打印支持", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
new SysDictData{ Id=1300000000602, DictTypeId=1300000000106, Label="绑定打印模版", Value="custom", OrderNo=101, Remark="绑定打印模版", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
new SysDictData{ Id=1300000000701, DictTypeId=1300000000201, Label="集团", Value="101", OrderNo=100, Remark="集团", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000702, DictTypeId=1300000000201, Label="公司", Value="201", OrderNo=101, Remark="公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000703, DictTypeId=1300000000201, Label="部门", Value="301", OrderNo=102, Remark="部门", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000704, DictTypeId=1300000000201, Label="区域", Value="401", OrderNo=103, Remark="区域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000705, DictTypeId=1300000000201, Label="组", Value="501", OrderNo=104, Remark="组", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000706, DictTypeId=1300000000202, Label="普通列表", Value="List", OrderNo=105, Remark="普通列表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000707, DictTypeId=1300000000202, Label="树形表", Value="Tree", OrderNo=106, Remark="树形表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000701, DictTypeId=1300000000107, Label="普通列表", Value="List", OrderNo=105, Remark="普通列表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000000702, DictTypeId=1300000000107, Label="树形表", Value="Tree", OrderNo=106, Remark="树形表", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005001, DictTypeId=1300000005001, Label="集团", Value="101", OrderNo=100, Remark="集团", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005002, DictTypeId=1300000005001, Label="公司", Value="201", OrderNo=101, Remark="公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005003, DictTypeId=1300000005001, Label="部门", Value="301", OrderNo=102, Remark="部门", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005004, DictTypeId=1300000005001, Label="区域", Value="401", OrderNo=103, Remark="区域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictData{ Id=1300000005005, DictTypeId=1300000005001, Label="组", Value="501", OrderNo=104, Remark="组", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
];
}
}

4
Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
View File

@ -25,8 +25,8 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
new SysDictType{ Id=1300000000104, Name="代码生成方式", Code="code_gen_create_type", SysFlag=YesNoEnum.Y, OrderNo=103, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
new SysDictType{ Id=1300000000105, Name="代码生成基类", Code="code_gen_base_class", SysFlag=YesNoEnum.Y, OrderNo=104, Remark="代码生成基类", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
new SysDictType{ Id=1300000000106, Name="代码生成打印类型", Code="code_gen_print_type", SysFlag=YesNoEnum.Y, OrderNo=105, Remark="代码生成打印类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
new SysDictType{ Id=1300000000201, Name="机构类型", Code="org_type", SysFlag=YesNoEnum.Y, OrderNo=201, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000000202, Name="代码生成控件表类型", Code="code_gen_tab_type", SysFlag=YesNoEnum.Y, OrderNo=202, Remark="代码生成控件表类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000000107, Name="代码生成控件表类型", Code="code_gen_tab_type", SysFlag=YesNoEnum.Y, OrderNo=202, Remark="代码生成控件表类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
new SysDictType{ Id=1300000005001, Name="机构类型", Code="org_type", SysFlag=YesNoEnum.Y, OrderNo=201, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
];
}
}

1
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
View File

@ -75,6 +75,7 @@ public class CodeGenOutput
/// 树控件名称
/// </summary>
public string? TreeName { get; set; }
/// <summary>
/// 树控件key
/// </summary>

13
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.03.01",
"lastBuildTime": "2025.03.04",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -76,7 +76,7 @@
"vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.99",
"vxe-pc-ui": "^4.3.100",
"vxe-table": "^4.10.0",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
@ -100,7 +100,7 @@
"eslint-plugin-vue": "^9.32.0",
"globals": "^16.0.0",
"less": "^4.2.2",
"prettier": "^3.5.2",
"prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.85.1",
"terser": "^5.39.0",
@ -111,6 +111,13 @@
"vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^9.4.3"
},
"pnpm": {
"onlyBuiltDependencies": [
"@vue-office/docx",
"@vue-office/excel",
"@vue-office/pdf"
]
},
"browserslist": [
"> 1%",
"last 2 versions",

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

@ -99,24 +99,20 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="树key字段" prop="treeKey">
<template v-slot:label>
<div>
PidKey字段
<el-tooltip raw-content content="本表作为树控件的树属性父ID，PidKey字段字段，没有就请留空。" placement="top">
<el-icon size="16"
style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-select v-model="state.ruleForm.treeKey" @change="treeKeyChanged" value-key="value"
filterable clearable class="w100">
<el-option v-for="item in state.columnData" :key="item.columnName"
:label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'"
:value="item" />
</el-select>
</el-form-item>
</el-col>
<el-form-item label="树key字段" prop="treeKey">
<template v-slot:label>
<div>
PidKey字段
<el-tooltip raw-content content="本表作为树控件的树属性父ID，PidKey字段字段，没有就请留空。" placement="top">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-select v-model="state.ruleForm.treeKey" @change="treeKeyChanged" value-key="value" filterable clearable class="w100">
<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="生成菜单" prop="generateMenu">
<el-radio-group v-model="state.ruleForm.generateMenu">
@ -499,7 +495,7 @@ const tableChanged = (item: any) => {
const tabTypeChanged = async (item: any) => {
state.ruleForm.tabType = item;
}
};
const treeNameChanged = (item: any) => {
state.ruleForm.treeName = item.columnName;
};