From c919f17c1e75c57ca93e40df20ac9a7a24d33384 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Mon, 7 Nov 2022 23:29:48 +0800 Subject: [PATCH] =?UTF-8?q?v2.0=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../support/codegenerator/service/CodeGeneratorService.java | 5 +++++ .../form/code-generator-table-config-form-basic.vue | 2 +- .../form/code-generator-table-config-form-delete.vue | 2 +- .../code-generator-table-config-form-insert-and-update.vue | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6439229b..096d52f4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ SmartAdmin 由河南·洛阳 [1024 创新实验室](https://www.1024lab.net/)使 ### 地址 在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net) -部署文档：[http://smartadmin.1024lab.net](http://smartadmin.1024lab.net) +部署文档：[http://smartadmin.1024lab.net](http://smartadmin.1024lab.net) （文档在努力更新中） vue2版本：请查看 feature/1.x 分支 ### 理念与思想 diff --git a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/service/CodeGeneratorService.java index f7b9aae5..c4b85059 100644 --- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/service/CodeGeneratorService.java @@ -149,6 +149,11 @@ public class CodeGeneratorService { } } + // 校验表必须有主键 + if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){ + return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构"); + } + codeGeneratorConfigEntity.setTableName(form.getTableName()); codeGeneratorConfigEntity.setBasic(JSON.toJSONString(form.getBasic())); codeGeneratorConfigEntity.setFields(JSONArray.toJSONString(form.getFields())); diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue index 2e576d53..4e7cc942 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue @@ -223,7 +223,7 @@ resolve(true); }) .catch((error) => { - message.error('基础命名表单 参数验证错误!'); + message.error(' 请检查【1.基础命名】表单，有参数验证错误'); reject(error); }); }); diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue index d0268cd3..fcec0f99 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue @@ -101,7 +101,7 @@ resolve(true); }) .catch((error) => { - message.error('删除表单 参数验证错误!'); + message.error(' 请检查【4.删除】表单，有参数验证错误'); reject(error); }); }); diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue index 1e01da55..525ff99a 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue @@ -265,7 +265,7 @@ resolve(true); }) .catch((error) => { - message.error('基础命名表单 参数验证错误!'); + message.error(' 请检查【3.增加、修改】表单，有参数验证错误'); reject(error); }); });