From 08d4493994a649b725d94e917b31d42c930284ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 15 Jul 2024 15:18:29 +0800
Subject: [PATCH 1/6] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20bug=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitee/ISSUE_TEMPLATE.zh-CN.md | 49 ----------------------------------
 .gitee/ISSUE_TEMPLATE/bug.yml  |  5 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md

diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
deleted file mode 100644
index cf82237f3..000000000
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ /dev/null
@@ -1,49 +0,0 @@
-### 使用版本(未按照模板填写直接删除)
-
-- jdk版本(带上尾号): 例如 1.8.0_202
-- 框架版本(项目启动时输出的版本号): 例如 4.4.0
-- 其他依赖版本(你觉得有必要的):
-
-### 问题前提
-
-> 功能不好用 不会用 是否已经看过项目文档
-> 项目运行报错 是否已经拿着报错信息去百度 常见报错百度百度足以
-> 是否搜索过其他issue 一些已经解决的问题 会在issue内留下解决方法
-> 无法线上解决或者与框架无关的问题的欢迎加VIP群跟作者一对一谈
-
-### 异常模块
-
-> 此报错都涉及到那些系统模块
-
-例如 ruoyi-system ruoyi-auth 等等
-
-### 问题描述
-
-> 越详细越容易直击问题所在
-
-已知: XXX功能不好用 或 XXX数据不正常 等等
-
-### 希望结果
-
-> 想知道你觉得怎么样是正常或者合理的
-
-希望功能可以有XXX结果 或者 XXX现象
-
-### 重现步骤
-
-> 作者并不知道这个问题是如何出现的
-
-- 1
-- 2
-- 3
-
-### 相关代码与报错信息(请勿发混乱格式)
-
-> 代码可按照如下形式提供或者截图均可 越详细越好
-> 大多数问题都是 代码编写错误问题 逻辑问题 或者用法错误等问题
-
-```java
-public class XXX {
-
-}
-```
\ No newline at end of file
diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index 8a5d06500..045001336 100644
--- a/.gitee/ISSUE_TEMPLATE/bug.yml
+++ b/.gitee/ISSUE_TEMPLATE/bug.yml
@@ -9,8 +9,9 @@ body:
       label: 版本
       description: 你当前正在使用我们软件的哪个版本(pom文件内的版本号)？
       value: |
-        jdk版本(带上尾号): 例如 17.0.8
-        框架版本(项目启动时输出的版本号): 例如 5.1.1
+        注意: 未填写版本号不予处理直接关闭或删除
+        jdk版本(带上尾号):
+        框架版本(项目启动时输出的版本号):
         其他依赖版本(你觉得有必要的):
     validations:
       required: true

