From 11b3b87337c71c9b0f170d70325c4376342f2587 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 16 Nov 2023 21:18:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE=E6=A0=A1=E9=AA=8C=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E6=8F=90=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/tool/model/req/GenConfigReq.java   |  3 +++
 .../src/views/tool/generator/index.vue         | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 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
index 38ca207a..2243f14a 100644
--- 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
@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -45,6 +46,7 @@ public class GenConfigReq implements Serializable {
     /**
      * 字段配置信息
      */
+    @Valid
     @Schema(description = "字段配置信息")
     @NotEmpty(message = "字段配置不能为空")
     private List<FieldConfigDO> fieldConfigs = new ArrayList<>();
@@ -52,6 +54,7 @@ public class GenConfigReq implements Serializable {
     /**
      * 生成配置信息
      */
+    @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
index 40ffc6bc..92bd87b6 100644
--- 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" />