From 5136148ce1e7ec46eabab13e90dfc2862127c6f3 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Mon, 31 Mar 2025 23:15:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9Ajava.util.concur?=
 =?UTF-8?q?rent.ExecutionException:=20net.sf.jsqlparser.parser.ParseExcept?=
 =?UTF-8?q?ion:=20Encountered=20unexpected=20token:=20"tables"=20"TABLES"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/support/CodeGeneratorMapper.xml    | 22 +++++++++----------
 .../mapper/support/CodeGeneratorMapper.xml    | 22 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
index 6d416d7c..167a81ad 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
@@ -9,8 +9,7 @@
           and table_name = #{tableName}
     </select>
 
-    <select id="selectTableColumn"
-            resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableColumnVO">
+    <select id="selectTableColumn" resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableColumnVO">
         select *
         from information_schema.columns
         where table_schema = (select database())
@@ -18,19 +17,18 @@
         order by ordinal_position
     </select>
 
-    <select id="queryTableList"
-            resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableVO">
+    <select id="queryTableList" resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableVO">
         select
-        tables.table_name,
-        tables.table_comment,
-        tables.create_time,
-        tables.update_time,
+        `tables`.table_name,
+        `tables`.table_comment,
+        `tables`.create_time,
+        `tables`.update_time,
         t_code_generator_config.update_time configTime
-        from information_schema.tables tables
-        left join t_code_generator_config on tables.table_name = t_code_generator_config.table_name
-        where tables.table_schema = (select database())
+        from information_schema.tables `tables`
+        left join t_code_generator_config on `tables`.table_name = t_code_generator_config.table_name
+        where `tables`.table_schema = (select database())
         <if test="queryForm.tableNameKeywords != null and queryForm.tableNameKeywords != ''">