From 7e14b9867623e4ae8ae0eb1c35598562afb90552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 28 Oct 2024 09:46:28 +0000
Subject: [PATCH 2/6] =?UTF-8?q?reset=20=E5=9B=9E=E6=BB=9A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 疯狂的狮子Li <15040126243@163.com>
---
 .../main/java/org/dromara/common/oss/core/OssClient.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index 900536b56..ba924c0bb 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -83,10 +83,10 @@ public class OssClient {
             StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider.create(
                 AwsBasicCredentials.create(properties.getAccessKey(), properties.getSecretKey()));
 
-            //使用对象存储服务时要求明确配置访问样式（路径样式或虚拟托管样式）。需要启用路径样式访问
-            boolean isStyle = true;
+            // MinIO 使用 HTTPS 限制使用域名访问，站点填域名。需要启用路径样式访问
+            boolean isStyle = !StringUtils.containsAny(properties.getEndpoint(), OssConstant.CLOUD_SERVICE);
 
-            //创建AWS基于 CRT 的 S3 客户端
+            // 创建AWS基于 CRT 的 S3 客户端
             this.client = S3AsyncClient.crtBuilder()
                 .credentialsProvider(credentialsProvider)
                 .endpointOverride(URI.create(getEndpoint()))

From ea50a57602f6de4ecee9daf224f3177a6848c335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 12 Nov 2024 18:17:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20xss=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E5=99=A8=20Parameter=20=E5=A4=84=E7=90=86=20=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=9F=90=E4=BA=9B=E5=AE=B9=E5=99=A8=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=94=B9=E5=8F=82=E6=95=B0=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/XssHttpServletRequestWrapper.java  | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java
index 190f94eab..914e54995 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java
@@ -1,19 +1,22 @@
 package org.dromara.common.web.filter;
 
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
-import org.dromara.common.core.utils.StringUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -32,16 +35,22 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
     @Override
     public String getParameter(String name) {
         String value = super.getParameter(name);
-        if (value != null) {
-            return HtmlUtil.cleanHtmlTag(value).trim();
+        if (value == null) {
+            return null;
         }
-        return value;
+        return HtmlUtil.cleanHtmlTag(value).trim();
     }
 
     @Override
     public Map<String, String[]> getParameterMap() {
         Map<String, String[]> valueMap = super.getParameterMap();
-        for (Map.Entry<String, String[]> entry : valueMap.entrySet()) {
+        if (MapUtil.isEmpty(valueMap)) {
+            return valueMap;
+        }
+        // 避免某些容器不允许改参数的情况 copy一份重新改
+        Map<String, String[]> map = new HashMap<>(valueMap.size());
+        map.putAll(valueMap);
+        for (Map.Entry<String, String[]> entry : map.entrySet()) {
             String[] values = entry.getValue();
             if (values != null) {
                 int length = values.length;
@@ -50,25 +59,25 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
                     // 防xss攻击和过滤前后空格
                     escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
                 }
-                valueMap.put(entry.getKey(), escapseValues);
+                map.put(entry.getKey(), escapseValues);
             }
         }
-        return valueMap;
+        return map;
     }
 
     @Override
     public String[] getParameterValues(String name) {
         String[] values = super.getParameterValues(name);
-        if (values != null) {
-            int length = values.length;
-            String[] escapseValues = new String[length];
-            for (int i = 0; i < length; i++) {
-                // 防xss攻击和过滤前后空格
-                escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
-            }
-            return escapseValues;
+        if (ArrayUtil.isEmpty(values)) {
+            return values;
         }
-        return values;
+        int length = values.length;
+        String[] escapseValues = new String[length];
+        for (int i = 0; i < length; i++) {
+            // 防xss攻击和过滤前后空格
+            escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
+        }
+        return escapseValues;
     }
 
     @Override

From 7a9f51fc7a356ea9f7b693328117660fe59cbf81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 27 Mar 2025 02:51:57 +0000
Subject: [PATCH 4/6] =?UTF-8?q?!662=20=E5=8F=91=E5=B8=83=205.3.1=20?=
 =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=20*=20=F0=9F=90=B3=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=205.3.1=20=E6=AD=A3=E5=BC=8F=E7=89=88=20*=20update=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20*=20fix=20=E4=BF=AE=E5=A4=8D=20excel?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E8=A2=AB?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98=20*=20update=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=BB=9F=E4=B8=80=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C=E9=95=BF=E5=BA=A6=20*=20up?=
 =?UTF-8?q?date=20mybatis-plus=203.5.10.1=20=3D>=203.5.11=20*=20fix=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=B7=A8=E5=9F=9F=E6=9C=AA=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=B7=E6=B1=82=E5=A4=B4=E9=97=AE=E9=A2=98(cloud?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E9=9C=80=E8=A6=81=20vue=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=9C=80=E8=A6=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/ruoyi-monitor-admin.run.xml                          | 2 +-
 .run/ruoyi-server.run.xml                                 | 2 +-
 .run/ruoyi-snailjob-server.run.xml                        | 2 +-
 README.md                                                 | 2 +-
 pom.xml                                                   | 6 +++---
 ruoyi-common/ruoyi-common-bom/pom.xml                     | 2 +-
 .../common/core/domain/model/PasswordLoginBody.java       | 4 ++--
 .../common/encrypt/filter/EncryptResponseBodyWrapper.java | 5 +++++
 .../java/org/dromara/common/excel/utils/ExcelUtil.java    | 5 +++--
 ruoyi-extend/ruoyi-monitor-admin/pom.xml                  | 3 ---
 .../src/main/resources/application-dev.yml                | 4 +---
 .../src/main/resources/application-prod.yml               | 4 +---
 script/docker/docker-compose.yml                          | 8 ++++----
 13 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml
index 3b5b97b4d..065ff01a7 100644
--- a/.run/ruoyi-monitor-admin.run.xml
+++ b/.run/ruoyi-monitor-admin.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.3.1-BETA2" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.3.1" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
       </settings>
diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml
index dddc04057..6c5031edb 100644
--- a/.run/ruoyi-server.run.xml
+++ b/.run/ruoyi-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:5.3.1-BETA2" />
+        <option name="imageTag" value="ruoyi/ruoyi-server:5.3.1" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
       </settings>
diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml
index e48c539d2..859902ac1 100644
--- a/.run/ruoyi-snailjob-server.run.xml
+++ b/.run/ruoyi-snailjob-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.3.1-BETA2" />
+        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.3.1" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-snailjob-server/Dockerfile" />
       </settings>
diff --git a/README.md b/README.md
index ca67c874a..fc3131a24 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.3.0--BETA2-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.3.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4-blue.svg)]()
 [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
 [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()
diff --git a/pom.xml b/pom.xml
index c99cbb252..f1362f2e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>Dromara RuoYi-Vue-Plus多租户管理系统</description>
 
     <properties>
-        <revision>5.3.1-BETA2</revision>
+        <revision>5.3.1</revision>
         <spring-boot.version>3.4.4</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -24,14 +24,14 @@
         <easyexcel.version>4.0.3</easyexcel.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.40.0</satoken.version>
-        <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.11</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.35</hutool.version>
         <spring-boot-admin.version>3.4.5</spring-boot-admin.version>
         <redisson.version>3.45.1</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <snailjob.version>1.4.0-beta2</snailjob.version>
+        <snailjob.version>1.4.0</snailjob.version>
         <mapstruct-plus.version>1.4.6</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <lombok.version>1.18.36</lombok.version>
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index c8ea1ffa4..62967c30d 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>5.3.1-BETA2</revision>
+        <revision>5.3.1</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
index 87d0e8e73..36e33b24b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
@@ -18,14 +18,14 @@ public class PasswordLoginBody extends LoginBody {
      * 用户名
      */
     @NotBlank(message = "{user.username.not.blank}")
-    @Length(min = 2, max = 20, message = "{user.username.length.valid}")
+    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
     private String username;
 
     /**
      * 用户密码
      */
     @NotBlank(message = "{user.password.not.blank}")
-    @Length(min = 5, max = 20, message = "{user.password.length.valid}")
+    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
     private String password;
 
 }
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
index 7bbca49d0..78e06ff73 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
@@ -76,9 +76,14 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper {
         String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey);
 
         // 设置响应头
+        // vue版本需要设置
+        servletResponse.addHeader("Access-Control-Expose-Headers", headerFlag);
+        servletResponse.setHeader("Access-Control-Allow-Origin", "*");
+        servletResponse.setHeader("Access-Control-Allow-Methods", "*");
         servletResponse.setHeader(headerFlag, encryptPassword);
         servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString());
 
+
         // 获取原始内容
         String originalBody = this.getContent();
         // 对内容进行加密
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
index b22e6f987..0e9569677 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -245,9 +245,10 @@ public class ExcelUtil {
             .registerWriteHandler(new DataWriteHandler(data.get(0).getClass()))
             .build();
         WriteSheet writeSheet = EasyExcel.writerSheet().build();
+        FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         // 单表多数据导出 模板格式为 {.属性}
         for (T d : data) {
-            excelWriter.fill(d, writeSheet);
+            excelWriter.fill(d, fillConfig, writeSheet);
         }
         excelWriter.finish();
     }
@@ -320,7 +321,7 @@ public class ExcelUtil {
                 // 多表导出必须使用 FillWrapper
                 excelWriter.fill(new FillWrapper(map.getKey(), (Collection<?>) map.getValue()), fillConfig, writeSheet);
             } else {
-                excelWriter.fill(map.getValue(), writeSheet);
+                excelWriter.fill(map.getValue(), fillConfig, writeSheet);
             }
         }
         excelWriter.finish();
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 77c9eb71a..538ffbd9f 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -59,9 +59,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring-boot.version}</version>
-                <configuration>
-<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
-                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
index caf5dba55..aaf474895 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -22,10 +22,8 @@ snail-job:
   job-pull-page-size: 1000
   # 服务器端口
   server-port: 17888
-  # 号段模式下步长配置
-  step: 100
   # 日志保存时间(单位: day)
-  log-storage: 90
+  log-storage: 7
   rpc-type: grpc
 
 --- # 监控中心配置
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
index caf5dba55..aaf474895 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
@@ -22,10 +22,8 @@ snail-job:
   job-pull-page-size: 1000
   # 服务器端口
   server-port: 17888
-  # 号段模式下步长配置
-  step: 100
   # 日志保存时间(单位: day)
-  log-storage: 90
+  log-storage: 7
   rpc-type: grpc
 
 --- # 监控中心配置
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index cd5b567a3..fb35cae6f 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -98,7 +98,7 @@ services:
     network_mode: "host"
 
   ruoyi-server1:
-    image: ruoyi/ruoyi-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-server:5.3.1
     container_name: ruoyi-server1
     environment:
       # 时区上海
@@ -113,7 +113,7 @@ services:
     network_mode: "host"
 
   ruoyi-server2:
-    image: ruoyi/ruoyi-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-server:5.3.1
     container_name: ruoyi-server2
     environment:
       # 时区上海
@@ -128,7 +128,7 @@ services:
     network_mode: "host"
 
   ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor-admin:5.3.1-BETA2
+    image: ruoyi/ruoyi-monitor-admin:5.3.1
     container_name: ruoyi-monitor-admin
     environment:
       # 时区上海
@@ -140,7 +140,7 @@ services:
     network_mode: "host"
 
   ruoyi-snailjob-server:
-    image: ruoyi/ruoyi-snailjob-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-snailjob-server:5.3.1
     container_name: ruoyi-snailjob-server
     environment:
       # 时区上海

From 8aa60abb1fa3a00714a65e79360b47a6622a502b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 27 Mar 2025 02:53:23 +0000
Subject: [PATCH 5/6] =?UTF-8?q?!663=20=E5=9B=9E=E9=80=80=20'Pull=20Request?=
 =?UTF-8?q?=20!662=20:=20=E5=8F=91=E5=B8=83=205.3.1=20=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88'=20*=20=E5=9B=9E=E9=80=80=20'Pull=20Request=20!662=20?=
 =?UTF-8?q?:=20=E5=8F=91=E5=B8=83=205.3.1=20=E6=AD=A3=E5=BC=8F=E7=89=88'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/ruoyi-monitor-admin.run.xml                          | 2 +-
 .run/ruoyi-server.run.xml                                 | 2 +-
 .run/ruoyi-snailjob-server.run.xml                        | 2 +-
 README.md                                                 | 2 +-
 pom.xml                                                   | 6 +++---
 ruoyi-common/ruoyi-common-bom/pom.xml                     | 2 +-
 .../common/core/domain/model/PasswordLoginBody.java       | 4 ++--
 .../common/encrypt/filter/EncryptResponseBodyWrapper.java | 5 -----
 .../java/org/dromara/common/excel/utils/ExcelUtil.java    | 5 ++---
 ruoyi-extend/ruoyi-monitor-admin/pom.xml                  | 3 +++
 .../src/main/resources/application-dev.yml                | 4 +++-
 .../src/main/resources/application-prod.yml               | 4 +++-
 script/docker/docker-compose.yml                          | 8 ++++----
 13 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml
index 065ff01a7..3b5b97b4d 100644
--- a/.run/ruoyi-monitor-admin.run.xml
+++ b/.run/ruoyi-monitor-admin.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.3.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.3.1-BETA2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
       </settings>
diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml
index 6c5031edb..dddc04057 100644
--- a/.run/ruoyi-server.run.xml
+++ b/.run/ruoyi-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:5.3.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-server:5.3.1-BETA2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
       </settings>
diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml
index 859902ac1..e48c539d2 100644
--- a/.run/ruoyi-snailjob-server.run.xml
+++ b/.run/ruoyi-snailjob-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.3.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.3.1-BETA2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-extend/ruoyi-snailjob-server/Dockerfile" />
       </settings>
diff --git a/README.md b/README.md
index fc3131a24..ca67c874a 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.3.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.3.0--BETA2-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4-blue.svg)]()
 [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
 [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()
diff --git a/pom.xml b/pom.xml
index f1362f2e3..c99cbb252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>Dromara RuoYi-Vue-Plus多租户管理系统</description>
 
     <properties>
-        <revision>5.3.1</revision>
+        <revision>5.3.1-BETA2</revision>
         <spring-boot.version>3.4.4</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -24,14 +24,14 @@
         <easyexcel.version>4.0.3</easyexcel.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.40.0</satoken.version>
-        <mybatis-plus.version>3.5.11</mybatis-plus.version>
+        <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.35</hutool.version>
         <spring-boot-admin.version>3.4.5</spring-boot-admin.version>
         <redisson.version>3.45.1</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <snailjob.version>1.4.0</snailjob.version>
+        <snailjob.version>1.4.0-beta2</snailjob.version>
         <mapstruct-plus.version>1.4.6</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <lombok.version>1.18.36</lombok.version>
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 62967c30d..c8ea1ffa4 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>5.3.1</revision>
+        <revision>5.3.1-BETA2</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
index 36e33b24b..87d0e8e73 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
@@ -18,14 +18,14 @@ public class PasswordLoginBody extends LoginBody {
      * 用户名
      */
     @NotBlank(message = "{user.username.not.blank}")
-    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
+    @Length(min = 2, max = 20, message = "{user.username.length.valid}")
     private String username;
 
     /**
      * 用户密码
      */
     @NotBlank(message = "{user.password.not.blank}")
-    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
+    @Length(min = 5, max = 20, message = "{user.password.length.valid}")
     private String password;
 
 }
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
index 78e06ff73..7bbca49d0 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
@@ -76,14 +76,9 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper {
         String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey);
 
         // 设置响应头
-        // vue版本需要设置
-        servletResponse.addHeader("Access-Control-Expose-Headers", headerFlag);
-        servletResponse.setHeader("Access-Control-Allow-Origin", "*");
-        servletResponse.setHeader("Access-Control-Allow-Methods", "*");
         servletResponse.setHeader(headerFlag, encryptPassword);
         servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString());
 
-
         // 获取原始内容
         String originalBody = this.getContent();
         // 对内容进行加密
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
index 0e9569677..b22e6f987 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -245,10 +245,9 @@ public class ExcelUtil {
             .registerWriteHandler(new DataWriteHandler(data.get(0).getClass()))
             .build();
         WriteSheet writeSheet = EasyExcel.writerSheet().build();
-        FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         // 单表多数据导出 模板格式为 {.属性}
         for (T d : data) {
-            excelWriter.fill(d, fillConfig, writeSheet);
+            excelWriter.fill(d, writeSheet);
         }
         excelWriter.finish();
     }
@@ -321,7 +320,7 @@ public class ExcelUtil {
                 // 多表导出必须使用 FillWrapper
                 excelWriter.fill(new FillWrapper(map.getKey(), (Collection<?>) map.getValue()), fillConfig, writeSheet);
             } else {
-                excelWriter.fill(map.getValue(), fillConfig, writeSheet);
+                excelWriter.fill(map.getValue(), writeSheet);
             }
         }
         excelWriter.finish();
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 538ffbd9f..77c9eb71a 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -59,6 +59,9 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring-boot.version}</version>
+                <configuration>
+<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
index aaf474895..caf5dba55 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -22,8 +22,10 @@ snail-job:
   job-pull-page-size: 1000
   # 服务器端口
   server-port: 17888
