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

😎1、修复代码生成模板枚举插槽错误 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-07-24 02:10:48 +08:00
parent 42dfb4da4b
commit 5144f771d4
3 changed files with 18 additions and 18 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.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.7" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.99" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.99" />
<PackageReference Include="Furion.Pure" Version="4.9.7.99" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.103" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.103" />
<PackageReference Include="Furion.Pure" Version="4.9.7.103" />
<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -52,7 +52,7 @@
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.229" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.230" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.198" />
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.6" />
@ -74,7 +74,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.3.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.9" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.11" />

2
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm
View File

@ -169,7 +169,7 @@
@:</template>
} else if(@column.EffectType == "EnumSelector") {
@:<template #row_@(@column.LowerPropertyName)="{ row }">
@:<el-tag :type="dv('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
@:<el-tag :type="dc('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dc('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.label}}</el-tag>
@:</template>
}
}

24
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.07.21",
"lastBuildTime": "2025.07.24",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -21,17 +21,17 @@
"@logicflow/core": "^2.0.16",
"@logicflow/extension": "^2.0.21",
"@microsoft/signalr": "^8.0.7",
"@vue-office/docx": "^1.6.2",
"@vue-office/docx": "^1.6.3",
"@vue-office/excel": "^1.7.14",
"@vue-office/pdf": "^2.0.9",
"@vue-office/pdf": "^2.0.10",
"@vueuse/core": "^13.5.0",
"@vxe-ui/plugin-export-xlsx": "^4.2.2",
"@vxe-ui/plugin-export-xlsx": "^4.2.3",
"@vxe-ui/plugin-render-element": "^4.0.13",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
"async-validator": "^4.2.5",
"axios": "^1.10.0",
"axios": "^1.11.0",
"countup.js": "^2.9.0",
"cropperjs": "^1.6.2",
"crypto-js": "^4.2.0",
@ -71,20 +71,20 @@
"uuid": "^11.1.0",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
"vue": "^3.5.17",
"vue": "^3.5.18",
"vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.10",
"vue-draggable-plus": "^0.6.0",
"vue-element-plus-x": "^1.3.11-beta",
"vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^11.1.10",
"vue-i18n": "^11.1.11",
"vue-json-pretty": "^2.5.0",
"vue-plugin-hiprint": "^0.0.60",
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.7.17",
"vxe-table": "^4.14.4",
"vxe-pc-ui": "^4.7.21",
"vxe-table": "^4.14.5",
"xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0"
},
@ -95,11 +95,11 @@
"@types/node": "^22.15.35",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.37.0",
"@typescript-eslint/parser": "^8.37.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@vitejs/plugin-vue": "^6.0.0",
"@vitejs/plugin-vue-jsx": "^5.0.1",
"@vue/compiler-sfc": "^3.5.17",
"@vue/compiler-sfc": "^3.5.18",
"code-inspector-plugin": "^0.20.17",
"eslint": "^9.31.0",
"eslint-plugin-vue": "^10.3.0",