zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复保存生成配置校验失效的问题，并优化部分提示效果

Browse Source 
Gitee fixes #I8GWVY
This commit is contained in:
Charles7c 2023-11-16 20:59:37 +08:00
parent 3dd81a1192
commit c34e934bb5
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
View File

@ -21,6 +21,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -47,6 +48,7 @@ public class GenConfigReq implements Serializable {
/** /**
* 字段配置信息 * 字段配置信息
*/ */
@Valid
@Schema(description = "字段配置信息") @Schema(description = "字段配置信息")
@NotEmpty(message = "字段配置不能为空") @NotEmpty(message = "字段配置不能为空")
private List<FieldConfigDO> fieldConfigs = new ArrayList<>(); private List<FieldConfigDO> fieldConfigs = new ArrayList<>();
@ -54,6 +56,7 @@ public class GenConfigReq implements Serializable {
/** /**
* 生成配置信息 * 生成配置信息
*/ */
@Valid
@Schema(description = "生成配置信息") @Schema(description = "生成配置信息")
@NotNull(message = "生成配置不能为空") @NotNull(message = "生成配置不能为空")
private GenConfigDO genConfig; private GenConfigDO genConfig;

18
continew-admin-ui/src/views/tool/generator/index.vue
View File

@ -145,13 +145,17 @@
ellipsis ellipsis
tooltip tooltip
/> />
<a-table-column <a-table-column title="类型" :width="95" ellipsis tooltip>
title="类型" <template #cell="{ record }">
data-index="fieldType" <span v-if="record.fieldType">{{ record.fieldType }}</span>
:width="95" <a-tooltip v-else content="请检查 generator.properties 配置">
ellipsis <icon-exclamation-circle-fill
tooltip size="large"
/> style="color: #f53f3f"
/>
</a-tooltip>
</template>
</a-table-column>
<a-table-column title="描述" :width="170"> <a-table-column title="描述" :width="170">
<template #cell="{ record }"> <template #cell="{ record }">
<a-input v-model="record.comment" /> <a-input v-model="record.comment" />