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-06 00:58:13 +08:00
parent 2e910f64ec
commit 410b47a522
7 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@
<PackageReference Include="MiniWord" Version="0.8.0" />
<PackageReference Include="MQTTnet" Version="4.3.7.1207" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.8" />
<PackageReference Include="NewLife.Redis" Version="6.0.2024.1202" />
<PackageReference Include="NewLife.Redis" Version="6.0.2024.1205" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
@ -46,7 +46,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.9" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1135" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1136" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

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

@ -218,7 +218,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName);
if (entityType == null) return null;
var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
var properties = GetEntityInfos().Result.First(u => u.DbTableName.ToLower() == tableName).Type.GetProperties()
var properties = GetEntityInfos().Result.First(u => u.DbTableName == tableName).Type.GetProperties()
.Where(e => e.GetCustomAttribute<SugarColumn>()?.IsIgnore == false).Select(u => new
{
PropertyName = u.Name,

12
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/data.data.ts.vm
View File

@ -1,5 +1,7 @@
import { h } from 'vue';
import { BasicColumn, FormSchema } from '/@@/components/Table';
import { useUserInfo } from '/@@/stores/userInfo';
@foreach (var column in Model.TableField){
if(@column.EffectType == "Upload"){
@:import { uploadFile } from '/@@/api/sys/admin';
@ -9,12 +11,14 @@ if(@column.EffectType == "Upload"){
@:import { getDataList } from '/@@/api/sys/admin';
}else if(@column.EffectType == "ApiTreeSelector"){
@:import { get@(@column.FkEntityName)Tree } from '/@@/api/main/@(@Model.ClassName)';
}else if(@column.EffectType == "ConstSelector"){
@:import { codeToName, getSelector } from '/@@/utils/helper/constSelectorHelper';
}else if(@column.EffectType == "Switch"){
@:import { Switch } from 'ant-design-vue';
}else if(@column.EffectType == "ConstSelector"){
@:const codeToName = useUserInfo().codeToName;
@:const getConstType = useUserInfo().getConstDataByTypeCode;
}
}
export const columns: BasicColumn[] = [
@foreach (var column in Model.TableField){
if(@column.WhetherTable == "Y"){
@ -69,7 +73,7 @@ if(@column.EffectType == "ForeignKey"){
}else if(@column.EffectType == "ConstSelector"){
@:component: 'Select',
@:componentProps: {
@:options: getSelector('@(@column.DictTypeCode)'),
@:options: getConstType('@(@column.DictTypeCode)'),
@:fieldNames: {
@:label: 'name',
@:value: 'code',
@ -120,7 +124,7 @@ if(@column.EffectType == "ForeignKey"){
}else if(@column.EffectType == "ConstSelector"){
@:component: 'Select',
@:componentProps: {
@:options: getSelector('@(@column.DictTypeCode)'),
@:options: getConstType('@(@column.DictTypeCode)'),
@:fieldNames: {
@:label: 'name',
@:value: 'code',

25
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
View File

@ -177,13 +177,13 @@
import { ref,onMounted, reactive } from "vue";
import { ElMessage } from "element-plus";
import type { FormRules } from "element-plus";
import { useUserInfo } from '/@@/stores/userInfo';
@if (@Model.IsApiService) {
// 接口函数
@:import { getAPI } from '/@@/utils/axios-utils';
// 接口
@:import { @(@Model.ClassName)Api } from '/@@/api-services/api';
// 模型
@:import { Update@(@Model.ClassName)Input } from '/@@/api-services/models';
} else {
@ -204,27 +204,28 @@ if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
@:import { @string.Join(",",Model.TableField.Where(x=>x.EffectType == "Upload").Select(x=>"upload"+x.PropertyName).ToList()) } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
}
}
@if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:import { getConstType } from "/@@/utils/constHelper";
}
@if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
}
@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
}
@if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
@:import { formatDate } from '/@@/utils/formatTime';
}
@foreach (var column in Model.TableField){
if(@column.EffectType == "ApiTreeSelector" && !definedObjects.ContainsKey("import__@(@column.FkEntityName)Tree")){
@{definedObjects.Add("import__@(@column.FkEntityName)Tree", 1);}
}
}
}
@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:import { SysEnumApi } from '/@@/api-services/api';
}
const userStore = useUserInfo();
@if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:const getConstType = userStore.getConstDataByTypeCode;
}
@if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:const dc = userStore.getDictItemByCode;
@:const dv = userStore.getDictLabelByVal;
@:const dl = userStore.getDictDataByCode;
}
//父级传递来的参数
var props = defineProps({
title: {

29
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
View File

@ -158,7 +158,7 @@
else if(@column.EffectType == "DictSelector"){
@:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" >
@:<template #default="scope">
@:<el-tag :type="di('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{di("@(@column.DictTypeCode)", scope.row.@(@column.LowerPropertyName))?.value}} </el-tag>
@:<el-tag :type="dc('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{dc("@(@column.DictTypeCode)", scope.row.@(@column.LowerPropertyName))?.value}} </el-tag>
@:</template>
@:</el-table-column>
}
@ -217,16 +217,7 @@
import { ref } from "vue";
import { ElMessageBox, ElMessage } from "element-plus";
import { auth } from '/@@/utils/authFunction';
@if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:import { codeToName, getConstType } from "/@@/utils/constHelper";
}
@if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
}
@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
}
import { useUserInfo } from '/@@/stores/userInfo';
import { Local } from '/@@/utils/storage';
@if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
@ -250,10 +241,20 @@
}
}
@if(@Model.QueryWhetherList.Any(x=>x.EffectType == "EnumSelector")){
@:import { getAPI } from '/@@/utils/axios-utils';
@:import { SysEnumApi } from '/@@/api-services/api';
@:import { getAPI } from '/@@/utils/axios-utils';
@:import { SysEnumApi } from '/@@/api-services/api';
@:import commonFunction from '/@@/utils/commonFunction';
}
}
const userStore = useUserInfo();
@if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:const codeToName = userStore.codeToName;
}
@if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
@:const dc = userStore.getDictItemByCode;
@:const dv = userStore.getDictLabelByVal;
@:const dl = userStore.getDictDataByCode;
}
// 本地存储参数
const localPageParamKey = 'localPageParam:@(@Model.LowerClassName)';

