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

😎1、增加302跳转 2、修复字典获取错误 3、修复提交记录显示 4、升级npm依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-07-25 23:39:58 +08:00
parent 36d2b8f21a
commit ee0f76223a
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs
View File

@ -157,6 +157,6 @@ public class SysDictTypeService : IDynamicApiController, ITransient
.Where((u, a) => u.IsDelete == false && a.IsDelete == false && a.Status == StatusEnum.Enable)
.Select((u, a) => new { TypeCode = u.Code, a.Code, a.Name, a.Value, a.Remark, a.OrderNo, a.TagType, a.ExtData })
.ToListAsync();
return ds.OrderBy(u => new { u.OrderNo, u.Code }).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
return ds.OrderBy(u => u.OrderNo).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
}
}

13
Admin.NET/Admin.NET.Core/Util/AdminResultProvider.cs
View File

@ -84,6 +84,19 @@ public class AdminResultProvider : IUnifyResultProvider
await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, errors: "403 禁止访问，没有权限"),
App.GetOptions<JsonOptions>()?.JsonSerializerOptions);
break;
// 处理 302 状态码
case StatusCodes.Status302Found:
if (context.Response.Headers.TryGetValue("Location", out var redirectUrl))
{
context.Response.Redirect(redirectUrl);
}
else
{
var errorMessage = "302 跳转失败，没有提供 Location 头信息";
await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, errors: errorMessage),
App.GetOptions<JsonOptions>()?.JsonSerializerOptions);
}
break;
default: break;
}

8
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2024.07.24",
"lastBuildTime": "2024.07.25",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -34,7 +34,7 @@
"element-plus": "^2.7.7",
"exceljs": "^4.4.0",
"ezuikit": "^1.0.0",
"ezuikit-js": "^8.0.5",
"ezuikit-js": "^8.0.6",
"gcoord": "^1.0.6",
"js-cookie": "^3.0.5",
"js-table2excel": "^1.1.2",
@ -87,7 +87,7 @@
"@vitejs/plugin-vue": "^5.1.0",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue/compiler-sfc": "^3.4.34",
"code-inspector-plugin": "^0.14.2",
"code-inspector-plugin": "^0.15.2",
"eslint": "^9.7.0",
"eslint-plugin-vue": "^9.27.0",
"less": "^4.2.0",
@ -96,7 +96,7 @@
"sass": "^1.77.8",
"terser": "^5.31.3",
"typescript": "^5.5.4",
"vite": "^5.3.4",
"vite": "^5.3.5",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.1.3",
"vite-plugin-vue-setup-extend": "^0.4.0",

2
Web/src/views/home/widgets/components/commit.vue
View File

@ -8,7 +8,7 @@
<div class="commit" v-loading="state.loading">
<el-timeline style="max-width: 600px" v-if="state.list.length > 0">
<el-timeline-item v-for="(item, index) in state.list" :key="index" :timestamp="formatDate(new Date(item.commit.committer.date), 'YYYY-mm-dd HH:MM:SS')">
<el-link style="white-space: pre-line" :href="item.html_url" target="_blank"> {{ item.commit.message }}</el-link>
<el-link style="white-space: pre-line; word-break: break-all" :href="item.html_url" target="_blank"> {{ item.commit.message }}</el-link>
</el-timeline-item>
</el-timeline>
<el-empty v-else description="空"></el-empty>