From 698f2bcf4045d93b82a09d0075ac22f2b25aa1db Mon Sep 17 00:00:00 2001 From: liu_yx Date: Fri, 25 Mar 2022 16:02:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(master):=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/codegen/mapper/DataSourceConfigMapper.java | 2 +- .../ballcat/codegen/model/dto/DataSourceConfigDTO.java | 6 ++++++ .../ballcat/codegen/model/entity/DataSourceConfig.java | 6 ++++++ .../ballcat/codegen/model/qo/DataSourceConfigQO.java | 6 +++--- .../codegen/model/vo/DataSourceConfigPageVO.java | 6 ++++++ .../main/resources/mapper/DataSourceConfigMapper.xml | 2 +- .../src/api/gen/datasource-config/types.ts | 6 ++++-- .../src/views/gen/codegen/index.vue | 2 +- .../datasource-config/DataSourceConfigEditModal.vue | 6 ++++++ .../src/views/gen/datasource-config/index.vue | 10 ++++++++-- doc/update_sql/0.6.0-to-1.0.0.sql | 6 +++++- 11 files changed, 47 insertions(+), 11 deletions(-) diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java index 5eab353..8779141 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java @@ -33,7 +33,7 @@ public interface DataSourceConfigMapper extends ExtendMapper { default PageResult queryPage(PageParam pageParam, DataSourceConfigQO qo) { IPage page = this.prodPage(pageParam); LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(DataSourceConfig.class) - .likeIfPresent(DataSourceConfig::getName, qo.getName()); + .likeIfPresent(DataSourceConfig::getTitle, qo.getTitle()); this.selectPage(page, wrapperX); IPage voPage = page.convert(DataSourceConfigConverter.INSTANCE::poToPageVo); return new PageResult<>(voPage.getRecords(), voPage.getTotal()); diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java index 92a7a89..8b27490 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java @@ -23,6 +23,12 @@ public class DataSourceConfigDTO { @Schema(title = "ID") private Integer id; + /** + * 数据源描述 + */ + @Schema(title = "数据源描述") + private String title; + /** * 名称 */ diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java index 9917bb7..2aefee7 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java @@ -29,6 +29,12 @@ public class DataSourceConfig { @Schema(title = "ID") private Integer id; + /** + * 数据源描述 + */ + @Schema(title = "数据源描述") + private String title; + /** * 名称 */ diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/qo/DataSourceConfigQO.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/qo/DataSourceConfigQO.java index 9f4abd8..91f76be 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/qo/DataSourceConfigQO.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/qo/DataSourceConfigQO.java @@ -16,9 +16,9 @@ public class DataSourceConfigQO { private static final long serialVersionUID = 1L; /** - * 数据源名称 + * 数据源描述 */ - @Schema(title = "数据源名称") - private String name; + @Schema(title = "数据源描述") + private String title; } diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java index fc601a8..bbe44d8 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java @@ -23,6 +23,12 @@ public class DataSourceConfigPageVO { @Schema(title = "ID") private Integer id; + /** + * 数据源描述 + */ + @Schema(title = "数据源描述") + private String title; + /** * 名称 */ diff --git a/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml b/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml index 350c30b..0f40ba0 100644 --- a/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml +++ b/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml @@ -3,7 +3,7 @@ diff --git a/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts b/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts index 41ff21f..b856a3d 100644 --- a/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts +++ b/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts @@ -4,8 +4,8 @@ import { PageParam } from '@/api/types' * 数据源配置查询对象 */ export interface DataSourcePageParam extends PageParam { - // 数据源名称 - name?: string + // 数据源描述 + title?: string } /** @@ -14,6 +14,8 @@ export interface DataSourcePageParam extends PageParam { export interface DataSourceConfig { // ID id?: number + // 描述 + title: string, // 名称 name?: string // 用户名 diff --git a/ballcat-codegen-frontend/src/views/gen/codegen/index.vue b/ballcat-codegen-frontend/src/views/gen/codegen/index.vue index 1c63240..76cc0db 100644 --- a/ballcat-codegen-frontend/src/views/gen/codegen/index.vue +++ b/ballcat-codegen-frontend/src/views/gen/codegen/index.vue @@ -10,7 +10,7 @@ > master - {{ item.name }} + {{ item.name || item.value }} diff --git a/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue b/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue index da1aad2..bc4312e 100644 --- a/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue +++ b/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue @@ -14,6 +14,10 @@ + + + + @@ -81,6 +85,7 @@ const modelRef = reactive({ id: undefined, pass: '', + title: '', name: '', username: '', password: '', @@ -90,6 +95,7 @@ // 表单校验规则 const rulesRef = computed(() => { return { + title: [{ required: true, message: '请输入数据源描述！' }], name: [{ required: true, message: '请输入数据源名称!' }], username: [{ required: true, message: '请输入用户名!' }], pass: isUpdate.value ? [] : [{ required: true, message: '请输入密码!' }], diff --git a/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue b/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue index 79e790a..f6ca6d9 100644 --- a/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue +++ b/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue @@ -3,8 +3,8 @@
@@ -59,6 +59,12 @@ dataIndex: 'id', width: '50px' }, + { + title: '数据源描述', + dataIndex: 'title', + ellipsis: true, + width: '100px' + }, { title: '数据源名称', dataIndex: 'name', diff --git a/doc/update_sql/0.6.0-to-1.0.0.sql b/doc/update_sql/0.6.0-to-1.0.0.sql index aea620b..47c5b36 100644 --- a/doc/update_sql/0.6.0-to-1.0.0.sql +++ b/doc/update_sql/0.6.0-to-1.0.0.sql @@ -17,4 +17,8 @@ DROP TABLE `gen_template_info`; -- 修改文件名字段 file_name => filename ALTER TABLE `gen_template_entry` - CHANGE COLUMN `file_name` `filename` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件夹路径/模板文件名称（支持占位符）' AFTER `group_id`; \ No newline at end of file + CHANGE COLUMN `file_name` `filename` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件夹路径/模板文件名称（支持占位符）' AFTER `group_id`; + +-- 新增数据源描述字段 +ALTER TABLE `gen_data_source_config` + ADD COLUMN title VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源描述'; -- Gitee From 684779a29bb363d09ff413fd0ccbf53ac86f3d2a Mon Sep 17 00:00:00 2001 From: liu_yx Date: Fri, 25 Mar 2022 18:09:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(master):=201.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicJdbcDataSourceLoader.java | 2 +- .../model/dto/DataSourceConfigDTO.java | 10 ++++---- .../model/entity/DataSourceConfig.java | 10 ++++---- .../model/vo/DataSourceConfigPageVO.java | 10 ++++---- .../impl/DataSourceConfigServiceImpl.java | 8 +++---- .../mapper/DataSourceConfigMapper.xml | 2 +- .../src/api/gen/datasource-config/types.ts | 8 +++---- .../DataSourceConfigEditModal.vue | 23 +++++++++++++------ .../src/views/gen/datasource-config/index.vue | 6 ++--- doc/update_sql/0.6.0-to-1.0.0.sql | 8 +++++-- 10 files changed, 50 insertions(+), 37 deletions(-) diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/datasource/DynamicJdbcDataSourceLoader.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/datasource/DynamicJdbcDataSourceLoader.java index 92130d3..4fd0142 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/datasource/DynamicJdbcDataSourceLoader.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/datasource/DynamicJdbcDataSourceLoader.java @@ -30,7 +30,7 @@ public class DynamicJdbcDataSourceLoader implements InitializingBean { // 遍历添加进动态数据源中 for (DataSourceConfig dataSourceConfig : list) { - String dsName = dataSourceConfig.getName(); + String dsName = dataSourceConfig.getDsKey(); String username = dataSourceConfig.getUsername(); String password = dynamicDataSourceHelper.decryptPassword(dataSourceConfig.getPassword()); String url = dataSourceConfig.getUrl(); diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java index 8b27490..de9866d 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/dto/DataSourceConfigDTO.java @@ -24,16 +24,16 @@ public class DataSourceConfigDTO { private Integer id; /** - * 数据源描述 + * 标题 */ - @Schema(title = "数据源描述") + @Schema(title = "标题") private String title; /** - * 名称 + * 数据源key */ - @Schema(title = "名称") - private String name; + @Schema(title = "数据源key") + private String dsKey; /** * 用户名 diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java index 2aefee7..74472b4 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java @@ -30,16 +30,16 @@ public class DataSourceConfig { private Integer id; /** - * 数据源描述 + * 标题 */ - @Schema(title = "数据源描述") + @Schema(title = "标题") private String title; /** - * 名称 + * 数据源key */ - @Schema(title = "名称") - private String name; + @Schema(title = "数据源key") + private String dsKey; /** * 用户名 diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java index bbe44d8..e260f46 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/DataSourceConfigPageVO.java @@ -24,16 +24,16 @@ public class DataSourceConfigPageVO { private Integer id; /** - * 数据源描述 + * 标题 */ - @Schema(title = "数据源描述") + @Schema(title = "标题") private String title; /** - * 名称 + * 数据源key */ - @Schema(title = "名称") - private String name; + @Schema(title = "数据源key") + private String dsKey; /** * 用户名 diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java index 4d01d14..33fe77a 100644 --- a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java +++ b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java @@ -60,7 +60,7 @@ public class DataSourceConfigServiceImpl extends ExtendServiceImpl diff --git a/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts b/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts index b856a3d..cc93b3d 100644 --- a/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts +++ b/ballcat-codegen-frontend/src/api/gen/datasource-config/types.ts @@ -4,7 +4,7 @@ import { PageParam } from '@/api/types' * 数据源配置查询对象 */ export interface DataSourcePageParam extends PageParam { - // 数据源描述 + // 数据源标题 title?: string } @@ -14,10 +14,10 @@ export interface DataSourcePageParam extends PageParam { export interface DataSourceConfig { // ID id?: number - // 描述 + // 标题 title: string, - // 名称 - name?: string + // dsKey + dsKey?: string // 用户名 username?: string // 密码 diff --git a/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue b/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue index bc4312e..2b28363 100644 --- a/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue +++ b/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue @@ -14,12 +14,12 @@ - - + + - - + + @@ -86,7 +86,7 @@ id: undefined, pass: '', title: '', - name: '', + dsKey: '', username: '', password: '', url: '' @@ -95,14 +95,23 @@ // 表单校验规则 const rulesRef = computed(() => { return { - title: [{ required: true, message: '请输入数据源描述！' }], - name: [{ required: true, message: '请输入数据源名称!' }], + title: [{ required: true, message: '请输入数据源标题！' }], + dsKey: [{ required: true, message: '请输入数据源dsKey!'}, { validator: validRule }], username: [{ required: true, message: '请输入用户名!' }], pass: isUpdate.value ? [] : [{ required: true, message: '请输入密码!' }], url: [{ required: true, message: '请输入连接地址!' }] } }) + const validRule = (rule: any, value: string) => { + if (value) { + if (/[^\a-\z\A-\Z0-9\_-]/g.test(value)) { + return Promise.reject("只能输入字母、字母、下划线和中划线"); + } + } + return Promise.resolve(); + }; + // 提交按钮的 loading 状态控制 const submitLoading = ref(false) diff --git a/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue b/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue index f6ca6d9..1c1548e 100644 --- a/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue +++ b/ballcat-codegen-frontend/src/views/gen/datasource-config/index.vue @@ -60,14 +60,14 @@ width: '50px' }, { - title: '数据源描述', + title: '标题', dataIndex: 'title', ellipsis: true, width: '100px' }, { - title: '数据源名称', - dataIndex: 'name', + title: 'dsKey', + dataIndex: 'dsKey', ellipsis: true, width: '100px' }, diff --git a/doc/update_sql/0.6.0-to-1.0.0.sql b/doc/update_sql/0.6.0-to-1.0.0.sql index 47c5b36..ee54103 100644 --- a/doc/update_sql/0.6.0-to-1.0.0.sql +++ b/doc/update_sql/0.6.0-to-1.0.0.sql @@ -19,6 +19,10 @@ DROP TABLE `gen_template_info`; ALTER TABLE `gen_template_entry` CHANGE COLUMN `file_name` `filename` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件夹路径/模板文件名称（支持占位符）' AFTER `group_id`; --- 新增数据源描述字段 +-- 新增数据源标题 ALTER TABLE `gen_data_source_config` - ADD COLUMN title VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源描述'; + ADD COLUMN title VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `id`; + +-- 修改字段名name => ds_key +ALTER TABLE `gen_data_source_config` + CHANGE COLUMN `name` `ds_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源key' AFTER `title`; -- Gitee From 7b6790eacdb0a5e5aa9d8ccc87f393ed3eab5094 Mon Sep 17 00:00:00 2001 From: liu_yx Date: Sat, 26 Mar 2022 12:36:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(master):=201.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=B7=A6=E4=BE=A7tree=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=92=8C=E9=80=89=E6=8B=A9=E5=90=8E?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E9=9A=90=E8=97=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/gen/template-group/TemplateEntryEditPage.vue | 1 + .../views/gen/template-group/components/TemplateEntryTree.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ballcat-codegen-frontend/src/views/gen/template-group/TemplateEntryEditPage.vue b/ballcat-codegen-frontend/src/views/gen/template-group/TemplateEntryEditPage.vue index f06b118..337e233 100644 --- a/ballcat-codegen-frontend/src/views/gen/template-group/TemplateEntryEditPage.vue +++ b/ballcat-codegen-frontend/src/views/gen/template-group/TemplateEntryEditPage.vue @@ -85,6 +85,7 @@ .splitpanes.default-theme .splitpanes__pane { background-color: #ffffff !important; border-top: 1px solid #f2f2f2 !important; + overflow: auto; } // 分割器的背景色 diff --git a/ballcat-codegen-frontend/src/views/gen/template-group/components/TemplateEntryTree.vue b/ballcat-codegen-frontend/src/views/gen/template-group/components/TemplateEntryTree.vue index 9de157e..8bd6d82 100644 --- a/ballcat-codegen-frontend/src/views/gen/template-group/components/TemplateEntryTree.vue +++ b/ballcat-codegen-frontend/src/views/gen/template-group/components/TemplateEntryTree.vue @@ -1,7 +1,7 @@