From c862514fe2fc5a5d4137303bd6faa1097f2486a9 Mon Sep 17 00:00:00 2001 From: luolin <766488893@qq.com> Date: Thu, 27 Apr 2023 23:35:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8E=BB=E6=8E=89=E5=88=86=E9=9A=94=E7=AC=A6?= =?UTF-8?q?=E3=80=81i18n=E6=96=87=E4=BB=B6=E5=8F=98=E9=87=8F=E5=90=8D?= =?UTF-8?q?=E5=B0=8F=E9=A9=BC=E5=B3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/codegen/service/impl/GeneratorServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java index 679589bd8..0c7af58f4 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java @@ -249,6 +249,8 @@ public class GeneratorServiceImpl implements GeneratorService { dataModel.put("fieldList", table.getFieldList()); dataModel.put("backendPath", table.getBackendPath()); dataModel.put("frontendPath", table.getFrontendPath()); + dataModel.put("vAuthName", table.getClassName().toLowerCase()); + dataModel.put("i18nName", StrUtil.lowerFirst(table.getClassName())); return dataModel; } From 0d129893cf73ec06138754ce8caddf490fae3286 Mon Sep 17 00:00:00 2001 From: luolin <766488893@qq.com> Date: Fri, 28 Apr 2023 10:25:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/codegen/service/impl/GeneratorServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java index 0c7af58f4..07564ff99 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java @@ -217,7 +217,8 @@ public class GeneratorServiceImpl implements GeneratorService { // 获取字段列表 List fieldList = columnService.lambdaQuery() .eq(GenTableColumnEntity::getDsName, table.getDsName()) - .eq(GenTableColumnEntity::getTableName, table.getTableName()).list(); + .eq(GenTableColumnEntity::getTableName, table.getTableName()) + .orderByAsc(GenTableColumnEntity::getSort).list(); table.setFieldList(fieldList); // 创建数据模型对象 From f2e637e17c5e6f832768d0778687c9d1f5207c37 Mon Sep 17 00:00:00 2001 From: luolin <766488893@qq.com> Date: Fri, 28 Apr 2023 11:29:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:recycle:=20Refactoring=20code.=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=A4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/codegen/service/impl/GenTableServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java index c41c50619..b0f89994e 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java @@ -141,7 +141,7 @@ public class GenTableServiceImpl extends ServiceImpl i table.setDsName(dsName); table.setTableComment(MapUtil.getStr(queryTable, "tableComment")); table.setDbType(MapUtil.getStr(queryTable, "dbType")); - table.setFormLayout(FormLayoutEnum.ONE.getValue()); + table.setFormLayout(FormLayoutEnum.TWO.getValue()); table.setGeneratorType(GeneratorTypeEnum.ZIP_DOWNLOAD.ordinal()); table.setClassName(NamingCase.toPascalCase(tableName)); table.setModuleName(GenKit.getModuleName(table.getPackageName()));