From 3c3e3b4e32fc210dc1ba370e4926ccac7263c143 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Fri, 18 Apr 2025 16:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E5=9D=97=E7=9A=84=E5=89=8D=E7=AB=AF=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/variable/front/ListVariableService.java  |  9 ++++++++-
 .../java/domain/entity/Entity.java.vm                |  2 +-
 .../resources/code-generator-template/js/list.vue.vm | 12 ++++++++++--
 .../service/variable/front/ListVariableService.java  |  9 ++++++++-
 .../java/domain/entity/Entity.java.vm                |  2 +-
 .../resources/code-generator-template/js/list.vue.vm |  8 ++++++++
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
index 81619de5..dc5e6358 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
@@ -47,7 +47,8 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
 
             if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
-                objectMap.put("frontEnumName", codeField.getEnumName());
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumName", upperUnderscoreEnum);
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
@@ -76,6 +77,12 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
                 continue;
             }
 
+            // 是否存在枚举
+            if (SmartStringUtil.isNotBlank(codeField.getEnumName())) {
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumPlugin", "$smartEnumPlugin.getDescByValue('" + upperUnderscoreEnum + "', text)");
+            }
+
             // 是否存在字典
             if (SmartStringUtil.isNotBlank(codeField.getDict())) {
                 objectMap.put("dict", codeField.getDict());
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
index 04230b36..146f9be6 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
@@ -18,7 +18,7 @@ public class ${name.upperCamel}Entity {
 #foreach ($field in $fields)
 
     /**
-     * $field.label
+     * $field.columnComment
      */
     #if($field.primaryKeyFlag && $field.autoIncreaseFlag)
     @TableId(type = IdType.AUTO)
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
index e336227b..bb4332fb 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
@@ -22,12 +22,12 @@
 #end
 #if($field.queryTypeEnum == "Dict")
             <a-form-item label="${field.label}" class="smart-query-form-item">
-              <DictSelect dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
+                <DictSelect dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
             </a-form-item>
 #end
 #if($field.queryTypeEnum == "Enum")
             <a-form-item label="$codeGeneratorTool.removeEnumDesc(${field.label})" class="smart-query-form-item">
-              <SmartEnumSelect width="${field.width}" v-model:value="queryForm.${field.fieldName}" enum-name="$!{field.frontEnumName}" placeholder="$codeGeneratorTool.removeEnumDesc(${field.label})"/>
+                <SmartEnumSelect width="${field.width}" v-model:value="queryForm.${field.fieldName}" enum-name="$!{field.frontEnumName}" placeholder="$codeGeneratorTool.removeEnumDesc(${field.label})"/>
             </a-form-item>
 #end
 #if($field.queryTypeEnum == "Date")
@@ -89,6 +89,7 @@
         <!---------- 表格 begin ----------->
         <a-table
             size="small"
+            :scroll="{ y: 800 }"
             :dataSource="tableData"
             :columns="columns"
             rowKey="$!{primaryKeyFieldName}"
@@ -108,6 +109,13 @@
                 </template>
                 #end
             #end
+            #foreach ($field in $listFields)
+                #if($field.frontEnumPlugin)
+                <template v-if="column.dataIndex === '$!{field.fieldName}'">
+                    <span>{{ $!{field.frontEnumPlugin} }}</span>
+                </template>
+                #end
+            #end
             #foreach ($field in $listFields)
                 #if($field.dict)
                 <template v-if="column.dataIndex === '$!{field.fieldName}'">
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
index 6170e8dd..4bce8e19 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
@@ -48,7 +48,8 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
 
             if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
-                objectMap.put("frontEnumName", codeField.getEnumName());
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumName", upperUnderscoreEnum);
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
@@ -77,6 +78,12 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
                 continue;
             }
 
+            // 是否存在枚举
+            if (SmartStringUtil.isNotBlank(codeField.getEnumName())) {
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumPlugin", "$smartEnumPlugin.getDescByValue('" + upperUnderscoreEnum + "', text)");
+            }
+
             // 是否存在字典
             if (SmartStringUtil.isNotBlank(codeField.getDict())) {
                 objectMap.put("dict", codeField.getDict());
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
index 04230b36..146f9be6 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
@@ -18,7 +18,7 @@ public class ${name.upperCamel}Entity {
 #foreach ($field in $fields)
 
     /**
-     * $field.label
+     * $field.columnComment
      */
     #if($field.primaryKeyFlag && $field.autoIncreaseFlag)
     @TableId(type = IdType.AUTO)
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
index e336227b..e90d74d2 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
@@ -89,6 +89,7 @@
         <!---------- 表格 begin ----------->
         <a-table
             size="small"
+            :scroll="{ y: 800 }"
             :dataSource="tableData"
             :columns="columns"
             rowKey="$!{primaryKeyFieldName}"
@@ -108,6 +109,13 @@
                 </template>
                 #end
             #end
+            #foreach ($field in $listFields)
+                #if($field.frontEnumPlugin)
+                <template v-if="column.dataIndex === '$!{field.fieldName}'">
+                    <span>{{ $!{field.frontEnumPlugin} }}</span>
+                </template>
+                #end
+            #end
             #foreach ($field in $listFields)
                 #if($field.dict)
                 <template v-if="column.dataIndex === '$!{field.fieldName}'">