8
Web/package.json
View File

@ -50,7 +50,7 @@
"monaco-editor": "^0.52.0",
"mqtt": "^5.10.3",
"nprogress": "^0.2.0",
"ol": "^10.3.0",
"ol": "^10.3.1",
"pinia": "^2.3.0",
"print-js": "^1.6.0",
"push.js": "^1.0.12",
@ -74,7 +74,7 @@
"vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.15",
"vxe-pc-ui": "^4.3.17",
"vxe-table": "^4.8.10",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
@ -101,9 +101,9 @@
"prettier": "^3.4.2",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.82.0",
"terser": "^5.36.0",
"terser": "^5.37.0",
"typescript": "^5.7.2",
"vite": "^6.0.2",
"vite": "^6.0.3",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3",
"vite-plugin-vue-setup-extend": "^0.4.0",

4
Web/src/stores/userInfo.ts
View File

@ -142,7 +142,7 @@ export const useUserInfo = defineStore('userInfo', {
const _code = code.toString();
const ds = this.getDictDataByCode(typePCode);
for (const element of ds) {
if (element.code === _code) {
if (element.code.toString() === _code) {
return element;
}
}
@ -156,7 +156,7 @@ export const useUserInfo = defineStore('userInfo', {
const _val = val.toString();
const ds = this.getDictDataByCode(typePCode);
for (const element of ds) {
if (element.value === _val) {
if (element.value.toString() === _val) {
return element;
}
}