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

😎代码优化及升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-03-25 10:29:25 +08:00
parent 6c68f7988f
commit 91c0bc5c14
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.3" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.33" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.34" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.33" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.34" />
<PackageReference Include="Furion.Pure" Version="4.9.7.33" /> <PackageReference Include="Furion.Pure" Version="4.9.7.34" />
<PackageReference Include="Hardware.Info" Version="101.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
@ -56,7 +56,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.6.0.2" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
<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.1206" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1207" />
<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>

6
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.03.24", "lastBuildTime": "2025.03.25",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -91,8 +91,8 @@
"@types/node": "^20.17.25", "@types/node": "^20.17.25",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.27.0", "@typescript-eslint/eslint-plugin": "^8.28.0",
"@typescript-eslint/parser": "^8.27.0", "@typescript-eslint/parser": "^8.28.0",
"@vitejs/plugin-vue": "^5.2.3", "@vitejs/plugin-vue": "^5.2.3",
"@vitejs/plugin-vue-jsx": "^4.1.2", "@vitejs/plugin-vue-jsx": "^4.1.2",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",

4
Web/src/i18n/index.ts
View File

@ -169,10 +169,10 @@ export const i18n = createI18n({
globalInjection: true, globalInjection: true,
fallbackFormat: false, // 关闭默认的 fallback 行为 fallbackFormat: false, // 关闭默认的 fallback 行为
missing: (locale, key) => { missing: (locale, key) => {
// 安全地获取最后一部分，如果没有'.'则返回整个key // 若没有'.'（翻译内容）则返回整个key
const lastPart = key.includes('.') ? key.split('.').pop()! : key; const lastPart = key.includes('.') ? key.split('.').pop()! : key;
return lastPart.replace(/\${(.+?)}/g, '$1'); return lastPart.replace(/\${(.+?)}/g, '$1');
} },
}); });
//iso 3166-1 国家代码 //iso 3166-1 国家代码

2
Web/src/layout/navBars/topBar/user.vue
View File

@ -253,7 +253,7 @@ const onLanguageChange = (lang: string) => {
refreshCurrentTabpage(); refreshCurrentTabpage();
}; };
//刷新当前tabpage. // 刷新当前标签页
const refreshCurrentTabpage = () => { const refreshCurrentTabpage = () => {
mittBus.emit('onCurrentContextmenuClick', { ...routeStores.currentRoute, contextMenuClickId: 0 }); mittBus.emit('onCurrentContextmenuClick', { ...routeStores.currentRoute, contextMenuClickId: 0 });
}; };

2
Web/src/router/index.ts
View File

@ -96,7 +96,7 @@ export function formatTwoStageRoutes(arr: any) {
// 路由加载前 // 路由加载前
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
NProgress.configure({ showSpinner: false }); NProgress.configure({ showSpinner: false });
routeStores.setCurrentRoute(to as unknown as RouteItem); //记录最新当前路由对象. routeStores.setCurrentRoute(to as unknown as RouteItem); // 记录最新当前路由对象
if (to.meta.title) NProgress.start(); if (to.meta.title) NProgress.start();
const token = Session.get('token'); const token = Session.get('token');
if (to.meta.isPublic && !token) { if (to.meta.isPublic && !token) {

1
Web/src/types/pinia.d.ts vendored
View File

@ -40,6 +40,7 @@ declare interface RoutesListState<T = any> {
routesList: T[]; routesList: T[];
isColumnsMenuHover: Boolean; isColumnsMenuHover: Boolean;
isColumnsNavHover: Boolean; isColumnsNavHover: Boolean;
currentRoute: T;
} }
// 布局配置 // 布局配置