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

Gitee fixes #I8GWVY
continew-org · Nov 16, 2023 · c34e934 · c34e934
1 parent 3dd81a1
commit c34e934
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/req/GenConfigReq.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 
@@ -47,13 +48,15 @@ public class GenConfigReq implements Serializable {
  /**
  * 字段配置信息
  */
+ @Valid
  @Schema(description = "字段配置信息")
  @NotEmpty(message = "字段配置不能为空")
  private List<FieldConfigDO> fieldConfigs = new ArrayList<>();
 
  /**
  * 生成配置信息
  */
+ @Valid
  @Schema(description = "生成配置信息")
  @NotNull(message = "生成配置不能为空")
  private GenConfigDO genConfig;

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