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 92130d380e50682197b93bc5a50978c1d907a48f..4fd01428337d3d40116520d4d07d3321e61136ce 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/mapper/DataSourceConfigMapper.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java index 5eab353d91c7356054569d53a79b8491d4716e11..877914113c58de5ddabd71d1d626d21dda07c3ca 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 92a7a89ce71710fc62b3e81e39b7d302228b5053..de9866daf70416c5486e7a8ed020fd70e6b47d17 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,10 +24,16 @@ public class DataSourceConfigDTO { private Integer id; /** - * 名称 + * 标题 */ - @Schema(title = "名称") - private String name; + @Schema(title = "标题") + private String title; + + /** + * 数据源key + */ + @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 9917bb7273e00f3cc2627c75c617c596c157ec40..74472b470901977bfcedf67350d91743be445af5 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,10 +30,16 @@ public class DataSourceConfig { private Integer id; /** - * 名称 + * 标题 */ - @Schema(title = "名称") - private String name; + @Schema(title = "标题") + private String title; + + /** + * 数据源key + */ + @Schema(title = "数据源key") + private String dsKey; /** * 用户名 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 b2e1411e33ec58fd984cb62a47b7afa768ebb17c..f793c7b562c791ea66fb4698e3ecc61e0d434eba 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 @@ -18,9 +18,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 fc601a892967b674b3dd732f92104b1f5a8519ab..e260f4691b3fa93463760515d96cbcf3d797baf8 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,10 +24,16 @@ public class DataSourceConfigPageVO { private Integer id; /** - * 名称 + * 标题 */ - @Schema(title = "名称") - private String name; + @Schema(title = "标题") + private String title; + + /** + * 数据源key + */ + @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 4d01d14bb30eaa4b1a71f60217e46e6d04eecb87..33fe77a950b1b29c933714e848c4278ebb8b5786 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 41ff21fe3ff163dfc4aaf7f7d3883d090f39ddd8..cc93b3d8e408ca70543a2934180bf53fb70d963f 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,8 +14,10 @@ export interface DataSourcePageParam extends PageParam { export interface DataSourceConfig { // ID id?: number - // 名称 - name?: string + // 标题 + title: string, + // dsKey + dsKey?: string // 用户名 username?: string // 密码 diff --git a/ballcat-codegen-frontend/src/views/gen/codegen/index.vue b/ballcat-codegen-frontend/src/views/gen/codegen/index.vue index 1c63240a8f1e24c5ac4e44317afe87d733d7e38a..76cc0db72244731f7ca02ffb8fddc0ab65d346db 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 da1aad2e1e0868236d029d386a82dca4f20ff4f8..2b28363d7268d25ba46224db04f5420c48f13a2d 100644 --- a/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue +++ b/ballcat-codegen-frontend/src/views/gen/datasource-config/DataSourceConfigEditModal.vue @@ -14,8 +14,12 @@ - - + + + + + + @@ -81,7 +85,8 @@ const modelRef = reactive({ id: undefined, pass: '', - name: '', + title: '', + dsKey: '', username: '', password: '', url: '' @@ -90,13 +95,23 @@ // 表单校验规则 const rulesRef = computed(() => { return { - 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 79e790a5b5d0d22c0e117c189912e68a293496d7..1c1548e2451b8421b50beb84fe581bbd02f2b8fe 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 @@
@@ -60,8 +60,14 @@ width: '50px' }, { - title: '数据源名称', - dataIndex: 'name', + title: '标题', + dataIndex: 'title', + ellipsis: true, + width: '100px' + }, + { + title: 'dsKey', + dataIndex: 'dsKey', ellipsis: true, width: '100px' }, 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 f06b11838e90cfe16b3aa327235732979e158c3e..337e233bcc88940369c4012705b4f4d8d349f2db 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 9de157ecd382cfa4206d2d9631ec654e9c271202..8bd6d82dbd22732c89124f099f80a764fc62eed4 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 @@