+  # 号段模式下步长配置
+  step: 100
   # 日志保存时间(单位: day)
-  log-storage: 7
+  log-storage: 90
   rpc-type: grpc
 
 --- # 监控中心配置
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
index aaf474895..caf5dba55 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
@@ -22,8 +22,10 @@ snail-job:
   job-pull-page-size: 1000
   # 服务器端口
   server-port: 17888
+  # 号段模式下步长配置
+  step: 100
   # 日志保存时间(单位: day)
-  log-storage: 7
+  log-storage: 90
   rpc-type: grpc
 
 --- # 监控中心配置
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index fb35cae6f..cd5b567a3 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -98,7 +98,7 @@ services:
     network_mode: "host"
 
   ruoyi-server1:
-    image: ruoyi/ruoyi-server:5.3.1
+    image: ruoyi/ruoyi-server:5.3.1-BETA2
     container_name: ruoyi-server1
     environment:
       # 时区上海
@@ -113,7 +113,7 @@ services:
     network_mode: "host"
 
   ruoyi-server2:
-    image: ruoyi/ruoyi-server:5.3.1
+    image: ruoyi/ruoyi-server:5.3.1-BETA2
     container_name: ruoyi-server2
     environment:
       # 时区上海
@@ -128,7 +128,7 @@ services:
     network_mode: "host"
 
   ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor-admin:5.3.1
