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-07-29 23:11:01 +08:00
parent 6a12514d97
commit 6e3ab0491f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
View File

@ -202,10 +202,10 @@ if (@column.ColumnKey == "True"){
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[DisplayName("导出@(@Model.BusName)")] [DisplayName("导出@(@Model.BusName)")]
public async Task<IActionResult> Export(PageMonkeyArticleInput input) public async Task<IActionResult> Export(Page@(@Model.ClassName)Input input)
{ {
var list = await @(@Model.ClassName)Mid.GetQuery(_monkeyArticleRep, input).Select<@(@Model.ClassName)Dto>().OrderBuilder(input).ToListAsync(); var list = await @(@Model.ClassName)Mid.GetQuery(_@(@Model.LowerClassName)Rep, input).Select<@(@Model.ClassName)Dto>().OrderBuilder(input).ToListAsync();
if (list == null || list.Count < 1) if (list == null || list.Count < 1)
throw Oops.Oh("数据为空，导出已取消"); throw Oops.Oh("数据为空，导出已取消");

4
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm
View File

@ -221,8 +221,8 @@ import { useI18n } from 'vue-i18n';
@if(@Model.PrintType != "off"){ @if(@Model.PrintType != "off"){
@:// 推荐设置操作 width 为 200 @:// 推荐设置操作 width 为 200
@:import { hiprint } from 'vue-plugin-hiprint'; @:import { hiprint } from 'vue-plugin-hiprint';
@:import { SysPrintApi } from '/@@/api-monkey/api'; @:import { SysPrintApi } from '/@@/api-services/api';
@:import { SysPrint } from '/@@/api-monkey/models'; @:import { SysPrint } from '/@@/api-services/models';
@:import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue'; @:import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue';
} }
@if (@Model.IsApiService) { @if (@Model.IsApiService) {

8
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.07.28", "lastBuildTime": "2025.07.29",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -50,7 +50,7 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"magic-string": "^0.30.17", "magic-string": "^0.30.17",
"md-editor-v3": "^5.8.2", "md-editor-v3": "^5.8.3",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"monaco-editor": "^0.52.2", "monaco-editor": "^0.52.2",
"mqtt": "^5.13.3", "mqtt": "^5.13.3",
@ -82,7 +82,7 @@
"vue-router": "^4.5.1", "vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.7.30", "vxe-pc-ui": "^4.8.0",
"vxe-table": "^4.14.8", "vxe-table": "^4.14.8",
"xe-utils": "^3.7.8", "xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0" "xlsx-js-style": "^1.2.0"
@ -99,7 +99,7 @@
"@vitejs/plugin-vue": "^6.0.1", "@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.0.1", "@vitejs/plugin-vue-jsx": "^5.0.1",
"@vue/compiler-sfc": "^3.5.18", "@vue/compiler-sfc": "^3.5.18",
"code-inspector-plugin": "^1.0.2", "code-inspector-plugin": "^1.0.3",
"eslint": "^9.32.0", "eslint": "^9.32.0",
"eslint-plugin-vue": "^10.3.0", "eslint-plugin-vue": "^10.3.0",
"globals": "^16.3.0", "globals": "^16.3.0",