From f025d051e2fc8fbb05d133730d340a17d8a3fcf2 Mon Sep 17 00:00:00 2001 From: Master Date: Tue, 27 Aug 2024 08:41:04 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E9=9D=A2?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeedData/SysCodeGenTemplate.cs | 60 +++++++++---------- .../Service/CodeGen/SysCodeGenService.cs | 1 + 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs index d5c51776..ff6d53ad 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs @@ -1,31 +1,31 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 -// -// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 -// -// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ - -namespace Admin.NET.Core; - -/// -/// 代码生成模板配置表种子数据 -/// -public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData -{ - /// - /// 种子数据 - /// - /// - public IEnumerable HasData() - { - return new[] - { - new SysCodeGenTemplate{ Id=36036980201001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_api.ts.vm", OutputFile="api/main/{TableNameLower}.ts", Describe ="(WEB)接口"}, - new SysCodeGenTemplate{ Id=36036980201002, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_views_index.vue.vm", OutputFile="views/main/{TableNameLower}/index.vue", Describe ="(WEB)列表页面"}, - new SysCodeGenTemplate{ Id=36036980201003, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_views_editDialog.vue.vm", OutputFile="views/main/{TableNameLower}/component/editDialog.vue", Describe ="(WEB)编辑对话框"}, - - new SysCodeGenTemplate{ Id=36036980202001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_Service.cs.vm", OutputFile="Service/{TableName}/{TableName}Service.cs", Describe ="(服务端)业务"}, - new SysCodeGenTemplate{ Id=36036980202002, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_InputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Input.cs", Describe ="(服务端)输入参数"}, - new SysCodeGenTemplate{ Id=36036980202003, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_OutputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Output.cs", Describe ="(服务端)输出参数"}, - }; - } +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +namespace Admin.NET.Core; + +/// +/// 代码生成模板配置表种子数据 +/// +public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData +{ + /// + /// 种子数据 + /// + /// + public IEnumerable HasData() + { + return new[] + { + new SysCodeGenTemplate{ Id=36036980201001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_api.ts.vm", OutputFile="api/{PagePath}/{TableNameLower}.ts", Describe ="(WEB)接口"}, + new SysCodeGenTemplate{ Id=36036980201002, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_views_index.vue.vm", OutputFile="views/{PagePath}/{TableNameLower}/index.vue", Describe ="(WEB)列表页面"}, + new SysCodeGenTemplate{ Id=36036980201003, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_views_editDialog.vue.vm", OutputFile="views/{PagePath}/{TableNameLower}/component/editDialog.vue", Describe ="(WEB)编辑对话框"}, + + new SysCodeGenTemplate{ Id=36036980202001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_Service.cs.vm", OutputFile="Service/{TableName}/{TableName}Service.cs", Describe ="(服务端)业务"}, + new SysCodeGenTemplate{ Id=36036980202002, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_InputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Input.cs", Describe ="(服务端)输入参数"}, + new SysCodeGenTemplate{ Id=36036980202003, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_OutputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Output.cs", Describe ="(服务端)输出参数"}, + }; + } } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs index 9243fb9a..6cab2204 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs @@ -385,6 +385,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient }); string targetFile = templateList[i].OutputFile + .Replace("{PagePath}", input.PagePath) .Replace("{TableName}", input.TableName) .Replace("{TableNameLower}", ToFirstLetterLowerCase(input.TableName!)); From 1c347de6e57bfbf3eceb6d74b701596dc7b33adf Mon Sep 17 00:00:00 2001 From: Master Date: Tue, 27 Aug 2024 18:22:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=80=89=E9=A1=B9=E4=BD=8D=E7=BD=AE=E4=B8=8E?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/components/iconSelector/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Web/src/components/iconSelector/index.vue b/Web/src/components/iconSelector/index.vue index 97b8370b..1e90093e 100644 --- a/Web/src/components/iconSelector/index.vue +++ b/Web/src/components/iconSelector/index.vue @@ -210,3 +210,9 @@ watch( } ); + + From aeccf511cd434f956d6631ff2b1a6a1c420bb63a Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Tue, 27 Aug 2024 23:29:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E9=BB=98=E8=AE=A4=E7=BA=B8?= =?UTF-8?q?=E5=BC=A0=E5=A4=A7=E5=B0=8F=E5=92=8C=E7=8A=B6=E6=80=81=20=202?= =?UTF-8?q?=E3=80=81=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj | 2 +- Web/package.json | 8 ++++---- .../views/system/print/component/editPrint.vue | 1 + .../system/print/component/hiprint/index.vue | 15 +++++++++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 319af9fb..25ab931d 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -39,7 +39,7 @@ - + diff --git a/Web/package.json b/Web/package.json index 9875bc1e..b0de3546 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.08.26", + "lastBuildTime": "2024.08.27", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -66,7 +66,7 @@ "vue-grid-layout": "3.0.0-beta1", "vue-i18n": "^9.14.0", "vue-json-pretty": "^2.4.0", - "vue-plugin-hiprint": "0.0.57-beta28", + "vue-plugin-hiprint": "0.0.57-beta29", "vue-router": "^4.4.3", "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", @@ -84,8 +84,8 @@ "@types/node": "^20.14.14", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", - "@typescript-eslint/eslint-plugin": "^8.2.0", - "@typescript-eslint/parser": "^8.2.0", + "@typescript-eslint/eslint-plugin": "^8.3.0", + "@typescript-eslint/parser": "^8.3.0", "@vitejs/plugin-vue": "^5.1.2", "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/compiler-sfc": "^3.4.38", diff --git a/Web/src/views/system/print/component/editPrint.vue b/Web/src/views/system/print/component/editPrint.vue index 0889abd1..3dc2c841 100644 --- a/Web/src/views/system/print/component/editPrint.vue +++ b/Web/src/views/system/print/component/editPrint.vue @@ -123,6 +123,7 @@ const loadTemplate = () => { hiprintDesignRef.value?.hiprintTemplate.clear(); if (JSON.stringify(state.ruleForm) !== '{}') { hiprintDesignRef.value?.hiprintTemplate.update(JSON.parse(state.ruleForm.template)); + hiprintDesignRef.value?.initPaper(); } }; diff --git a/Web/src/views/system/print/component/hiprint/index.vue b/Web/src/views/system/print/component/hiprint/index.vue index fba8dea7..76049e04 100644 --- a/Web/src/views/system/print/component/hiprint/index.vue +++ b/Web/src/views/system/print/component/hiprint/index.vue @@ -163,13 +163,14 @@ const state = reactive({ // 计算当前纸张类型 const curPaperType = computed(() => { + let { width, height } = state.curPaper; let type = 'other'; let types: any = state.paperTypes; for (const key in types) { let item = types[key]; - let { width, height } = state.curPaper; if (item.width === width && item.height === height) { type = key; + break; } } return type; @@ -321,8 +322,18 @@ onMounted(() => { // otherPaper(); // 默认纸张 }); +// 初始化纸张大小 +const initPaper = () => { + var template = hiprintTemplate.value.getJson(); + var width = template.panels[0].width; + var height = template.panels[0].height; + + state.curPaper = { type: '', width: width, height: height }; // 计算纸张类型和状态 + hiprintTemplate.value.setPaper(width, height); // 设置纸张大小 +}; + // 导出对象 -defineExpose({ hiprintTemplate }); +defineExpose({ hiprintTemplate, initPaper });