+    image: ruoyi/ruoyi-monitor-admin:5.3.1-BETA2
     container_name: ruoyi-monitor-admin
     environment:
       # 时区上海
@@ -140,7 +140,7 @@ services:
     network_mode: "host"
 
   ruoyi-snailjob-server:
-    image: ruoyi/ruoyi-snailjob-server:5.3.1
+    image: ruoyi/ruoyi-snailjob-server:5.3.1-BETA2
     container_name: ruoyi-snailjob-server
     environment:
       # 时区上海

From 3384270797abbfca82e8ae0110704f74c28e6a02 Mon Sep 17 00:00:00 2001
From: LiuTime <12459386+itlxdyjz@user.noreply.gitee.com>
Date: Tue, 8 Apr 2025 14:12:18 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/constant/GenConstants.java      |   5 +
 .../dromara/generator/util/VelocityUtils.java |   2 +
 .../main/resources/vm/vue/index-search.vue.vm | 718 ++++++++++++++++++
 3 files changed, 725 insertions(+)
 create mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm

diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
index b9888fb63..41a43e559 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
@@ -11,6 +11,11 @@ public interface GenConstants {
      */
     String TPL_CRUD = "crud";
 
+    /**
+     * 单表（增删改查-高级搜索）
+     */
+    String TPL_CRUD_SEARCH = "crudSearch";
+
     /**
      * 树表（增删改查）
      */
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
index 6e111e3a8..ba8738eed 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
@@ -131,6 +131,8 @@ public class VelocityUtils {
         templates.add("vm/ts/types.ts.vm");
         if (GenConstants.TPL_CRUD.equals(tplCategory)) {
             templates.add("vm/vue/index.vue.vm");
+        } else if (GenConstants.TPL_CRUD_SEARCH.equals(tplCategory)) {
+            templates.add("vm/vue/index-search.vue.vm");
         } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
             templates.add("vm/vue/index-tree.vue.vm");
         }
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm
new file mode 100644
index 000000000..b119787eb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm
@@ -0,0 +1,718 @@
+<template>
+    <div class="p-2">
+        <el-drawer
+            v-model="showSearch"
+            title="高级搜索"
+            direction="rtl"
+            size="400px"
+            :close-on-click-modal="true"
+        >
+            <el-scrollbar class="h-full">
+                <el-form ref="queryFormRef" :model="queryParams" label-position="top">
+                    #foreach($column in $columns)
+                        #if($column.query)
+                            #set($dictType=$column.dictType)
+                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${column.javaField}">
+                                    <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                </el-form-item>
+                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${column.javaField}">
+                                    <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                        <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                <el-form-item label="${comment}" prop="${column.javaField}">
+                                    <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                        <el-option label="请选择字典生成" value="" />
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                <el-form-item label="${comment}" prop="${column.javaField}">
+                                    <el-date-picker clearable
+                                                    v-model="queryParams.${column.javaField}"
+                                                    type="date"
+                                                    value-format="YYYY-MM-DD"
+                                                    placeholder="请选择${comment}"
+                                    />
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                <el-form-item label="${comment}" style="width: 308px">
+                                    <el-date-picker
+                                        v-model="dateRange${AttrName}"
+                                        value-format="YYYY-MM-DD HH:mm:ss"
+                                        type="daterange"
+                                        range-separator="-"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期"
+                                        :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                    />
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                    <el-form-item >
+                        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-scrollbar>
+        </el-drawer>
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']">导出</el-button>
+                    </el-col>
+                    <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+
+            <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                #foreach($column in $columns)
+                    #set($javaField=$column.javaField)
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.pk)
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}" >
+                            #if($column.query)
+                                <template #header>
+                                    <span>${comment}</span>
+                                    <el-popconfirm
+                                        hide-icon = "true"
+                                    >
+                                        <template #reference>
+                                            <el-icon class="cursor-pointer"><Search /></el-icon>
+                                        </template>
+                                        <template #actions>
+                                            #set($dictType=$column.dictType)
+                                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                                            #if($parentheseIndex != -1)
+                                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                                            #else
+                                                #set($comment=$column.columnComment)
+                                            #end
+                                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                                <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                                </el-select>
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option label="请选择字典生成" value="" />
+                                                </el-select>
+                                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                                <el-date-picker clearable
+                                                                v-model="queryParams.${column.javaField}"
+                                                                type="date"
+                                                                value-format="YYYY-MM-DD"
+                                                                placeholder="请选择${comment}"
+                                                />
+                                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                                <el-date-picker
+                                                    v-model="dateRange${AttrName}"
+                                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                                    type="daterange"
+                                                    range-separator="-"
+                                                    start-placeholder="开始日期"
+                                                    end-placeholder="结束日期"
+                                                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                                />
+                                            #end
+                                            <el-button size="small" type="primary" @click="handleQuery">确认</el-button>
+                                        </template>
+                                    </el-popconfirm>
+                                </template>
+                            #end
+                        </el-table-column>
+                    #elseif($column.list && $column.htmlType == "datetime")
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                            #if($column.query)
+                                <template #header>
+                                    <span>${comment}</span>
+                                    <el-popconfirm
+                                        hide-icon = "true"
+                                    >
+                                        <template #reference>
+                                            <el-icon class="cursor-pointer"><Search /></el-icon>
+                                        </template>
+                                        <template #actions>
+                                            #set($dictType=$column.dictType)
+                                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                                            #if($parentheseIndex != -1)
+                                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                                            #else
+                                                #set($comment=$column.columnComment)
+                                            #end
+                                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                                <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                                </el-select>
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option label="请选择字典生成" value="" />
+                                                </el-select>
+                                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                                <el-date-picker clearable
+                                                                v-model="queryParams.${column.javaField}"
+                                                                type="date"
+                                                                value-format="YYYY-MM-DD"
+                                                                placeholder="请选择${comment}"
+                                                />
+                                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                                <el-date-picker
+                                                    v-model="dateRange${AttrName}"
+                                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                                    type="daterange"
+                                                    range-separator="-"
+                                                    start-placeholder="开始日期"
+                                                    end-placeholder="结束日期"
+                                                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                                />
+                                            #end
+                                            <el-button size="small" type="primary" @click="handleQuery">确认</el-button>
+                                        </template>
+                                    </el-popconfirm>
+                                </template>
+                            #end
+                            <template #default="scope">
+                                <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                            </template>
+                        </el-table-column>
+                    #elseif($column.list && $column.htmlType == "imageUpload")
+                        <el-table-column label="${comment}" align="center" prop="${javaField}Url" width="100">
+                            #if($column.query)
+                                <template #header>
+                                    <span>${comment}</span>
+                                    <el-popconfirm
+                                        hide-icon = "true"
+                                    >
+                                        <template #reference>
+                                            <el-icon class="cursor-pointer"><Search /></el-icon>
+                                        </template>
+                                        <template #actions>
+                                            #set($dictType=$column.dictType)
+                                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                                            #if($parentheseIndex != -1)
+                                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                                            #else
+                                                #set($comment=$column.columnComment)
+                                            #end
+                                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                                <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                                </el-select>
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option label="请选择字典生成" value="" />
+                                                </el-select>
+                                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                                <el-date-picker clearable
+                                                                v-model="queryParams.${column.javaField}"
+                                                                type="date"
+                                                                value-format="YYYY-MM-DD"
+                                                                placeholder="请选择${comment}"
+                                                />
+                                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                                <el-date-picker
+                                                    v-model="dateRange${AttrName}"
+                                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                                    type="daterange"
+                                                    range-separator="-"
+                                                    start-placeholder="开始日期"
+                                                    end-placeholder="结束日期"
+                                                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                                />
+                                            #end
+                                            <el-button size="small" type="primary" @click="handleQuery">确认</el-button>
+                                        </template>
+                                    </el-popconfirm>
+                                </template>
+                            #end
+                            <template #default="scope">
+                                <image-preview :src="scope.row.${javaField}Url" :width="50" :height="50"/>
+                            </template>
+                        </el-table-column>
+                    #elseif($column.list && $column.dictType && "" != $column.dictType)
+                        <el-table-column label="${comment}" align="center" prop="${javaField}">
+                            #if($column.query)
+                                <template #header>
+                                    <span>${comment}</span>
+                                    <el-popconfirm
+                                        hide-icon = "true"
+                                    >
+                                        <template #reference>
+                                            <el-icon class="cursor-pointer"><Search /></el-icon>
+                                        </template>
+                                        <template #actions>
+                                            #set($dictType=$column.dictType)
+                                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                                            #if($parentheseIndex != -1)
+                                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                                            #else
+                                                #set($comment=$column.columnComment)
+                                            #end
+                                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                                <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                                </el-select>
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option label="请选择字典生成" value="" />
+                                                </el-select>
+                                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                                <el-date-picker clearable
+                                                                v-model="queryParams.${column.javaField}"
+                                                                type="date"
+                                                                value-format="YYYY-MM-DD"
+                                                                placeholder="请选择${comment}"
+                                                />
+                                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                                <el-date-picker
+                                                    v-model="dateRange${AttrName}"
+                                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                                    type="daterange"
+                                                    range-separator="-"
+                                                    start-placeholder="开始日期"
+                                                    end-placeholder="结束日期"
+                                                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                                />
+                                            #end
+                                            <el-button size="small" type="primary" @click="handleQuery">确认</el-button>
+                                        </template>
+                                    </el-popconfirm>
+                                </template>
+                            #end
+                            <template #default="scope">
+                                #if($column.htmlType == "checkbox")
+                                    <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                                #else
+                                    <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+                                #end
+                            </template>
+                        </el-table-column>
+                    #elseif($column.list && "" != $javaField)
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" >
+                            #if($column.query)
+                                <template #header>
+                                    <span>${comment}</span>
+                                    <el-popconfirm
+                                        hide-icon = "true"
+                                    >
+                                        <template #reference>
+                                            <el-icon class="cursor-pointer"><Search /></el-icon>
+                                        </template>
+                                        <template #actions>
+                                            #set($dictType=$column.dictType)
+                                            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                                            #if($parentheseIndex != -1)
+                                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                                            #else
+                                                #set($comment=$column.columnComment)
+                                            #end
+                                            #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                                                <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                                                </el-select>
+                                            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                                                <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
+                                                    <el-option label="请选择字典生成" value="" />
+                                                </el-select>
+                                            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                                                <el-date-picker clearable
+                                                                v-model="queryParams.${column.javaField}"
+                                                                type="date"
+                                                                value-format="YYYY-MM-DD"
+                                                                placeholder="请选择${comment}"
+                                                />
+                                            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                                <el-date-picker
+                                                    v-model="dateRange${AttrName}"
+                                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                                    type="daterange"
+                                                    range-separator="-"
+                                                    start-placeholder="开始日期"
+                                                    end-placeholder="结束日期"
+                                                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                                                />
+                                            #end
+                                            <el-button size="small" type="primary" @click="handleQuery">确认</el-button>
+                                        </template>
+                                    </el-popconfirm>
+                                </template>
+                            #end
+                        </el-table-column>
+                    #end
+                #end
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="top">
+                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']"></el-button>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if(($column.insert || $column.edit) && !$column.pk)
+                        #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                        #if($parentheseIndex != -1)
+                            #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                        #else
+                            #set($comment=$column.columnComment)
+                        #end
+                        #set($dictType=$column.dictType)
+                        #if($column.htmlType == "input")
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+                            </el-form-item>
+                        #elseif($column.htmlType == "imageUpload")
+                            <el-form-item label="${comment}" prop="${field}">
+                                <image-upload v-model="form.${field}"/>
+                            </el-form-item>
+                        #elseif($column.htmlType == "fileUpload")
+                            <el-form-item label="${comment}" prop="${field}">
+                                <file-upload v-model="form.${field}"/>
+                            </el-form-item>
+                        #elseif($column.htmlType == "editor")
+                            <el-form-item label="${comment}">
+                                <editor v-model="form.${field}" :min-height="192"/>
+                            </el-form-item>
+                        #elseif($column.htmlType == "select" && "" != $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                    <el-option
+                                        v-for="dict in ${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                        :value="parseInt(dict.value)"
+                                        #else
+                                        :value="dict.value"
+                                        #end
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        #elseif($column.htmlType == "select" && $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                    <el-option label="请选择字典生成" value="" />
+                                </el-select>
+                            </el-form-item>
+                        #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-checkbox-group v-model="form.${field}">
+                                    <el-checkbox
+                                        v-for="dict in ${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.value">
+                                        {{dict.label}}
+                                    </el-checkbox>
+                                </el-checkbox-group>
+                            </el-form-item>
+                        #elseif($column.htmlType == "checkbox" && $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-checkbox-group v-model="form.${field}">
+                                    <el-checkbox>请选择字典生成</el-checkbox>
+                                </el-checkbox-group>
+                            </el-form-item>
+                        #elseif($column.htmlType == "radio" && "" != $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-radio-group v-model="form.${field}">
+                                    <el-radio
+                                        v-for="dict in ${dictType}"
+                                        :key="dict.value"
+                                        #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                        :value="parseInt(dict.value)"
+                                        #else
+                                        :value="dict.value"
+                                        #end
+                                    >{{dict.label}}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        #elseif($column.htmlType == "radio" && $dictType)
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-radio-group v-model="form.${field}">
+                                    <el-radio value="1">请选择字典生成</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        #elseif($column.htmlType == "datetime")
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-date-picker clearable
+                                                v-model="form.${field}"
+                                                type="datetime"
+                                                value-format="YYYY-MM-DD HH:mm:ss"
+                                                placeholder="请选择${comment}">
+                                </el-date-picker>
+                            </el-form-item>
+                        #elseif($column.htmlType == "textarea")
+                            <el-form-item label="${comment}" prop="${field}">
+                                <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+                            </el-form-item>
+                        #end
+                    #end
+                #end
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="${BusinessName}" lang="ts">
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
+    import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+
+    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+        #if(${dicts} != '')
+            #set($dictsNoSymbol=$dicts.replace("'", ""))
+        const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+        #end
+
+    const ${businessName}List = ref<${BusinessName}VO[]>([]);
+    const buttonLoading = ref(false);
+    const loading = ref(true);
+    const showSearch = ref(false);
+    const ids = ref<Array<string | number>>([]);
+    const single = ref(true);
+    const multiple = ref(true);
+    const total = ref(0);
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
+            #end
+        #end
+
+    const queryFormRef = ref<ElFormInstance>();
+    const ${businessName}FormRef = ref<ElFormInstance>();
+
+    const dialog = reactive<DialogOption>({
+        visible: false,
+        title: ''
+    });
+
+    const initFormData: ${BusinessName}Form = {
+        #foreach ($column in $columns)
+            #if($column.insert || $column.edit)
+                #if($column.htmlType == "checkbox")
+                        $column.javaField: []#if($foreach.count != $columns.size()),#end
+                #else
+                        $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+                #end
+            #end
+        #end
+    }
+    const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
+        form: {...initFormData},
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            #foreach ($column in $columns)
+                #if($column.query)
+                    #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+                            $column.javaField: undefined,
+                    #end
+                #end
+            #end
+            params: {
+                #foreach ($column in $columns)
+                    #if($column.query)
+                        #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                                $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                #end
+            }
+        },
+        rules: {
+            #foreach ($column in $columns)
+                #if($column.insert || $column.edit)
+                    #if($column.required)
+                        #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                        #if($parentheseIndex != -1)
+                            #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                        #else
+                            #set($comment=$column.columnComment)
+                        #end
+                            $column.javaField: [
+                            { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+                        ]#if($foreach.count != $columns.size()),#end
+                    #end
+                #end
+            #end
+        }
+    });
+
+    const { queryParams, form, rules } = toRefs(data);
+
+    /** 查询${functionName}列表 */
+    const getList = async () => {
+        loading.value = true;
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                queryParams.value.params = {};
+                #break
+            #end
+        #end
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
+            #end
+        #end
+        const res = await list${BusinessName}(queryParams.value);
+            ${businessName}List.value = res.rows;
+        total.value = res.total;
+        loading.value = false;
+    }
+
+    /** 取消按钮 */
+    const cancel = () => {
+        reset();
+        dialog.visible = false;
+    }
+
+    /** 表单重置 */
+    const reset = () => {
+        form.value = {...initFormData};
+            ${businessName}FormRef.value?.resetFields();
+    }
+
+    /** 搜索按钮操作 */
+    const handleQuery = () => {
+        queryParams.value.pageNum = 1;
+        getList();
+    }
+
+    /** 重置按钮操作 */
+    const resetQuery = () => {
+        #foreach ($column in $columns)
+            #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                dateRange${AttrName}.value = ['', ''];
+            #end
+        #end
+        queryFormRef.value?.resetFields();
+        handleQuery();
+    }
+
+    /** 多选框选中数据 */
+    const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
+        ids.value = selection.map(item => item.${pkColumn.javaField});
+        single.value = selection.length != 1;
+        multiple.value = !selection.length;
+    }
+
+    /** 新增按钮操作 */
+    const handleAdd = () => {
+        reset();
+        dialog.visible = true;
+        dialog.title = "添加${functionName}";
+    }
+
+    /** 修改按钮操作 */
+    const handleUpdate = async (row?: ${BusinessName}VO) => {
+        reset();
+        const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
+        const res = await get${BusinessName}(_${pkColumn.javaField});
+        Object.assign(form.value, res.data);
+        #foreach ($column in $columns)
+            #if($column.htmlType == "checkbox")
+                form.value.$column.javaField = form.value.${column.javaField}.split(",");
+            #end
+        #end
+        dialog.visible = true;
+        dialog.title = "修改${functionName}";
+    }
+
+    /** 提交按钮 */
+    const submitForm = () => {
+            ${businessName}FormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                buttonLoading.value = true;
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "checkbox")
+                        form.value.$column.javaField = form.value.${column.javaField}.join(",");
+                    #end
+                #end
+                if (form.value.${pkColumn.javaField}) {
+                    await update${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
+                } else {
+                    await add${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
+                }
+                proxy?.#[[$modal]]#.msgSuccess("操作成功");
+                dialog.visible = false;
+                await getList();
+            }
+        });
+    }
+
+    /** 删除按钮操作 */
+    const handleDelete = async (row?: ${BusinessName}VO) => {
+        const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
+        await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
+        await del${BusinessName}(_${pkColumn.javaField}s);
+        proxy?.#[[$modal]]#.msgSuccess("删除成功");
+        await getList();
+    }
+
+    /** 导出按钮操作 */
+    const handleExport = () => {
+        proxy?.download('${moduleName}/${businessName}/export', {
+            ...queryParams.value
+        }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+
+    onMounted(() => {
+        getList();
+    });
+</script>