-            AND INSTR(tables.table_name,#{queryForm.tableNameKeywords})
+            AND INSTR(`tables`.table_name,#{queryForm.tableNameKeywords})
         </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
index 6d416d7c..167a81ad 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
@@ -9,8 +9,7 @@
           and table_name = #{tableName}
     </select>
 
-    <select id="selectTableColumn"
-            resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableColumnVO">
+    <select id="selectTableColumn" resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableColumnVO">
         select *
         from information_schema.columns
         where table_schema = (select database())
@@ -18,19 +17,18 @@
         order by ordinal_position
     </select>
 
-    <select id="queryTableList"
-            resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableVO">
+    <select id="queryTableList" resultType="net.lab1024.sa.base.module.support.codegenerator.domain.vo.TableVO">
         select
-        tables.table_name,
-        tables.table_comment,
-        tables.create_time,
-        tables.update_time,
+        `tables`.table_name,
+        `tables`.table_comment,
+        `tables`.create_time,
+        `tables`.update_time,
         t_code_generator_config.update_time configTime
-        from information_schema.tables tables
-        left join t_code_generator_config on tables.table_name = t_code_generator_config.table_name
-        where tables.table_schema = (select database())
+        from information_schema.tables `tables`
+        left join t_code_generator_config on `tables`.table_name = t_code_generator_config.table_name
+        where `tables`.table_schema = (select database())
         <if test="queryForm.tableNameKeywords != null and queryForm.tableNameKeywords != ''">
-            AND INSTR(tables.table_name,#{queryForm.tableNameKeywords})
+            AND INSTR(`tables`.table_name,#{queryForm.tableNameKeywords})
         </if>
     </select>
 </mapper>
\ No newline at end of file

From 4062d5a4bbe8d70376a241c6801f4f9174850101 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Mon, 31 Mar 2025 23:29:58 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=B8=8E=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E9=80=82=E9=85=8D=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CodeGenerateBaseVariableService.java      |  3 +-
 .../backend/domain/VOVariableService.java     |  8 ----
 .../variable/front/ListVariableService.java   | 36 +++++++++++++++---
 .../java/domain/vo/VO.java.vm                 |  2 +-
 .../code-generator-template/js/list.vue.vm    | 37 ++++++++++++-------
 .../CodeGenerateBaseVariableService.java      |  3 +-
 .../backend/domain/VOVariableService.java     |  8 ----
 .../variable/front/ListVariableService.java   | 36 +++++++++++++++---
 .../java/domain/vo/VO.java.vm                 |  2 +-
 .../code-generator-template/js/list.vue.vm    | 37 ++++++++++++-------
 .../views/business/erp/goods/goods-list.vue   |  4 +-
 ...or-table-config-form-insert-and-update.vue |  1 +
 .../views/business/erp/goods/goods-list.vue   |  4 +-
 ...or-table-config-form-insert-and-update.vue |  1 +
 14 files changed, 120 insertions(+), 62 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index d39bf6bf..72e42105 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -1,7 +1,6 @@
 package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
-import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -89,7 +88,7 @@ public abstract class CodeGenerateBaseVariableService {
         }
 
         CodeInsertAndUpdateField field = first.get();
-        return SmartStringUtil.equals(field.getFrontComponent(), CodeFrontComponentEnum.FILE_UPLOAD.getValue());
+        return CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent());
     }
 
     /**
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
index cde09227..45844fed 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
@@ -84,14 +84,6 @@ public class VOVariableService extends CodeGenerateBaseVariableService {
                 packageList.add("import io.swagger.v3.oas.annotations.media.Schema;");
             }
 
-
-            //字典
-            if (isDict(field.getColumnName(), form)) {
-                finalFieldMap.put("dict", "\n    @JsonSerialize(using = DictValueVoSerializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.serializer.DictValueVoSerializer;");
-            }
-
             //文件上传
             if (isFile(field.getColumnName(), form)) {
                 finalFieldMap.put("file", "\n    @JsonSerialize(using = FileKeyVoSerializer.class)");
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 74e582ad..9f79ea68 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
@@ -2,9 +2,12 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.front;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.CaseFormat;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
@@ -29,7 +32,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
     public Map<String, Object> getInjectVariablesMap(CodeGeneratorConfigForm form) {
         Map<String, Object> variablesMap = new HashMap<>();
 
-        List<Map<String, Object>> variableList = new ArrayList<>();
+        List<Map<String, Object>> queryVariable = new ArrayList<>();
         List<CodeQueryField> queryFields = form.getQueryFields();
         HashSet<String> frontImportSet = new HashSet<>();
         frontImportSet.add("import " + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName()) + "Form from './" + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, form.getBasic().getModuleName()) + "-form.vue';");
@@ -52,11 +55,34 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
             if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
-            variableList.add(objectMap);
-
+            queryVariable.add(objectMap);
         }
-        variablesMap.put("queryFields",variableList);
-        variablesMap.put("frontImportList",new ArrayList<>(frontImportSet));
+
+        List<Map<String, Object>> listVariable = new ArrayList<>();
+        for (CodeInsertAndUpdateField field : form.getInsertAndUpdate().getFieldList()) {
+            Map<String, Object> objectMap = BeanUtil.beanToMap(field);
+            CodeField codeField = getCodeFieldByColumnName(field.getColumnName(), form);
+            if (codeField == null) {
+                continue;
+            }
+            objectMap.put("fieldName", codeField.getFieldName());
+            objectMap.put("dict", codeField.getDict());
+
+            if(SmartStringUtil.isNotBlank(codeField.getDict())) {
+                frontImportSet.add("import DictPreview from '/@/components/dict-preview/index.vue';");
+                frontImportSet.add("import { useDict } from '/@/utils/dict';");
+            }
+
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+                frontImportSet.add("import FilePreview from '/@/components/support/file-preview/index.vue';");
+            }
+
+            listVariable.add(objectMap);
+        }
+
+        variablesMap.put("queryFields", queryVariable);
+        variablesMap.put("listFields", listVariable);
+        variablesMap.put("frontImportList", new ArrayList<>(frontImportSet));
         return variablesMap;
     }
 }
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
index 4a84efd0..76ebd3d5 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
@@ -17,7 +17,7 @@ public class ${name.upperCamel}VO {
 
 #foreach ($field in $fields)
 
-    ${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
+    ${field.apiModelProperty}$!{field.notEmpty}$!{field.file}
     private $field.javaType $field.fieldName;
 #end
 
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 01a8b8b5..d1fe0fff 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
@@ -101,18 +101,23 @@
         >
             <template #bodyCell="{ text, record, column }">
 
-	    <!-- 有图片预览时 注释解开并把下面的'picture'修改成自己的图片字段名即可 -->
-              <!-- <template v-if="column.dataIndex === 'picture'">
-                  <FilePreview :fileList="text" type="picture" />
-                </template> -->
-
-	    <!-- 使用字典时 注释解开并把下面的'dict'修改成自己的字典字段名即可 有多个字典字段就复制多份同理修改 不然不显示字典 -->
-              <!-- 方便修改tag的颜色 orange green purple success processing error default warning -->
-              <!-- <template v-if="column.dataIndex === 'dict'">
-                <a-tag color="cyan">
-                  {{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '暂无' }}
-                </a-tag>
-              </template> -->
+            #foreach ($field in $listFields)
+                #if($field.frontComponent == "FileUpload")
+                <template v-if="column.dataIndex === '$field.fieldName'">
+                    <FilePreview :fileList="text" type="picture" />
+                </template>
+                #end
+            #end
+                <!-- 方便直接复制粘贴修改 tag 的颜色 orange green purple success processing error default warning -->
+            #foreach ($field in $listFields)
+                #if($field.dict)
+                <template v-if="column.dataIndex === '$!{field.fieldName}'">
+                    <a-tag color="cyan">
+                        <DictPreview :options="dictList['$!{field.dict}']" :value="text" />
+                    </a-tag>
+                </template>
+                #end
+            #end
 
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
@@ -159,7 +164,13 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
-    //import FilePreview from '/@/components/support/file-preview/index.vue'; // 图片预览组件
+
+#foreach ($field in $listFields)
+    #if($field.dict)
+    const dictList = useDict(#foreach($field in $fields)#if($field.dict)'$!{field.dict}'#if($foreach.hasNext), #end#end#end);
+        #break
+    #end
+#end
 
     // ---------------------------- 表格列 ----------------------------
 
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index d39bf6bf..72e42105 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -1,7 +1,6 @@
 package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
-import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -89,7 +88,7 @@ public abstract class CodeGenerateBaseVariableService {
         }
 
         CodeInsertAndUpdateField field = first.get();
-        return SmartStringUtil.equals(field.getFrontComponent(), CodeFrontComponentEnum.FILE_UPLOAD.getValue());
+        return CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent());
     }
 
     /**
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
index cde09227..45844fed 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
@@ -84,14 +84,6 @@ public class VOVariableService extends CodeGenerateBaseVariableService {
                 packageList.add("import io.swagger.v3.oas.annotations.media.Schema;");
             }
 
-
-            //字典
-            if (isDict(field.getColumnName(), form)) {
-                finalFieldMap.put("dict", "\n    @JsonSerialize(using = DictValueVoSerializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.serializer.DictValueVoSerializer;");
-            }
-
             //文件上传
             if (isFile(field.getColumnName(), form)) {
                 finalFieldMap.put("file", "\n    @JsonSerialize(using = FileKeyVoSerializer.class)");
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 74e582ad..9f79ea68 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
@@ -2,9 +2,12 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.front;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.CaseFormat;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
@@ -29,7 +32,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
     public Map<String, Object> getInjectVariablesMap(CodeGeneratorConfigForm form) {
         Map<String, Object> variablesMap = new HashMap<>();
 
-        List<Map<String, Object>> variableList = new ArrayList<>();
+        List<Map<String, Object>> queryVariable = new ArrayList<>();
         List<CodeQueryField> queryFields = form.getQueryFields();
         HashSet<String> frontImportSet = new HashSet<>();
         frontImportSet.add("import " + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName()) + "Form from './" + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, form.getBasic().getModuleName()) + "-form.vue';");
@@ -52,11 +55,34 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
             if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
-            variableList.add(objectMap);
-
+            queryVariable.add(objectMap);
         }
-        variablesMap.put("queryFields",variableList);
-        variablesMap.put("frontImportList",new ArrayList<>(frontImportSet));
+
+        List<Map<String, Object>> listVariable = new ArrayList<>();
+        for (CodeInsertAndUpdateField field : form.getInsertAndUpdate().getFieldList()) {
+            Map<String, Object> objectMap = BeanUtil.beanToMap(field);
+            CodeField codeField = getCodeFieldByColumnName(field.getColumnName(), form);
+            if (codeField == null) {
+                continue;
+            }
+            objectMap.put("fieldName", codeField.getFieldName());
+            objectMap.put("dict", codeField.getDict());
+
+            if(SmartStringUtil.isNotBlank(codeField.getDict())) {
+                frontImportSet.add("import DictPreview from '/@/components/dict-preview/index.vue';");
+                frontImportSet.add("import { useDict } from '/@/utils/dict';");
+            }
+
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+                frontImportSet.add("import FilePreview from '/@/components/support/file-preview/index.vue';");
+            }
+
+            listVariable.add(objectMap);
+        }
+
+        variablesMap.put("queryFields", queryVariable);
+        variablesMap.put("listFields", listVariable);
+        variablesMap.put("frontImportList", new ArrayList<>(frontImportSet));
         return variablesMap;
     }
 }
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
index 4a84efd0..76ebd3d5 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
@@ -17,7 +17,7 @@ public class ${name.upperCamel}VO {
 
 #foreach ($field in $fields)
 
-    ${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
+    ${field.apiModelProperty}$!{field.notEmpty}$!{field.file}
     private $field.javaType $field.fieldName;
 #end
 
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 01a8b8b5..6575b0f1 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
@@ -101,18 +101,23 @@
         >
             <template #bodyCell="{ text, record, column }">
 
-	    <!-- 有图片预览时 注释解开并把下面的'picture'修改成自己的图片字段名即可 -->
-              <!-- <template v-if="column.dataIndex === 'picture'">
-                  <FilePreview :fileList="text" type="picture" />
-                </template> -->
-
-	    <!-- 使用字典时 注释解开并把下面的'dict'修改成自己的字典字段名即可 有多个字典字段就复制多份同理修改 不然不显示字典 -->
-              <!-- 方便修改tag的颜色 orange green purple success processing error default warning -->
-              <!-- <template v-if="column.dataIndex === 'dict'">
-                <a-tag color="cyan">
-                  {{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '暂无' }}
-                </a-tag>
-              </template> -->
+            #foreach ($field in $listFields)
+                #if($field.frontComponent == "FileUpload")
+                <template v-if="column.dataIndex === '$field.fieldName'">
+                    <FilePreview :fileList="text" type="picture" />
+                </template>
+                #end
+            #end
+                  <!-- 方便直接复制粘贴修改 tag 的颜色 orange green purple success processing error default warning -->
+            #foreach ($field in $listFields)
+                #if($field.dict)
+                <template v-if="column.dataIndex === '$!{field.fieldName}'">
+                    <a-tag color="cyan">
+                        <DictPreview :options="dictList['$!{field.dict}']" :value="text" />
+                    </a-tag>
+                </template>
+                #end
+            #end
 
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
@@ -159,7 +164,13 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
-    //import FilePreview from '/@/components/support/file-preview/index.vue'; // 图片预览组件
+
+#foreach ($field in $listFields)
+    #if($field.dict)
+    const dictList = useDict(#foreach($field in $fields)#if($field.dict)'$!{field.dict}'#if($foreach.hasNext), #end#end#end);
+        #break
+    #end
+#end
 
     // ---------------------------- 表格列 ----------------------------
 
diff --git a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
index 15b01a1f..7c696355 100644
--- a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictPreview :options="descList['GOODS_PLACE']" :value="text" />
+          <DictPreview :options="dictList['GOODS_PLACE']" :value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -206,7 +206,7 @@
   import DictPreview from '/@/components/dict-preview/index.vue';
   import { useDict } from '/@/utils/dict';
 
-  const descList = useDict('GOODS_PLACE');
+  const dictList = useDict('GOODS_PLACE', 'GOODS_PLACE');
   // ---------------------------- 表格列 ----------------------------
 
   const columns = ref([
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
index 0a2b4f39..cdcb17af 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
@@ -59,6 +59,7 @@
 
   <a-table
     size="small"
+    :scroll="{ x: 1000 }"
     bordered
     class="smart-margin-top10"
     :dataSource="tableData"
diff --git a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
index 41edc886..0ceb8081 100644
--- a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictPreview :options="descList['GOODS_PLACE']" :value="text" />
+          <DictPreview :options="dictList['GOODS_PLACE']" :value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -205,7 +205,7 @@
   import SmartHeaderCell from '/@/components/smart-table-header-cell/index.vue';
   import DictPreview from '/@/components/dict-preview/index.vue';
   import { useDict } from '/@/utils/dict';
-  const descList = useDict('GOODS_PLACE');
+  const dictList = useDict('GOODS_PLACE');
   // ---------------------------- 表格列 ----------------------------
 
   const columns = ref([
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
index 6db9c190..fd89b07b 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
@@ -59,6 +59,7 @@
 
   <a-table
     size="small"
+    :scroll="{ x: 1000 }"
     bordered
     class="smart-margin-top10"
     :dataSource="tableData"

From 66aac47a43e4d66572515f642653a201552c44a7 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Tue, 1 Apr 2025 17:44:29 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BD=BF=E5=85=B6?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/CodeGeneratorTemplateService.java |  3 +-
 .../CodeGenerateBaseVariableService.java      |  7 ++-
 .../variable/front/FormVariableService.java   |  1 +
 .../variable/front/ListVariableService.java   | 53 +++++++++++++------
 .../java/sql/Menu.sql.vm                      |  8 +--
 .../code-generator-template/js/form.vue.vm    |  8 +--
 .../code-generator-template/js/list.vue.vm    | 18 ++-----
 .../service/CodeGeneratorTemplateService.java |  2 +-
 .../CodeGenerateBaseVariableService.java      |  7 ++-
 .../variable/front/FormVariableService.java   |  1 +
 .../variable/front/ListVariableService.java   | 51 ++++++++++++------
 .../java/sql/Menu.sql.vm                      |  8 +--
 .../code-generator-template/js/form.vue.vm    |  8 +--
 .../code-generator-template/js/list.vue.vm    | 18 ++-----
 14 files changed, 105 insertions(+), 88 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index 22cd5e09..daab3382 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -33,7 +33,6 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.OutputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -159,7 +158,7 @@ public class CodeGeneratorTemplateService {
         CodeDelete deleteInfo = JSON.parseObject(codeGeneratorConfigEntity.getDeleteInfo(), CodeDelete.class);
         List<CodeQueryField> queryFields = JSONArray.parseArray(codeGeneratorConfigEntity.getQueryFields(), CodeQueryField.class);
         List<CodeTableField> tableFields = JSONArray.parseArray(codeGeneratorConfigEntity.getTableFields(), CodeTableField.class);
-        tableFields.stream().forEach(e -> e.setWidth(e.getWidth() == null ? 0 : e.getWidth()));
+        tableFields.forEach(e -> e.setWidth(e.getWidth() == null ? 0 : e.getWidth()));
 
         CodeGeneratorConfigForm form = CodeGeneratorConfigForm.builder().basic(basic).fields(fields).insertAndUpdate(insertAndUpdate).deleteInfo(deleteInfo).queryFields(queryFields).tableFields(tableFields).deleteInfo(deleteInfo).build();
         form.setTableName(tableName);
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index 72e42105..b2e026e1 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -1,6 +1,7 @@
 package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -63,8 +64,7 @@ public abstract class CodeGenerateBaseVariableService {
             return null;
         }
 
-        return fields.stream().filter(e -> columnName.equals(e.getColumnName()))
-                .findFirst().get();
+        return fields.stream().filter(e -> SmartStringUtil.equals(columnName, e.getColumnName())).findFirst().orElse(null);
     }
 
 
@@ -113,8 +113,7 @@ public abstract class CodeGenerateBaseVariableService {
             return null;
         }
 
-        Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        return first.orElse(null);
+        return fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst().orElse(null);
     }
 
     /**
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
index bdd4363f..85b2354f 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
@@ -67,6 +67,7 @@ public class FormVariableService extends CodeGenerateBaseVariableService {
 
             if (CodeFrontComponentEnum.DICT_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
+                frontImportSet.add("import { DICT_CODE_ENUM } from '/@/constants/support/dict-const.js';");
             }
 
             if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
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 9f79ea68..68ba1b6a 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
@@ -9,16 +9,18 @@ import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGenerato
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeTableField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author 1024创新实验室-主任:卓大
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class ListVariableService extends CodeGenerateBaseVariableService {
@@ -32,48 +34,64 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
     public Map<String, Object> getInjectVariablesMap(CodeGeneratorConfigForm form) {
         Map<String, Object> variablesMap = new HashMap<>();
 
-        List<Map<String, Object>> queryVariable = new ArrayList<>();
-        List<CodeQueryField> queryFields = form.getQueryFields();
+
         HashSet<String> frontImportSet = new HashSet<>();
         frontImportSet.add("import " + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName()) + "Form from './" + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, form.getBasic().getModuleName()) + "-form.vue';");
 
+        // 查询参数
+        List<Map<String, Object>> queryVariable = new ArrayList<>();
+        List<CodeQueryField> queryFields = form.getQueryFields();
+
         for (CodeQueryField queryField : queryFields) {
             Map<String, Object> objectMap = BeanUtil.beanToMap(queryField);
 
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
-            objectMap.put("frontEnumName", codeField.getEnumName());
-            objectMap.put("dict", codeField.getDict());
 
-            if(CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
+                objectMap.put("frontEnumName", codeField.getEnumName());
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())) {
+                objectMap.put("dict", codeField.getDict());
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())) {
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
             queryVariable.add(objectMap);
         }
 
+        // 表格列表
         List<Map<String, Object>> listVariable = new ArrayList<>();
-        for (CodeInsertAndUpdateField field : form.getInsertAndUpdate().getFieldList()) {
-            Map<String, Object> objectMap = BeanUtil.beanToMap(field);
-            CodeField codeField = getCodeFieldByColumnName(field.getColumnName(), form);
+        // 过滤掉不显示的字段
+        List<CodeTableField> tableFields = form.getTableFields().stream().filter(CodeTableField::getShowFlag).collect(Collectors.toList());
+
+        for (CodeTableField tableField : tableFields) {
+            Map<String, Object> objectMap = BeanUtil.beanToMap(tableField);
+            objectMap.put("fieldName", tableField.getFieldName());
+
+            CodeField codeField = getCodeFieldByColumnName(tableField.getColumnName(), form);
             if (codeField == null) {
                 continue;
             }
-            objectMap.put("fieldName", codeField.getFieldName());
-            objectMap.put("dict", codeField.getDict());
 
-            if(SmartStringUtil.isNotBlank(codeField.getDict())) {
-                frontImportSet.add("import DictPreview from '/@/components/dict-preview/index.vue';");
-                frontImportSet.add("import { useDict } from '/@/utils/dict';");
+            // 是否存在字典
+            if (SmartStringUtil.isNotBlank(codeField.getDict())) {
+                objectMap.put("dict", codeField.getDict());
+                frontImportSet.add("import { DICT_CODE_ENUM } from '/@/constants/support/dict-const.js';");
+                frontImportSet.add("import DictLabel from '/@/components/support/dict-label/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+            CodeInsertAndUpdateField codeInsertAndUpdateField = form.getInsertAndUpdate().getFieldList().stream().filter(e -> SmartStringUtil.equals(tableField.getColumnName(), e.getColumnName())).findFirst().orElse(null);
+            if (codeInsertAndUpdateField == null) {
+                continue;
+            }
+
+            // 是否存在上传组件
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(codeInsertAndUpdateField.getFrontComponent())) {
+                objectMap.put("frontComponent", codeInsertAndUpdateField.getFrontComponent());
                 frontImportSet.add("import FilePreview from '/@/components/support/file-preview/index.vue';");
             }
 
@@ -83,6 +101,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
         variablesMap.put("queryFields", queryVariable);
         variablesMap.put("listFields", listVariable);
         variablesMap.put("frontImportList", new ArrayList<>(frontImportSet));
+
         return variablesMap;
     }
 }
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
index 90525f78..9ca5cc42 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
@@ -10,13 +10,13 @@ SET @parent_id = NULL;
 SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}';
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '查询', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
+VALUES ( '查询', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '添加', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
+VALUES ( '添加', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '更新', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
+VALUES ( '更新', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '删除', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
+VALUES ( '删除', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index 336d14d7..6291a44b 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -43,12 +43,12 @@
       #end
       #if($field.frontComponent == "SmartEnumSelect")
         <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-          <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+          <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
         </a-form-item>
       #end
       #if($field.frontComponent == "DictSelect")
         <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-          <DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
+          <DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
         </a-form-item>
       #end
       #if($field.frontComponent == "Date")
@@ -101,12 +101,12 @@
         #end
         #if($field.frontComponent == "SmartEnumSelect")
           <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-            <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+            <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
           </a-form-item>
         #end
         #if($field.frontComponent == "DictSelect")
           <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-            <DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
+            <DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
           </a-form-item>
         #end
         #if($field.frontComponent == "Date")
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 51995abd..00e21281 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 dictCode="$!{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}" enumName="$!{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")
@@ -104,17 +104,14 @@
             #foreach ($field in $listFields)
                 #if($field.frontComponent == "FileUpload")
                 <template v-if="column.dataIndex === '$field.fieldName'">
-                    <FilePreview :fileList="text" type="picture" />
+                    <FilePreview :file-list="text" type="picture" />
                 </template>
                 #end
             #end
-                <!-- 方便直接复制粘贴修改 tag 的颜色 orange green purple success processing error default warning -->
             #foreach ($field in $listFields)
                 #if($field.dict)
                 <template v-if="column.dataIndex === '$!{field.fieldName}'">
-                    <a-tag color="cyan">
-                        <DictPreview :options="dictList['$!{field.dict}']" :value="text" />
-                    </a-tag>
+                    <DictLabel :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" :data-value="text" />
                 </template>
                 #end
             #end
@@ -165,13 +162,6 @@
     $!{import}
 #end
 
-#foreach ($field in $listFields)
-    #if($field.dict)
-    const dictList = useDict(#foreach($field in $fields)#if($field.dict)'$!{field.dict}'#if($foreach.hasNext), #end#end#end);
-        #break
-    #end
-#end
-
     // ---------------------------- 表格列 ----------------------------
 
     const columns = ref([
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index 5a86305c..eb2673f0 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -158,7 +158,7 @@ public class CodeGeneratorTemplateService {
         CodeDelete deleteInfo = JSON.parseObject(codeGeneratorConfigEntity.getDeleteInfo(), CodeDelete.class);
         List<CodeQueryField> queryFields = JSONArray.parseArray(codeGeneratorConfigEntity.getQueryFields(), CodeQueryField.class);
         List<CodeTableField> tableFields = JSONArray.parseArray(codeGeneratorConfigEntity.getTableFields(), CodeTableField.class);
-        tableFields.stream().forEach(e -> e.setWidth(e.getWidth() == null ? 0 : e.getWidth()));
+        tableFields.forEach(e -> e.setWidth(e.getWidth() == null ? 0 : e.getWidth()));
 
         CodeGeneratorConfigForm form = CodeGeneratorConfigForm.builder().basic(basic).fields(fields).insertAndUpdate(insertAndUpdate).deleteInfo(deleteInfo).queryFields(queryFields).tableFields(tableFields).deleteInfo(deleteInfo).build();
         form.setTableName(tableName);
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index 72e42105..b2e026e1 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -1,6 +1,7 @@
 package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -63,8 +64,7 @@ public abstract class CodeGenerateBaseVariableService {
             return null;
         }
 
-        return fields.stream().filter(e -> columnName.equals(e.getColumnName()))
-                .findFirst().get();
+        return fields.stream().filter(e -> SmartStringUtil.equals(columnName, e.getColumnName())).findFirst().orElse(null);
     }
 
 
@@ -113,8 +113,7 @@ public abstract class CodeGenerateBaseVariableService {
             return null;
         }
 
-        Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        return first.orElse(null);
+        return fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst().orElse(null);
     }
 
     /**
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
index bdd4363f..85b2354f 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
@@ -67,6 +67,7 @@ public class FormVariableService extends CodeGenerateBaseVariableService {
 
             if (CodeFrontComponentEnum.DICT_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
+                frontImportSet.add("import { DICT_CODE_ENUM } from '/@/constants/support/dict-const.js';");
             }
 
             if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
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 9f79ea68..6170e8dd 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
@@ -9,9 +9,11 @@ import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGenerato
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeTableField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author 1024创新实验室-主任:卓大
@@ -32,48 +34,64 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
     public Map<String, Object> getInjectVariablesMap(CodeGeneratorConfigForm form) {
         Map<String, Object> variablesMap = new HashMap<>();
 
-        List<Map<String, Object>> queryVariable = new ArrayList<>();
-        List<CodeQueryField> queryFields = form.getQueryFields();
+
         HashSet<String> frontImportSet = new HashSet<>();
         frontImportSet.add("import " + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName()) + "Form from './" + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, form.getBasic().getModuleName()) + "-form.vue';");
 
+        // 查询参数
+        List<Map<String, Object>> queryVariable = new ArrayList<>();
+        List<CodeQueryField> queryFields = form.getQueryFields();
+
         for (CodeQueryField queryField : queryFields) {
             Map<String, Object> objectMap = BeanUtil.beanToMap(queryField);
 
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
-            objectMap.put("frontEnumName", codeField.getEnumName());
-            objectMap.put("dict", codeField.getDict());
 
-            if(CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
+                objectMap.put("frontEnumName", codeField.getEnumName());
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())) {
+                objectMap.put("dict", codeField.getDict());
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
+            if (CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())) {
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
             queryVariable.add(objectMap);
         }
 
+        // 表格列表
         List<Map<String, Object>> listVariable = new ArrayList<>();
-        for (CodeInsertAndUpdateField field : form.getInsertAndUpdate().getFieldList()) {
-            Map<String, Object> objectMap = BeanUtil.beanToMap(field);
-            CodeField codeField = getCodeFieldByColumnName(field.getColumnName(), form);
+        // 过滤掉不显示的字段
+        List<CodeTableField> tableFields = form.getTableFields().stream().filter(CodeTableField::getShowFlag).collect(Collectors.toList());
+
+        for (CodeTableField tableField : tableFields) {
+            Map<String, Object> objectMap = BeanUtil.beanToMap(tableField);
+            objectMap.put("fieldName", tableField.getFieldName());
+
+            CodeField codeField = getCodeFieldByColumnName(tableField.getColumnName(), form);
             if (codeField == null) {
                 continue;
             }
-            objectMap.put("fieldName", codeField.getFieldName());
-            objectMap.put("dict", codeField.getDict());
 
-            if(SmartStringUtil.isNotBlank(codeField.getDict())) {
-                frontImportSet.add("import DictPreview from '/@/components/dict-preview/index.vue';");
-                frontImportSet.add("import { useDict } from '/@/utils/dict';");
+            // 是否存在字典
+            if (SmartStringUtil.isNotBlank(codeField.getDict())) {
+                objectMap.put("dict", codeField.getDict());
+                frontImportSet.add("import { DICT_CODE_ENUM } from '/@/constants/support/dict-const.js';");
+                frontImportSet.add("import DictLabel from '/@/components/support/dict-label/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+            CodeInsertAndUpdateField codeInsertAndUpdateField = form.getInsertAndUpdate().getFieldList().stream().filter(e -> SmartStringUtil.equals(tableField.getColumnName(), e.getColumnName())).findFirst().orElse(null);
+            if (codeInsertAndUpdateField == null) {
+                continue;
+            }
+
+            // 是否存在上传组件
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(codeInsertAndUpdateField.getFrontComponent())) {
+                objectMap.put("frontComponent", codeInsertAndUpdateField.getFrontComponent());
                 frontImportSet.add("import FilePreview from '/@/components/support/file-preview/index.vue';");
             }
 
@@ -83,6 +101,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
         variablesMap.put("queryFields", queryVariable);
         variablesMap.put("listFields", listVariable);
         variablesMap.put("frontImportList", new ArrayList<>(frontImportSet));
+
         return variablesMap;
     }
 }
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
index 90525f78..9ca5cc42 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
@@ -10,13 +10,13 @@ SET @parent_id = NULL;
 SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}';
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '查询', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
+VALUES ( '查询', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '添加', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
+VALUES ( '添加', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '更新', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
+VALUES ( '更新', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
 
 INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '删除', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
+VALUES ( '删除', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index 336d14d7..6291a44b 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -43,12 +43,12 @@
       #end
       #if($field.frontComponent == "SmartEnumSelect")
         <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-          <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+          <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
         </a-form-item>
       #end
       #if($field.frontComponent == "DictSelect")
         <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-          <DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
+          <DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
         </a-form-item>
       #end
       #if($field.frontComponent == "Date")
@@ -101,12 +101,12 @@
         #end
         #if($field.frontComponent == "SmartEnumSelect")
           <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-            <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+            <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
           </a-form-item>
         #end
         #if($field.frontComponent == "DictSelect")
           <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-            <DictSelect width="100%" v-model:value="form.${field.fieldName}" dictCode="$!{field.dict}" placeholder="$!{field.label}"/>
+            <DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
           </a-form-item>
         #end
         #if($field.frontComponent == "Date")
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 5aeaf4e5..e336227b 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
@@ -22,12 +22,12 @@
 #end
 #if($field.queryTypeEnum == "Dict")
             <a-form-item label="${field.label}" class="smart-query-form-item">
-                <DictSelect dictCode="$!{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}" enumName="$!{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")
@@ -104,17 +104,14 @@
             #foreach ($field in $listFields)
                 #if($field.frontComponent == "FileUpload")
                 <template v-if="column.dataIndex === '$field.fieldName'">
-                    <FilePreview :fileList="text" type="picture" />
+                    <FilePreview :file-list="text" type="picture" />
                 </template>
                 #end
             #end
-                  <!-- 方便直接复制粘贴修改 tag 的颜色 orange green purple success processing error default warning -->
             #foreach ($field in $listFields)
                 #if($field.dict)
                 <template v-if="column.dataIndex === '$!{field.fieldName}'">
-                    <a-tag color="cyan">
-                        <DictPreview :options="dictList['$!{field.dict}']" :value="text" />
-                    </a-tag>
+                    <DictLabel :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" :data-value="text" />
                 </template>
                 #end
             #end
@@ -165,13 +162,6 @@
     $!{import}
 #end
 
-#foreach ($field in $listFields)
-    #if($field.dict)
-    const dictList = useDict(#foreach($field in $fields)#if($field.dict)'$!{field.dict}'#if($foreach.hasNext), #end#end#end);
-        #break
-    #end
-#end
-
     // ---------------------------- 表格列 ----------------------------
 
     const columns = ref([

From ade82f8aa2f09c8fe8da4c8f57ea243dceeabe81 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Tue, 1 Apr 2025 20:08:10 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/business/erp/goods/goods-list.vue       | 10 ++++------
 .../support/code-generator/code-generator-list.vue    | 11 ++++++++++-
 .../src/views/system/menu/menu-list.vue               |  1 +
 .../src/views/business/erp/goods/goods-list.vue       |  4 +---
 .../support/code-generator/code-generator-list.vue    |  2 +-
 .../src/views/system/menu/menu-list.vue               |  1 +
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
index 7b58088c..f25d4234 100644
--- a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
@@ -25,7 +25,7 @@
       </a-form-item>
 
       <a-form-item label="产地" name="place" class="smart-query-form-item">
-        <DictSelect :dictCode="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
+        <DictSelect :dict-code="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
       </a-form-item>
 
       <a-form-item label="商品状态" name="goodsStatus" class="smart-query-form-item">
@@ -93,7 +93,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData" />
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
+          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -199,7 +199,6 @@
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-  import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import _ from 'lodash';
@@ -235,7 +234,6 @@
       title: '商品状态',
       dataIndex: 'goodsStatus',
       resizable: true,
-      sorter: true,
       filterOptions: {
         type: 'enum-select',
         enumName: 'GOODS_STATUS_ENUM',
@@ -248,7 +246,7 @@
       resizable: true,
       filterOptions: {
         type: 'dict-select',
-        dictCode: DICT_CODE_ENUM.GOODS_PLACE,
+        dictCode: DICT_CODE_ENUM.GOODS_PLACE || 'GOODS_PLACE',
       },
       width: 150,
     },
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
index 1b93abf7..80e96c75 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,16 @@
         <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
       </a-row>
 
-      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
+      <a-table
+        size="small"
+        :scroll="{ x: 1000 }"
+        :loading="tableLoading"
+        bordered
+        :dataSource="tableData"
+        :columns="columns"
+        rowKey="configId"
+        :pagination="false"
+      >
         <template #bodyCell="{ record, index, column }">
           <template v-if="column.dataIndex === 'seq'">
             {{ index + 1 }}
diff --git a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
index 5f1a6da9..9fc15cd7 100644
--- a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
+        :scroll="{ x: 1000 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered
diff --git a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
index 39780fb0..d902a68a 100644
--- a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
+          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -199,7 +199,6 @@
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-  import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import _ from 'lodash';
@@ -235,7 +234,6 @@
       title: '商品状态',
       dataIndex: 'goodsStatus',
       resizable: true,
-      sorter: true,
       filterOptions: {
         type: 'enum-select',
         enumName: 'GOODS_STATUS_ENUM',
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
index 9b99085c..2d842036 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,7 @@
         <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
       </a-row>
 
-      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
+      <a-table size="small" :scroll="{ x: 1000 }" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
         <template #bodyCell="{ record, index, column }">
           <template v-if="column.dataIndex === 'seq'">
             {{ index + 1 }}
diff --git a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
index cf596fbb..bbbe14b3 100644
--- a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
+        :scroll="{ x: 1000 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered

From 486aa13cfd03b48253efd3568be879a38b680fc7 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Thu, 3 Apr 2025 18:29:30 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E8=8F=9C=E5=8D=95SQL=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code-generator-template/java/sql/Menu.sql.vm | 16 ++++++++--------
 .../code-generator-template/java/sql/Menu.sql.vm | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
index 9ca5cc42..4f066e34 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
@@ -9,14 +9,14 @@ VALUES ( '${basic.description}', 2, 0, '/${name.lowerHyphenCamel}/list', '/busin
 SET @parent_id = NULL;
 SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}';
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '查询', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '查询', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:query', '${name.lowerCamel}:query', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '添加', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '添加', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:add', '${name.lowerCamel}:add', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '更新', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '更新', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:update', '${name.lowerCamel}:update', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '删除', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '删除', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:delete', '${name.lowerCamel}:delete', @parent_id, 1 );
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
index 9ca5cc42..4f066e34 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
@@ -9,14 +9,14 @@ VALUES ( '${basic.description}', 2, 0, '/${name.lowerHyphenCamel}/list', '/busin
 SET @parent_id = NULL;
 SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}';
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '查询', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '查询', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:query', '${name.lowerCamel}:query', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '添加', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '添加', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:add', '${name.lowerCamel}:add', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '更新', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '更新', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:update', '${name.lowerCamel}:update', @parent_id, 1 );
 
-INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
-VALUES ( '删除', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, api_perms, web_perms, context_menu_id, create_user_id )
+VALUES ( '删除', 3, @parent_id, false, false, true, false, 1, '${name.lowerCamel}:delete', '${name.lowerCamel}:delete', @parent_id, 1 );