From 4592b79deb7060daec3b88b21335d7740c8f68d8 Mon Sep 17 00:00:00 2001
From: SuperHao <jacky.jihao@gmail.com>
Date: Wed, 1 Mar 2023 02:17:20 +0000
Subject: [PATCH 01/20] =?UTF-8?q?bugfix:=20=E8=BD=AC=E6=8D=A2HistoricTaskI?=
 =?UTF-8?q?nstance.createTime=20->=20BpmTaskRespVO.createTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: SuperHao <jacky.jihao@gmail.com>
---
 .../iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
index 015fd0fd9..709a86a50 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
@@ -135,6 +135,8 @@ public interface BpmTaskConvert {
     }
 
     @Mapping(source = "taskDefinitionKey", target = "definitionKey")
+    @Mapping(target = "createTime", expression = "java(bean.getCreateTime() == null ? null : LocalDateTime.ofInstant(bean.getCreateTime().toInstant(), ZoneId.systemDefault()))")
+    @Mapping(target = "endTime", expression = "java(bean.getEndTime() == null ? null : LocalDateTime.ofInstant(bean.getEndTime().toInstant(), ZoneId.systemDefault()))")
     BpmTaskRespVO convert3(HistoricTaskInstance bean);
 
     BpmTaskRespVO.User convert3(AdminUserRespDTO bean);

From aae6f1283201c30613c3306d65ba7fb5c2ac8d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E5=90=AC=E5=B9=B8=E7=A6=8F=E7=9A=84=E4=B8=8B?=
 =?UTF-8?q?=E8=90=BD?= <wujuncheng210@163.com>
Date: Thu, 16 Mar 2023 20:25:29 +0800
Subject: [PATCH 02/20] =?UTF-8?q?fix:=20MybatisPlus=20=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=BD=BF=E7=94=A8=E9=9B=AA=E8=8A=B1=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=20ASSIGN=5FID=20=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数
---
 .../yudao/module/system/dal/dataobject/sms/SmsCodeDO.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java
index 4e0aa25c3..00aea3a4a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java
@@ -26,7 +26,7 @@ public class SmsCodeDO extends BaseDO {
     /**
      * 编号
      */
-    private Integer id;
+    private Long id;
     /**
      * 手机号
      */

From c2748585b1dec39c73aa0781923514588370802d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=93=E5=90=AC=E5=B9=B8=E7=A6=8F=E7=9A=84=E4=B8=8B?=
 =?UTF-8?q?=E8=90=BD?= <wujuncheng210@163.com>
Date: Thu, 16 Mar 2023 21:23:43 +0800
Subject: [PATCH 03/20] =?UTF-8?q?fix:=20=E7=9F=AD=E4=BF=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/login.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue
index bbd2ac332..39b84d504 100644
--- a/yudao-ui-admin/src/views/login.vue
+++ b/yudao-ui-admin/src/views/login.vue
@@ -52,11 +52,12 @@
                 </el-form-item>
                 <el-form-item prop="mobileCode">
                   <el-input v-model="loginForm.mobileCode" type="text" auto-complete="off" placeholder="短信验证码"
+                            class="sms-login-mobile-code-prefix"
                             @keyup.enter.native="handleLogin">
-                    <template v-slot="icon">
+                    <template>
                       <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
                     </template>
-                    <template v-slot="append">
+                    <template slot="append">
                       <span v-if="mobileCodeTimer <= 0" class="getMobileCode" @click="getSmsCode" style="cursor: pointer;">获取验证码</span>
                       <span v-if="mobileCodeTimer > 0" class="getMobileCode">{{ mobileCodeTimer }}秒后可重新获取</span>
                     </template>
@@ -335,4 +336,9 @@ export default {
   text-decoration: underline red;
   color: red;
 }
+.sms-login-mobile-code-prefix {
+  :deep(.el-input__prefix) {
+    top: 22%;
+  }
+}
 </style>

From b54c5eaa45e96ceebcaa1b3466c635781fd488e0 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Sat, 18 Mar 2023 20:53:33 +0800
Subject: [PATCH 04/20] =?UTF-8?q?test:=20job=20=E7=A7=9F=E6=88=B7=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                   |  4 +-
 .../tenant/core/job/TenantJobTest.java        | 39 +++++++++++++++++++
 .../framework/tenant/core/job/TestJob.java    | 26 +++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
index 1d43ff2c5..0fb0a4f71 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
@@ -52,8 +52,8 @@
 
         <!-- Test 测试相关 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
new file mode 100644
index 000000000..9b1c6cf23
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.tenant.core.job;
+
+import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * 验证 job 租户逻辑
+ * {@link TenantJobHandlerDecorator}
+ *
+ * @author gaibu
+ */
+public class TenantJobTest extends BaseMockitoUnitTest {
+    @Spy
+    TenantFrameworkService tenantFrameworkService;
+
+    @Test
+    public void test() throws Exception {
+        // 准备测试租户 id
+        List<Long> tenantIds = Lists.newArrayList(1L, 2L, 3L);
+        // mock 数据
+        Mockito.doReturn(tenantIds).when(tenantFrameworkService).getTenantIds();
+        // 准备测试任务
+        TestJob testJob = new TestJob();
+        // 创建任务装饰器
+        TenantJobHandlerDecorator tenantJobHandlerDecorator = new TenantJobHandlerDecorator(tenantFrameworkService, testJob);
+        // 执行任务
+        tenantJobHandlerDecorator.execute(null);
+        // 断言返回值
+        assertEquals(testJob.getTenantIds(), tenantIds);
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java
new file mode 100644
index 000000000..a4de61dbc
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.framework.tenant.core.job;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@Component
+@TenantJob // 标记多租户
+public class TestJob implements JobHandler {
+    private final List<Long> tenantIds = new CopyOnWriteArrayList<>();
+
+    @Override
+    public String execute(String param) throws Exception {
+        tenantIds.add(TenantContextHolder.getTenantId());
+        return "success";
+    }
+
+    public List<Long> getTenantIds() {
+        CollUtil.sort(tenantIds, Long::compareTo);
+        return tenantIds;
+    }
+}

From 348a0ff02a9efadc6427ab86c3b68f576e53a236 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Mon, 20 Mar 2023 21:50:53 +0800
Subject: [PATCH 05/20] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=20code=20view?=
 =?UTF-8?q?=20=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/framework/tenant/core/job/TenantJobTest.java     | 7 +++++--
 .../iocoder/yudao/framework/tenant/core/job/TestJob.java   | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
index 9b1c6cf23..8e23338bb 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobTest.java
@@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import com.google.common.collect.Lists;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 
 import java.util.List;
 
@@ -18,7 +18,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  * @author gaibu
  */
 public class TenantJobTest extends BaseMockitoUnitTest {
-    @Spy
+
+    @Mock
     TenantFrameworkService tenantFrameworkService;
 
     @Test
@@ -31,8 +32,10 @@ public class TenantJobTest extends BaseMockitoUnitTest {
         TestJob testJob = new TestJob();
         // 创建任务装饰器
         TenantJobHandlerDecorator tenantJobHandlerDecorator = new TenantJobHandlerDecorator(tenantFrameworkService, testJob);
+
         // 执行任务
         tenantJobHandlerDecorator.execute(null);
+
         // 断言返回值
         assertEquals(testJob.getTenantIds(), tenantIds);
     }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java
index a4de61dbc..bad1cb304 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java
@@ -11,6 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 @Component
 @TenantJob // 标记多租户
 public class TestJob implements JobHandler {
+
     private final List<Long> tenantIds = new CopyOnWriteArrayList<>();
 
     @Override

From 14e7c52e0eb71df0b0339cd22ae8e6eca992a141 Mon Sep 17 00:00:00 2001
From: chop <935048000@qq.com>
Date: Tue, 21 Mar 2023 02:35:42 +0000
Subject: [PATCH 06/20] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84Date=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B7=AE8=E4=B8=AA=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=85=A8=E5=B1=80=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?LocalDateTime=E6=97=B6=E9=97=B4=20=E5=8E=9F=E6=9D=A5=E7=9A=84Da?=
 =?UTF-8?q?te=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4=E5=B7=AE8=E4=B8=AA?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8LocalDateTime=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chop <935048000@qq.com>
---
 .../trade/controller/admin/order/vo/TradeOrderBaseVO.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
index 5fef8841f..b7e034bbb 100755
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
@@ -22,7 +22,7 @@ public class TradeOrderBaseVO {
     private String no;
 
     @Schema(description = "下单时间", required = true)
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "订单类型", required = true, example = "1")
     private Integer type;

From fbbd3bc66c5ba65a9fc333a361e859c4558cea0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E6=98=AF=E7=9D=A1=E7=9D=80=E7=9A=84=E6=B0=B4?=
 <850083043@qq.com>
Date: Sat, 1 Apr 2023 03:34:22 +0000
Subject: [PATCH 07/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E9=99=86?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81=E3=80=82=E4=BB=A5?=
 =?UTF-8?q?19013896321=E4=B8=BA=E4=BE=8B=EF=BC=8C=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E6=AD=A3=E5=88=99=E5=8C=B9=E9=85=8D=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=BAfalse=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 冰是睡着的水 <850083043@qq.com>
---
 .../yudao/framework/common/util/validation/ValidationUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java
index f65955981..7e6f89d5a 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
  */
 public class ValidationUtils {
 
-    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[189]))\\d{8}$");
+    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[0,1,4-9])|(?:5[0-3,5-9])|(?:6[2,5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[0-3,5-9]))\\d{8}$");
 
     private static final Pattern PATTERN_URL = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
 

From b9ba17a477266a16c77bfeea2a606aa17f634fd4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 2 Apr 2023 19:01:46 +0800
Subject: [PATCH 08/20] =?UTF-8?q?!31=20IP=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java
index 8ad794637..f74f84864 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java
@@ -51,7 +51,7 @@ public class IPUtils {
      */
     @SneakyThrows
     public static Integer getAreaId(String ip) {
-        return Integer.parseInt(SEARCHER.search(ip));
+        return Integer.parseInt(SEARCHER.search(ip.trim()));
     }
 
     /**

From 09afdaafcf5e68e355abec0f29ae60b099cce5a0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 2 Apr 2023 19:12:32 +0800
Subject: [PATCH 09/20] =?UTF-8?q?!24=20=E3=80=90=E8=BD=BB=E9=87=8F?=
 =?UTF-8?q?=E7=BA=A7=20PR=E3=80=91=EF=BC=9APasswordEncoder=20=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E5=A4=8D=E6=9D=82=E5=BA=A6=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/framework/security/config/SecurityProperties.java   | 4 ++++
 .../security/config/YudaoSecurityAutoConfiguration.java       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java
index 7454b5ff6..d95dd5ff5 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java
@@ -37,4 +37,8 @@ public class SecurityProperties {
      */
     private List<String> permitAllUrls = Collections.emptyList();
 
+    /**
+     * PasswordEncoder 加密复杂度，越高开销越大
+     */
+    private Integer passwordEncoderLength = 4;
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
index 7a766eb83..47c363446 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
@@ -69,7 +69,7 @@ public class YudaoSecurityAutoConfiguration {
      */
     @Bean
     public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
+        return new BCryptPasswordEncoder(securityProperties.getPasswordEncoderLength());
     }
 
     /**

From b024c716edf1a7280fbb5f4e77231db331b37988 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 2 Apr 2023 19:23:04 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CodegenTableDO=20?=
 =?UTF-8?q?=E8=87=AA=E5=A2=9E=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/infra/dal/dataobject/codegen/CodegenTableDO.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
index 4f4a644a7..e11f92b05 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import lombok.Data;
@@ -26,6 +27,7 @@ public class CodegenTableDO extends BaseDO {
     /**
      * ID 编号
      */
+    @TableId
     private Long id;
 
     /**

From 6879fcd94fd8bdec3a2767e08dc44d3a9fdbd578 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 19 Mar 2023 01:17:26 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E6=94=B9=E9=80=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=8D=E5=89=8D=E7=AB=AF=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/codegen/CodegenFrontTypeEnum.java   | 26 +++++++++
 .../codegen/config/CodegenProperties.java     |  9 ++++
 .../service/codegen/inner/CodegenEngine.java  | 54 +++++++++++++------
 .../src/main/resources/application.yaml       |  1 +
 4 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
new file mode 100644
index 000000000..5dfc61e26
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.infra.enums.codegen;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 代码生成的前端类型枚举
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum CodegenFrontTypeEnum {
+
+    VUE2(10), // Vue2 Element UI 标准模版
+    VUE3(20), // Vue3 Element Plus 标准模版
+    VUE3_SCHEMA(21), // Vue3 Element Plus Schema 模版
+    VUE3_VXE(22), // Vue3 VXE 模版
+    ;
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java
index a8649dc23..d9daabb7f 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.infra.framework.codegen.config;
 
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
@@ -25,4 +26,12 @@ public class CodegenProperties {
     @NotEmpty(message = "数据库不能为空")
     private Collection<String> dbSchemas;
 
+    /**
+     * 代码生成的前端类型
+     *
+     * 枚举 {@link CodegenFrontTypeEnum#getType()}
+     */
+    @NotNull(message = "代码生成的前端类型不能为空")
+    private Integer frontType;
+
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 85f70f8c7..20fd7e67d 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -23,9 +23,12 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum;
 import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties;
+import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Table;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -50,11 +53,12 @@ import static cn.hutool.core.text.CharSequenceUtil.*;
 public class CodegenEngine {
 
     /**
-     * 模板配置
+     * 后端的模板配置
+     *
      * key：模板在 resources 的地址
      * value：生成的路径
      */
-    private static final Map<String, String> TEMPLATES = MapUtil.<String, String>builder(new LinkedHashMap<>()) // 有序
+    private static final Map<String, String> SERVER_TEMPLATES = MapUtil.<String, String>builder(new LinkedHashMap<>()) // 有序
             // Java module-biz Main
             .put(javaTemplatePath("controller/vo/baseVO"), javaModuleImplVOFilePath("BaseVO"))
             .put(javaTemplatePath("controller/vo/createReqVO"), javaModuleImplVOFilePath("CreateReqVO"))
@@ -80,23 +84,33 @@ public class CodegenEngine {
                     javaModuleImplTestFilePath("service/${table.businessName}/${table.className}ServiceImplTest"))
             // Java module-api Main
             .put(javaTemplatePath("enums/errorcode"), javaModuleApiMainFilePath("enums/ErrorCodeConstants_手动操作"))
-            // Vue2
-            .put(vueTemplatePath("views/index.vue"),
-                    vueFilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
-            .put(vueTemplatePath("api/api.js"),
-                    vueFilePath("api/${table.moduleName}/${classNameVar}.js"))
-            // Vue3
-            .put(vue3TemplatePath("views/index.vue"),
-                    vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
-            .put(vue3TemplatePath("views/data.ts"),
-                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
-            .put(vue3TemplatePath("api/api.ts"),
-                    vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
             // SQL
             .put("codegen/sql/sql.vm", "sql/sql.sql")
             .put("codegen/sql/h2.vm", "sql/h2.sql")
             .build();
 
+    /**
+     * 后端的配置模版
+     *
+     * key1：UI 模版的类型 {@link CodegenFrontTypeEnum#getType()}
+     * key2：模板在 resources 的地址
+     * value：生成的路径
+     */
+    private static final Table<Integer, String, String> FRONT_TEMPLATES = ImmutableTable.<Integer, String, String>builder()
+            // Vue2
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/index.vue"),
+                    vueFilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
+            .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("api/api.js"),
+                    vueFilePath("api/${table.moduleName}/${classNameVar}.js"))
+            // Vue3
+            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
+                    vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
+            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
+                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
+            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
+                    vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
+            .build();
+
     @Resource
     private CodegenProperties codegenProperties;
 
@@ -165,8 +179,9 @@ public class CodegenEngine {
         bindingMap.put("permissionPrefix", table.getModuleName() + ":" + simpleClassNameStrikeCase);
 
         // 执行生成
-        final Map<String, String> result = Maps.newLinkedHashMapWithExpectedSize(TEMPLATES.size()); // 有序
-        TEMPLATES.forEach((vmPath, filePath) -> {
+        Map<String, String> templates = getTemplates();
+        Map<String, String> result = Maps.newLinkedHashMapWithExpectedSize(templates.size()); // 有序
+        templates.forEach((vmPath, filePath) -> {
             filePath = formatFilePath(filePath, bindingMap);
             String content = templateEngine.getTemplate(vmPath).render(bindingMap);
             result.put(filePath, content);
@@ -174,6 +189,13 @@ public class CodegenEngine {
         return result;
     }
 
+    private Map<String, String> getTemplates() {
+        Map<String, String> templates = new LinkedHashMap<>();
+        templates.putAll(SERVER_TEMPLATES);
+        templates.putAll(FRONT_TEMPLATES.row(codegenProperties.getFrontType()));
+        return templates;
+    }
+
     private String formatFilePath(String filePath, Map<String, Object> bindingMap) {
         filePath = StrUtil.replace(filePath, "${basePackage}",
                 getStr(bindingMap, "basePackage").replaceAll("\\.", "/"));
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 6b2a08a01..6dfe1d86c 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -125,6 +125,7 @@ yudao:
   codegen:
     base-package: ${yudao.info.base-package}
     db-schemas: ${spring.datasource.dynamic.datasource.master.name}
+    front-type: 20
   error-code: # 错误码相关配置项
     constants-class-list:
       - cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants

From 4f00d923af25bef33fa21d64dfbc087a51e8ec85 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 19 Mar 2023 20:57:55 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E6=94=AF=E6=8C=81=20Vue3=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/codegen/inner/CodegenEngine.java  |   4 +-
 .../main/resources/codegen/vue3/api/api.ts.vm |  41 +--
 .../resources/codegen/vue3/views/form.vue.vm  | 165 +++++++++
 .../resources/codegen/vue3/views/index.vue.vm | 348 +++++++++++-------
 .../resources/codegen/vue3_vxe/api/api.ts.vm  |  74 ++++
 .../{vue3 => vue3_vxe}/views/data.ts.vm       |   0
 .../codegen/vue3_vxe/views/index.vue.vm       | 160 ++++++++
 7 files changed, 616 insertions(+), 176 deletions(-)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/api/api.ts.vm
 rename yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/{vue3 => vue3_vxe}/views/data.ts.vm (100%)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/index.vue.vm

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 20fd7e67d..258dceb3c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -105,8 +105,8 @@ public class CodegenEngine {
             // Vue3
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
                     vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
-            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
-                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
+//            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
+//                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
                     vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
             .build();
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
index df49a002b..eaab40703 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
@@ -14,61 +14,32 @@ export interface ${simpleClassName}VO {
 #end
 }
 
-export interface ${simpleClassName}PageReqVO extends PageParam {
-#foreach ($column in $columns)
-#if (${column.listOperation})##查询操作
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
-  ${column.javaField}?: number
-#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
-  ${column.javaField}?: Date[]
-#else
-  ${column.javaField}?: ${column.javaType.toLowerCase()}
-#end
-#end
-#end
-}
-
-export interface ${simpleClassName}ExcelReqVO {
-#foreach ($column in $columns)
-#if (${column.listOperation})##查询操作
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
-  ${column.javaField}?: number
-#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
-  ${column.javaField}?: Date[]
-#else
-  ${column.javaField}?: ${column.javaType.toLowerCase()}
-#end
-#end
-#end
-}
-#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
-
 // 查询${table.classComment}列表
-export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
+export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
   return await request.get({ url: '${baseURL}/page', params })
 }
 
 // 查询${table.classComment}详情
-export const get${simpleClassName}Api = async (id: number) => {
+export const get${simpleClassName} = async (id: number) => {
   return await request.get({ url: '${baseURL}/get?id=' + id })
 }
 
 // 新增${table.classComment}
-export const create${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
+export const create${simpleClassName} = async (data: ${simpleClassName}VO) => {
   return await request.post({ url: '${baseURL}/create', data })
 }
 
 // 修改${table.classComment}
-export const update${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
+export const update${simpleClassName} = async (data: ${simpleClassName}VO) => {
   return await request.put({ url: '${baseURL}/update', data })
 }
 
 // 删除${table.classComment}
-export const delete${simpleClassName}Api = async (id: number) => {
+export const delete${simpleClassName} = async (id: number) => {
   return await request.delete({ url: '${baseURL}/delete?id=' + id })
 }
 
 // 导出${table.classComment} Excel
-export const export${simpleClassName}Api = async (params: ${simpleClassName}ExcelReqVO) => {
+export const export${simpleClassName}Api = async (params) => {
   return await request.download({ url: '${baseURL}/export-excel', params })
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
new file mode 100644
index 000000000..366fcb86b
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -0,0 +1,165 @@
+<!-- 对话框(添加 / 修改) -->
+<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      #foreach($column in $columns)
+          #if ($column.createOperation || $column.updateOperation)
+              #set ($dictType = $column.dictType)
+              #set ($javaField = $column.javaField)
+              #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+              #set ($comment = $column.columnComment)
+              #if ($column.htmlType == "input")
+                  #if (!$column.primaryKey)## 忽略主键，不用在表单里
+                    <el-form-item label="${comment}" prop="${javaField}">
+                      <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
+                    </el-form-item>
+                  #end
+              #elseif($column.htmlType == "imageUpload")## 图片上传
+                  #set ($hasImageUploadColumn = true)
+                <el-form-item label="${comment}">
+                  <imageUpload v-model="form.${javaField}"/>
+                </el-form-item>
+              #elseif($column.htmlType == "fileUpload")## 文件上传
+                  #set ($hasFileUploadColumn = true)
+                <el-form-item label="${comment}">
+                  <fileUpload v-model="form.${javaField}"/>
+                </el-form-item>
+              #elseif($column.htmlType == "editor")## 文本编辑器
+                  #set ($hasEditorColumn = true)
+                <el-form-item label="${comment}">
+                  <editor v-model="form.${javaField}" :min-height="192"/>
+                </el-form-item>
+              #elseif($column.htmlType == "select")## 下拉框
+                <el-form-item label="${comment}" prop="${javaField}">
+                  <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                      #if ("" != $dictType)## 有数据字典
+                        <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                   :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
+                      #else##没数据字典
+                        <el-option label="请选择字典生成" value="" />
+                      #end
+                  </el-select>
+                </el-form-item>
+              #elseif($column.htmlType == "checkbox")## 多选框
+                <el-form-item label="${comment}" prop="${javaField}">
+                  <el-checkbox-group v-model="form.${javaField}">
+                      #if ("" != $dictType)## 有数据字典
+                        <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                     :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
+                      #else##没数据字典
+                        <el-checkbox>请选择字典生成</el-checkbox>
+                      #end
+                  </el-checkbox-group>
+                </el-form-item>
+              #elseif($column.htmlType == "radio")## 单选框
+                <el-form-item label="${comment}" prop="${javaField}">
+                  <el-radio-group v-model="form.${javaField}">
+                      #if ("" != $dictType)## 有数据字典
+                        <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+                                  :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-radio>
+                      #else##没数据字典
+                        <el-radio label="1">请选择字典生成</el-radio>
+                      #end
+                  </el-radio-group>
+                </el-form-item>
+              #elseif($column.htmlType == "datetime")## 时间框
+                <el-form-item label="${comment}" prop="${javaField}">
+                  <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+                </el-form-item>
+              #elseif($column.htmlType == "textarea")## 文本框
+                <el-form-item label="${comment}" prop="${javaField}">
+                  <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              #end
+          #end
+      #end
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button type="primary" @click="submitForm">确 定</el-button>
+    <el-button @click="cancel">取 消</el-button>
+  </div>
+</el-dialog>
+
+
+// 弹出层标题
+title: "",
+// 是否显示弹出层
+open: false,
+
+// 表单参数
+form: {},
+// 表单校验
+rules: {
+#foreach ($column in $columns)
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+        #set($comment=$column.columnComment)
+        $column.javaField: [{ required: true, message: "${comment}不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }],
+    #end
+#end
+}
+
+
+/** 表单重置 */
+reset() {
+this.form = {
+#foreach ($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+            $column.javaField: [],
+        #else
+            $column.javaField: undefined,
+        #end
+    #end
+#end
+};
+this.resetForm("form");
+},
+
+/** 新增按钮操作 */
+handleAdd() {
+this.reset();
+this.open = true;
+this.title = "添加${table.classComment}";
+},
+/** 修改按钮操作 */
+handleUpdate(row) {
+this.reset();
+const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
+get${simpleClassName}(${primaryColumn.javaField}).then(response => {
+this.form = response.data;
+#foreach ($column in $columns)
+    #if($column.htmlType == "checkbox")## checkbox 特殊处理
+    this.form.$column.javaField = this.form.${column.javaField}.split(",");
+    #end
+#end
+this.open = true;
+this.title = "修改${table.classComment}";
+});
+},
+/** 提交按钮 */
+submitForm() {
+this.#[[$]]#refs["form"].validate(valid => {
+if (!valid) {
+return;
+}
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+// 修改的提交
+if (this.form.${primaryColumn.javaField} != null) {
+update${simpleClassName}(this.form).then(response => {
+this.#[[$modal]]#.msgSuccess("修改成功");
+this.open = false;
+this.getList();
+});
+return;
+}
+// 添加的提交
+create${simpleClassName}(this.form).then(response => {
+this.#[[$modal]]#.msgSuccess("新增成功");
+this.open = false;
+this.getList();
+});
+});
+},
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 389458c51..73f35856a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -1,160 +1,230 @@
 <template>
-  <ContentWrap>
-    <!-- 列表 -->
-    <XTable @register="registerTable">
-      <template #toolbar_buttons>
-        <!-- 操作：新增 -->
-        <XButton
-          type="primary"
-          preIcon="ep:zoom-in"
-          :title="t('action.add')"
-          v-hasPermi="['${permissionPrefix}:create']"
-          @click="handleCreate()"
+  <content-wrap>
+    <!-- 搜索工作栏 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
+    #foreach($column in $columns)
+      #if ($column.listOperation)
+        #set ($dictType = $column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment = $column.columnComment)
+        #if ($column.htmlType == "input")
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input
+          v-model="queryParams.${javaField}"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter="handleQuery"
         />
-        <!-- 操作：导出 -->
-        <XButton
-          type="warning"
-          preIcon="ep:download"
-          :title="t('action.export')"
+      </el-form-item>
+    #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-select v-model="queryParams.${javaField}" placeholder="请选择${comment}" clearable>
+          #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+          <!-- TODO 芋艿：需要考虑不同类型的处理 -->
+          <el-option
+            v-for="dict in getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+          #else## 未设置 dictType 数据字典的情况
+          <el-option label="请选择字典生成" value="" />
+          #end
+        </el-select>
+      </el-form-item>
+    #elseif($column.htmlType == "datetime")
+      #if ($column.listOperationCondition != "BETWEEN")## 非范围
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="queryParams.${javaField}"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="选择${comment}"
+          clearable
+        />
+      </el-form-item>
+      #else## 范围
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="queryParams.${javaField}"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+        />
+      </el-form-item>
+      #end
+    #end
+    #end
+    #end
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openModal('create')" v-hasPermi="['${permissionPrefix}:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
           v-hasPermi="['${permissionPrefix}:export']"
-          @click="exportList('${table.classComment}.xls')"
-        />
-      </template>
-      <template #actionbtns_default="{ row }">
-        <!-- 操作：修改 -->
-        <XTextButton
-          preIcon="ep:edit"
-          :title="t('action.edit')"
-          v-hasPermi="['${permissionPrefix}:update']"
-          @click="handleUpdate(row.id)"
-        />
-        <!-- 操作：详情 -->
-        <XTextButton
-          preIcon="ep:view"
-          :title="t('action.detail')"
-          v-hasPermi="['${permissionPrefix}:query']"
-          @click="handleDetail(row.id)"
-        />
-        <!-- 操作：删除 -->
-        <XTextButton
-          preIcon="ep:delete"
-          :title="t('action.del')"
-          v-hasPermi="['${permissionPrefix}:delete']"
-          @click="deleteData(row.id)"
-        />
-      </template>
-    </XTable>
-  </ContentWrap>
-  <!-- 弹窗 -->
-  <XModal id="${classNameVar}Model" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
-    <!-- 表单：添加/修改 -->
-    <Form
-      ref="formRef"
-      v-if="['create', 'update'].includes(actionType)"
-      :schema="allSchemas.formSchema"
-      :rules="rules"
-    />
-    <!-- 表单：详情 -->
-    <Descriptions
-      v-if="actionType === 'detail'"
-      :schema="allSchemas.detailSchema"
-      :data="detailData"
-    />
-    <template #footer>
-      <!-- 按钮：保存 -->
-      <XButton
-        v-if="['create', 'update'].includes(actionType)"
-        type="primary"
-        :title="t('action.save')"
-        :loading="actionLoading"
-        @click="submitForm()"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </content-wrap>
+
+  <!-- 列表 -->
+  <content-wrap>
+    <el-table v-loading="loading" :data="list">
+    #foreach($column in $columns)
+      #if ($column.listOperationResult)
+        #set ($dictType=$column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment=$column.columnComment)
+        #if ($column.javaType == "LocalDateTime")## 时间类型
+      <el-table-column
+        label="${comment}"
+        align="center"
+        prop="${javaField}"
+        :formatter="dateFormatter"
       />
-      <!-- 按钮：关闭 -->
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
-    </template>
-  </XModal>
+        #elseif("" != $column.dictType)## 数据字典
+      <el-table-column label="${comment}" align="center" prop="${javaField}">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.$dictType.toUpperCase()" :value="scope.row.${column.javaField}" />
+        </template>
+      </el-table-column>
+        #else
+      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+        #end
+      #end
+    #end
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openModal('update', scope.row.id)"
+            v-hasPermi="['${permissionPrefix}:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['${permissionPrefix}:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </content-wrap>
 </template>
+
 <script setup lang="ts" name="${simpleClassName}">
-import { FormExpose } from '@/components/Form'
-// 业务相关的 import
-import { rules, allSchemas } from './${classNameVar}.data'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
 import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
-
-const { t } = useI18n() // 国际化
+// import ConfigForm from './form.vue'
 const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
-// 列表相关的变量
-const [registerTable, { reload, deleteData, exportList }] = useXTable({
-  allSchemas: allSchemas,
-  getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
-  deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api,
-  exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  #foreach ($column in $columns)
+    #if ($column.listOperation)
+      #if ($column.listOperationCondition != 'BETWEEN')
+  $column.javaField: null,
+  #end
+      #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
+  $column.javaField: [],
+      #end
+    #end
+  #end
 })
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 
-// 弹窗相关的变量
-const modelVisible = ref(false) // 是否显示弹出层
-const modelTitle = ref('edit') // 弹出层标题
-const modelLoading = ref(false) // 弹出层loading
-const actionType = ref('') // 操作按钮的类型
-const actionLoading = ref(false) // 按钮 Loading
-const formRef = ref<FormExpose>() // 表单 Ref
-const detailData = ref() // 详情 Ref
-
-// 设置标题
-const setDialogTile = (type: string) => {
-  modelLoading.value = true
-  modelTitle.value = t('action.' + type)
-  actionType.value = type
-  modelVisible.value = true
+/** 查询参数列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ${simpleClassName}Api.get${simpleClassName}Page(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
 
-// 新增操作
-const handleCreate = () => {
-  setDialogTile('create')
-  modelLoading.value = false
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
 }
 
-// 修改操作
-const handleUpdate = async (rowId: number) => {
-  setDialogTile('update')
-  // 设置数据
-  const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
-  unref(formRef)?.setValues(res)
-  modelLoading.value = false
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
 }
 
-// 详情操作
-const handleDetail = async (rowId: number) => {
-  setDialogTile('detail')
-  const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
-  detailData.value = res
-  modelLoading.value = false
+/** 添加/修改操作 */
+// const modalRef = ref()
+// const openModal = (type: string, id?: number) => {
+//   modalRef.value.openModal(type, id)
+// }
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ${simpleClassName}Api.delete${simpleClassName}(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
 }
 
-// 提交按钮
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  if (!elForm) return
-  elForm.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      // 提交请求
-      try {
-        const data = unref(formRef)?.formModel as ${simpleClassName}Api.${simpleClassName}VO
-        if (actionType.value === 'create') {
-          await ${simpleClassName}Api.create${simpleClassName}Api(data)
-          message.success(t('common.createSuccess'))
-        } else {
-          await ${simpleClassName}Api.update${simpleClassName}Api(data)
-          message.success(t('common.updateSuccess'))
-        }
-        modelVisible.value = false
-      } finally {
-        actionLoading.value = false
-        // 刷新列表
-        await reload()
-      }
-    }
-  })
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ${simpleClassName}Api.export${simpleClassName}Api(queryParams)
+    download.excel(data, '${table.classComment}.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
 }
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
 </script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/api/api.ts.vm
new file mode 100644
index 000000000..df49a002b
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/api/api.ts.vm
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface ${simpleClassName}VO {
+#foreach ($column in $columns)
+#if ($column.createOperation || $column.updateOperation)
+#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
+  ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+  ${column.javaField}: Date
+#else
+  ${column.javaField}: ${column.javaType.toLowerCase()}
+#end
+#end
+#end
+}
+
+export interface ${simpleClassName}PageReqVO extends PageParam {
+#foreach ($column in $columns)
+#if (${column.listOperation})##查询操作
+#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
+  ${column.javaField}?: number
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+  ${column.javaField}?: Date[]
+#else
+  ${column.javaField}?: ${column.javaType.toLowerCase()}
+#end
+#end
+#end
+}
+
+export interface ${simpleClassName}ExcelReqVO {
+#foreach ($column in $columns)
+#if (${column.listOperation})##查询操作
+#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
+  ${column.javaField}?: number
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+  ${column.javaField}?: Date[]
+#else
+  ${column.javaField}?: ${column.javaType.toLowerCase()}
+#end
+#end
+#end
+}
+#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
+
+// 查询${table.classComment}列表
+export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
+  return await request.get({ url: '${baseURL}/page', params })
+}
+
+// 查询${table.classComment}详情
+export const get${simpleClassName}Api = async (id: number) => {
+  return await request.get({ url: '${baseURL}/get?id=' + id })
+}
+
+// 新增${table.classComment}
+export const create${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
+  return await request.post({ url: '${baseURL}/create', data })
+}
+
+// 修改${table.classComment}
+export const update${simpleClassName}Api = async (data: ${simpleClassName}VO) => {
+  return await request.put({ url: '${baseURL}/update', data })
+}
+
+// 删除${table.classComment}
+export const delete${simpleClassName}Api = async (id: number) => {
+  return await request.delete({ url: '${baseURL}/delete?id=' + id })
+}
+
+// 导出${table.classComment} Excel
+export const export${simpleClassName}Api = async (params: ${simpleClassName}ExcelReqVO) => {
+  return await request.download({ url: '${baseURL}/export-excel', params })
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/data.ts.vm
similarity index 100%
rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
rename to yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/data.ts.vm
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/index.vue.vm
new file mode 100644
index 000000000..389458c51
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vxe/views/index.vue.vm
@@ -0,0 +1,160 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：新增 -->
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
+          v-hasPermi="['${permissionPrefix}:create']"
+          @click="handleCreate()"
+        />
+        <!-- 操作：导出 -->
+        <XButton
+          type="warning"
+          preIcon="ep:download"
+          :title="t('action.export')"
+          v-hasPermi="['${permissionPrefix}:export']"
+          @click="exportList('${table.classComment}.xls')"
+        />
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：修改 -->
+        <XTextButton
+          preIcon="ep:edit"
+          :title="t('action.edit')"
+          v-hasPermi="['${permissionPrefix}:update']"
+          @click="handleUpdate(row.id)"
+        />
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['${permissionPrefix}:query']"
+          @click="handleDetail(row.id)"
+        />
+        <!-- 操作：删除 -->
+        <XTextButton
+          preIcon="ep:delete"
+          :title="t('action.del')"
+          v-hasPermi="['${permissionPrefix}:delete']"
+          @click="deleteData(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+  <!-- 弹窗 -->
+  <XModal id="${classNameVar}Model" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：添加/修改 -->
+    <Form
+      ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+    />
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="${simpleClassName}">
+import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import { rules, allSchemas } from './${classNameVar}.data'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+// 列表相关的变量
+const [registerTable, { reload, deleteData, exportList }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
+  deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api,
+  exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
+})
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+  modelLoading.value = false
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
+  unref(formRef)?.setValues(res)
+  modelLoading.value = false
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as ${simpleClassName}Api.${simpleClassName}VO
+        if (actionType.value === 'create') {
+          await ${simpleClassName}Api.create${simpleClassName}Api(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await ${simpleClassName}Api.update${simpleClassName}Api(data)
+          message.success(t('common.updateSuccess'))
+        }
+        modelVisible.value = false
+      } finally {
+        actionLoading.value = false
+        // 刷新列表
+        await reload()
+      }
+    }
+  })
+}
+</script>

From 975b978e37f26ef030c34bc44a9244071eac6e06 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 20 Mar 2023 22:57:08 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20Vue3=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/codegen/vue3/views/index.vue.vm | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 73f35856a..dc071f212 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -1,11 +1,19 @@
 <template>
   <content-wrap>
     <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+    #set ($dictMethods = []) ## 使用到的 dict 字典方法
     #foreach($column in $columns)
       #if ($column.listOperation)
         #set ($dictType = $column.dictType)
         #set ($javaField = $column.javaField)
+        #set ($javaType = $column.javaType)
         #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #set ($comment = $column.columnComment)
         #if ($column.htmlType == "input")
@@ -15,15 +23,31 @@
           placeholder="请输入${comment}"
           clearable
           @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
     #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
       <el-form-item label="${comment}" prop="${javaField}">
-        <el-select v-model="queryParams.${javaField}" placeholder="请选择${comment}" clearable>
+        <el-select
+          v-model="queryParams.${javaField}"
+          placeholder="请选择${comment}"
+          clearable
+          class="!w-240px"
+        >
           #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-          <!-- TODO 芋艿：需要考虑不同类型的处理 -->
+              #set ($dictMethod = "getDictOptions") ## 计算使用哪个 dict 字典方法
+              #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                #set ($dictMethod = "getIntDictOptions")
+              #elseif ($javaType == "String")
+                #set ($dictMethod = "getStrDictOptions")
+              #elseif ($javaType == "Boolean")
+                #set ($dictMethod = "getBoolDictOptions")
+              #end
+              #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                  #( $dictMethods.add($dictMethod) )
+              #end
           <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -42,6 +66,7 @@
           type="date"
           placeholder="选择${comment}"
           clearable
+          class="!w-240px"
         />
       </el-form-item>
       #else## 范围
@@ -53,6 +78,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
         />
       </el-form-item>
       #end
@@ -137,7 +163,9 @@
 </template>
 
 <script setup lang="ts" name="${simpleClassName}">
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+#if ($dictMethods.size() > 0)
+import { DICT_TYPE#foreach ($dictMethod in $dictMethods), ${dictMethod}#end } from '@/utils/dict'
+#end
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
@@ -151,13 +179,19 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  #set ($listOperationLastIndex = -1) ## 求最后一个需要 , 的地方
+  #foreach ($column in $columns)
+    #if ($column.listOperation)
+      #set ($listOperationLastIndex = $foreach.index)
+    #end
+  #end
   #foreach ($column in $columns)
     #if ($column.listOperation)
       #if ($column.listOperationCondition != 'BETWEEN')
-  $column.javaField: null,
+  $column.javaField: null#if($foreach.index < $listOperationLastIndex),#end
   #end
       #if ($column.htmlType == "datetime" || $column.listOperationCondition == "BETWEEN")
-  $column.javaField: [],
+  $column.javaField: []#if($foreach.index < $listOperationLastIndex),#end
       #end
     #end
   #end

From d6227f7767a508fb1d8ec010410f34c4668793f6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 21 Mar 2023 22:38:42 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20Vue3=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84=E5=88=97=E8=A1=A8=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=2080=20=E9=95=BF=E5=BA=A6=E4=B8=8B=E7=9A=84=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/codegen/inner/CodegenEngine.java  |   2 +
 .../resources/codegen/vue3/views/form.vue.vm  | 273 +++++++-----------
 .../resources/codegen/vue3/views/index.vue.vm |  62 ++--
 3 files changed, 151 insertions(+), 186 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 258dceb3c..94eab36b1 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -105,6 +105,8 @@ public class CodegenEngine {
             // Vue3
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
                     vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
+            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/form.vue"),
+                    vue3FilePath("views/${table.moduleName}/${classNameVar}/form.vue"))
 //            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
 //                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 366fcb86b..53414e9b0 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -1,165 +1,116 @@
-<!-- 对话框(添加 / 修改) -->
-<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      #foreach($column in $columns)
-          #if ($column.createOperation || $column.updateOperation)
-              #set ($dictType = $column.dictType)
-              #set ($javaField = $column.javaField)
-              #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-              #set ($comment = $column.columnComment)
-              #if ($column.htmlType == "input")
-                  #if (!$column.primaryKey)## 忽略主键，不用在表单里
-                    <el-form-item label="${comment}" prop="${javaField}">
-                      <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
-                    </el-form-item>
-                  #end
-              #elseif($column.htmlType == "imageUpload")## 图片上传
-                  #set ($hasImageUploadColumn = true)
-                <el-form-item label="${comment}">
-                  <imageUpload v-model="form.${javaField}"/>
-                </el-form-item>
-              #elseif($column.htmlType == "fileUpload")## 文件上传
-                  #set ($hasFileUploadColumn = true)
-                <el-form-item label="${comment}">
-                  <fileUpload v-model="form.${javaField}"/>
-                </el-form-item>
-              #elseif($column.htmlType == "editor")## 文本编辑器
-                  #set ($hasEditorColumn = true)
-                <el-form-item label="${comment}">
-                  <editor v-model="form.${javaField}" :min-height="192"/>
-                </el-form-item>
-              #elseif($column.htmlType == "select")## 下拉框
-                <el-form-item label="${comment}" prop="${javaField}">
-                  <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
-                      #if ("" != $dictType)## 有数据字典
-                        <el-option v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                                   :key="dict.value" :label="dict.label" #if ($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end />
-                      #else##没数据字典
-                        <el-option label="请选择字典生成" value="" />
-                      #end
-                  </el-select>
-                </el-form-item>
-              #elseif($column.htmlType == "checkbox")## 多选框
-                <el-form-item label="${comment}" prop="${javaField}">
-                  <el-checkbox-group v-model="form.${javaField}">
-                      #if ("" != $dictType)## 有数据字典
-                        <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                                     :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-checkbox>
-                      #else##没数据字典
-                        <el-checkbox>请选择字典生成</el-checkbox>
-                      #end
-                  </el-checkbox-group>
-                </el-form-item>
-              #elseif($column.htmlType == "radio")## 单选框
-                <el-form-item label="${comment}" prop="${javaField}">
-                  <el-radio-group v-model="form.${javaField}">
-                      #if ("" != $dictType)## 有数据字典
-                        <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
-                                  :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end>{{dict.label}}</el-radio>
-                      #else##没数据字典
-                        <el-radio label="1">请选择字典生成</el-radio>
-                      #end
-                  </el-radio-group>
-                </el-form-item>
-              #elseif($column.htmlType == "datetime")## 时间框
-                <el-form-item label="${comment}" prop="${javaField}">
-                  <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
-                </el-form-item>
-              #elseif($column.htmlType == "textarea")## 文本框
-                <el-form-item label="${comment}" prop="${javaField}">
-                  <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-              #end
-          #end
-      #end
-  </el-form>
-  <div slot="footer" class="dialog-footer">
-    <el-button type="primary" @click="submitForm">确 定</el-button>
-    <el-button @click="cancel">取 消</el-button>
-  </div>
-</el-dialog>
-
-
-// 弹出层标题
-title: "",
-// 是否显示弹出层
-open: false,
-
-// 表单参数
-form: {},
-// 表单校验
-rules: {
-#foreach ($column in $columns)
-    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
-        #set($comment=$column.columnComment)
-        $column.javaField: [{ required: true, message: "${comment}不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }],
-    #end
-#end
-}
-
-
-/** 表单重置 */
-reset() {
-this.form = {
-#foreach ($column in $columns)
+<template>
+  <Dialog :title="modelTitle" v-model="modelVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+#foreach($column in $columns)
     #if ($column.createOperation || $column.updateOperation)
-        #if ($column.htmlType == "checkbox")
-            $column.javaField: [],
-        #else
-            $column.javaField: undefined,
+        #set ($dictType = $column.dictType)
+        #set ($javaField = $column.javaField)
+        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set ($comment = $column.columnComment)
+        #set ($dictMethod = "getDictOptions") ## 计算使用哪个 dict 字典方法
+            #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                #set ($dictMethod = "getIntDictOptions")
+            #elseif ($javaType == "String")
+                #set ($dictMethod = "getStrDictOptions")
+            #elseif ($javaType == "Boolean")
+                #set ($dictMethod = "getBoolDictOptions")
+            #end
+        #if ($column.htmlType == "input" && !$column.primaryKey) ## 忽略主键，不用在表单里
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
+      </el-form-item>
+        #elseif($column.htmlType == "imageUpload")## 图片上传 TODO 芋艿：待测试
+            #set ($hasImageUploadColumn = true)
+          <el-form-item label="${comment}">
+            <imageUpload v-model="form.${javaField}"/>
+          </el-form-item>
+        #elseif($column.htmlType == "fileUpload")## 文件上传 TODO 芋艿：待测试
+            #set ($hasFileUploadColumn = true)
+          <el-form-item label="${comment}">
+            <fileUpload v-model="form.${javaField}"/>
+          </el-form-item>
+        #elseif($column.htmlType == "editor")## 文本编辑器 TODO 芋艿：待测试
+            #set ($hasEditorColumn = true)
+          <el-form-item label="${comment}">
+            <editor v-model="form.${javaField}" :min-height="192"/>
+          </el-form-item>
+        #elseif($column.htmlType == "select")## 下拉框
+          <el-form-item label="${comment}" prop="${javaField}">
+            <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+                #if ("" != $dictType)## 有数据字典
+                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #( $dictMethods.add($dictMethod) )
+                    #end
+              <el-option
+                v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+                #else##没数据字典
+              <el-option label="请选择字典生成" value="" />
+                #end
+            </el-select>
+          </el-form-item>
+        #elseif($column.htmlType == "checkbox")## 多选框 TODO 芋艿：待测试
+          <el-form-item label="${comment}" prop="${javaField}">
+            <el-checkbox-group v-model="form.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #( $dictMethods.add($dictMethod) )
+                    #end
+              <el-checkbox
+                v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                key="dict.value"
+                :label="dict.value">
+                {{dict.label}}
+              </el-checkbox>
+                #else##没数据字典
+                  <el-checkbox>请选择字典生成</el-checkbox>
+                #end
+            </el-checkbox-group>
+          </el-form-item>
+        #elseif($column.htmlType == "radio")## 单选框
+          <el-form-item label="${comment}" prop="${javaField}">
+            <el-radio-group v-model="form.${javaField}">
+                #if ("" != $dictType)## 有数据字典
+                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #( $dictMethods.add($dictMethod) )
+                    #end
+                  <el-radio
+                    v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+                    :key="dict.value"
+                    :label="dict.value">
+                    {{dict.label}}
+                  </el-radio>
+                #else##没数据字典
+                  <el-radio label="1">请选择字典生成</el-radio>
+                #end
+            </el-radio-group>
+          </el-form-item>
+        #elseif($column.htmlType == "datetime")## 时间框 TODO 芋艿：待测试
+          <el-form-item label="${comment}" prop="${javaField}">
+            <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+          </el-form-item>
+        #elseif($column.htmlType == "textarea")## 文本框 TODO 芋艿：待测试
+          <el-form-item label="${comment}" prop="${javaField}">
+            <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
         #end
     #end
 #end
-};
-this.resetForm("form");
-},
-
-/** 新增按钮操作 */
-handleAdd() {
-this.reset();
-this.open = true;
-this.title = "添加${table.classComment}";
-},
-/** 修改按钮操作 */
-handleUpdate(row) {
-this.reset();
-const ${primaryColumn.javaField} = row.${primaryColumn.javaField};
-get${simpleClassName}(${primaryColumn.javaField}).then(response => {
-this.form = response.data;
-#foreach ($column in $columns)
-    #if($column.htmlType == "checkbox")## checkbox 特殊处理
-    this.form.$column.javaField = this.form.${column.javaField}.split(",");
-    #end
-#end
-this.open = true;
-this.title = "修改${table.classComment}";
-});
-},
-/** 提交按钮 */
-submitForm() {
-this.#[[$]]#refs["form"].validate(valid => {
-if (!valid) {
-return;
-}
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-this.form.$column.javaField = this.form.${column.javaField}.join(",");
-#end
-#end
-// 修改的提交
-if (this.form.${primaryColumn.javaField} != null) {
-update${simpleClassName}(this.form).then(response => {
-this.#[[$modal]]#.msgSuccess("修改成功");
-this.open = false;
-this.getList();
-});
-return;
-}
-// 添加的提交
-create${simpleClassName}(this.form).then(response => {
-this.#[[$modal]]#.msgSuccess("新增成功");
-this.open = false;
-this.getList();
-});
-});
-},
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="modelVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index dc071f212..5622d7895 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -8,15 +8,23 @@
       :inline="true"
       label-width="68px"
     >
-    #set ($dictMethods = []) ## 使用到的 dict 字典方法
+    #set ($dictMethods = [])## 使用到的 dict 字典方法
     #foreach($column in $columns)
-      #if ($column.listOperation)
-        #set ($dictType = $column.dictType)
-        #set ($javaField = $column.javaField)
-        #set ($javaType = $column.javaType)
-        #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #set ($comment = $column.columnComment)
-        #if ($column.htmlType == "input")
+        #if ($column.listOperation)
+            #set ($dictType = $column.dictType)
+            #set ($javaField = $column.javaField)
+            #set ($javaType = $column.javaType)
+            #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            #set ($comment = $column.columnComment)
+            #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+            #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+                #set ($dictMethod = "getIntDictOptions")
+            #elseif ($javaType == "String")
+                #set ($dictMethod = "getStrDictOptions")
+            #elseif ($javaType == "Boolean")
+                #set ($dictMethod = "getBoolDictOptions")
+            #end
+            #if ($column.htmlType == "input")
       <el-form-item label="${comment}" prop="${javaField}">
         <el-input
           v-model="queryParams.${javaField}"
@@ -26,35 +34,31 @@
           class="!w-240px"
         />
       </el-form-item>
-    #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+            #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
       <el-form-item label="${comment}" prop="${javaField}">
+                #if ($javaField.length() + $comment.length() > 8)
         <el-select
           v-model="queryParams.${javaField}"
           placeholder="请选择${comment}"
           clearable
           class="!w-240px"
         >
-          #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-              #set ($dictMethod = "getDictOptions") ## 计算使用哪个 dict 字典方法
-              #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-                #set ($dictMethod = "getIntDictOptions")
-              #elseif ($javaType == "String")
-                #set ($dictMethod = "getStrDictOptions")
-              #elseif ($javaType == "Boolean")
-                #set ($dictMethod = "getBoolDictOptions")
-              #end
-              #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
-                  #( $dictMethods.add($dictMethod) )
-              #end
+                #else
+        <el-select v-model="queryParams.${javaField}" placeholder="请选择${comment}" clearable class="!w-240px">
+                #end
+                #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+                    #if (!$dictMethods.contains($dictMethod))## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                        #set($ignore = $dictMethods.add($dictMethod) )
+                    #end
           <el-option
             v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
-          #else## 未设置 dictType 数据字典的情况
+                #else## 未设置 dictType 数据字典的情况
           <el-option label="请选择字典生成" value="" />
-          #end
+                #end
         </el-select>
       </el-form-item>
     #elseif($column.htmlType == "datetime")
@@ -88,7 +92,15 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        #if ($permissionPrefix <= 14)
         <el-button type="primary" @click="openModal('create')" v-hasPermi="['${permissionPrefix}:create']">
+        #else
+        <el-button
+          type="primary"
+          @click="openModal('create')"
+          v-hasPermi="['${permissionPrefix}:create']"
+        >
+        #end
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
         <el-button
@@ -179,7 +191,7 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  #set ($listOperationLastIndex = -1) ## 求最后一个需要 , 的地方
+  #set ($listOperationLastIndex = -1)## 求最后一个需要 , 的地方
   #foreach ($column in $columns)
     #if ($column.listOperation)
       #set ($listOperationLastIndex = $foreach.index)
@@ -249,7 +261,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ${simpleClassName}Api.export${simpleClassName}Api(queryParams)
+    const data = await ${simpleClassName}Api.export${simpleClassName}(queryParams)
     download.excel(data, '${table.classComment}.xls')
   } catch {
   } finally {

From e96f052a06cbaa59362a3de491115900be57f8f2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 22 Mar 2023 00:06:13 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20Vue3=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/codegen/vue3/views/form.vue.vm  | 216 +++++++++++++-----
 .../resources/codegen/vue3/views/index.vue.vm |   2 +-
 2 files changed, 166 insertions(+), 52 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 53414e9b0..8209c92c3 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -7,63 +7,64 @@
       label-width="100px"
       v-loading="formLoading"
     >
+#set ($dictMethods = [])## 使用到的 dict 字典方法
 #foreach($column in $columns)
     #if ($column.createOperation || $column.updateOperation)
         #set ($dictType = $column.dictType)
         #set ($javaField = $column.javaField)
+        #set ($javaType = $column.javaType)
         #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #set ($comment = $column.columnComment)
-        #set ($dictMethod = "getDictOptions") ## 计算使用哪个 dict 字典方法
-            #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-                #set ($dictMethod = "getIntDictOptions")
-            #elseif ($javaType == "String")
-                #set ($dictMethod = "getStrDictOptions")
-            #elseif ($javaType == "Boolean")
-                #set ($dictMethod = "getBoolDictOptions")
-            #end
-        #if ($column.htmlType == "input" && !$column.primaryKey) ## 忽略主键，不用在表单里
+        #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+            #set ($dictMethod = "getIntDictOptions")
+        #elseif ($javaType == "String")
+            #set ($dictMethod = "getStrDictOptions")
+        #elseif ($javaType == "Boolean")
+            #set ($dictMethod = "getBoolDictOptions")
+        #end
+        #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
       <el-form-item label="${comment}" prop="${javaField}">
-        <el-input v-model="form.${javaField}" placeholder="请输入${comment}" />
+        <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
       </el-form-item>
         #elseif($column.htmlType == "imageUpload")## 图片上传 TODO 芋艿：待测试
             #set ($hasImageUploadColumn = true)
           <el-form-item label="${comment}">
-            <imageUpload v-model="form.${javaField}"/>
+            <imageUpload v-model="formData.${javaField}"/>
           </el-form-item>
         #elseif($column.htmlType == "fileUpload")## 文件上传 TODO 芋艿：待测试
             #set ($hasFileUploadColumn = true)
           <el-form-item label="${comment}">
-            <fileUpload v-model="form.${javaField}"/>
+            <fileUpload v-model="formData.${javaField}"/>
           </el-form-item>
         #elseif($column.htmlType == "editor")## 文本编辑器 TODO 芋艿：待测试
-            #set ($hasEditorColumn = true)
-          <el-form-item label="${comment}">
-            <editor v-model="form.${javaField}" :min-height="192"/>
-          </el-form-item>
+      <el-form-item label="${comment}">
+        <Editor :model-value="formData.${javaField}" height="150px" />
+      </el-form-item>
         #elseif($column.htmlType == "select")## 下拉框
-          <el-form-item label="${comment}" prop="${javaField}">
-            <el-select v-model="form.${javaField}" placeholder="请选择${comment}">
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-select v-model="formData.${javaField}" placeholder="请选择${comment}">
                 #if ("" != $dictType)## 有数据字典
-                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
-                      #( $dictMethods.add($dictMethod) )
+                    #if (!$dictMethods.contains($dictMethod))## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #set($ignore = $dictMethods.add($dictMethod) )
                     #end
-              <el-option
-                v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-option
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
                 #else##没数据字典
-              <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value="" />
                 #end
-            </el-select>
-          </el-form-item>
+        </el-select>
+      </el-form-item>
         #elseif($column.htmlType == "checkbox")## 多选框 TODO 芋艿：待测试
-          <el-form-item label="${comment}" prop="${javaField}">
-            <el-checkbox-group v-model="form.${javaField}">
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-checkbox-group v-model="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
-                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
-                      #( $dictMethods.add($dictMethod) )
+                    #if (!$dictMethods.contains($dictMethod))## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #set($ignore = $dictMethods.add($dictMethod) )
                     #end
               <el-checkbox
                 v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
@@ -72,35 +73,36 @@
                 {{dict.label}}
               </el-checkbox>
                 #else##没数据字典
-                  <el-checkbox>请选择字典生成</el-checkbox>
+          <el-checkbox>请选择字典生成</el-checkbox>
                 #end
-            </el-checkbox-group>
-          </el-form-item>
+        </el-checkbox-group>
+      </el-form-item>
         #elseif($column.htmlType == "radio")## 单选框
-          <el-form-item label="${comment}" prop="${javaField}">
-            <el-radio-group v-model="form.${javaField}">
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-radio-group v-model="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
-                    #if (!$dictMethods.contains($dictMethod)) ## 如果不存在，则添加到 dictMethods 数组中，后续好 import
-                      #( $dictMethods.add($dictMethod) )
+                    #if (!$dictMethods.contains($dictMethod))## 如果不存在，则添加到 dictMethods 数组中，后续好 import
+                      #set($ignore = $dictMethods.add($dictMethod) )
                     #end
-                  <el-radio
-                    v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                    :key="dict.value"
-                    :label="dict.value">
-                    {{dict.label}}
-                  </el-radio>
+          <el-radio
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
                 #else##没数据字典
-                  <el-radio label="1">请选择字典生成</el-radio>
+          <el-radio label="1">请选择字典生成</el-radio>
                 #end
-            </el-radio-group>
-          </el-form-item>
+        </el-radio-group>
+      </el-form-item>
         #elseif($column.htmlType == "datetime")## 时间框 TODO 芋艿：待测试
           <el-form-item label="${comment}" prop="${javaField}">
-            <el-date-picker clearable v-model="form.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
+            <el-date-picker clearable v-model="formData.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
           </el-form-item>
         #elseif($column.htmlType == "textarea")## 文本框 TODO 芋艿：待测试
           <el-form-item label="${comment}" prop="${javaField}">
-            <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
           </el-form-item>
         #end
     #end
@@ -114,3 +116,115 @@
     </template>
   </Dialog>
 </template>
+<script setup lang="ts">
+#if ($dictMethods.size() > 0)
+import { DICT_TYPE#foreach ($dictMethod in $dictMethods), ${dictMethod}#end } from '@/utils/dict'
+#end
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const modelVisible = ref(false) // 弹窗的是否展示
+const modelTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+#set ($listOperationLastIndex = -1)## 求最后一个需要 , 的地方
+#foreach ($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+        #set ($listOperationLastIndex = $foreach.index)
+    #end
+#end
+#foreach ($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+  $column.javaField: []#if($foreach.index < $listOperationLastIndex),#end
+        #else
+  $column.javaField: undefined#if($foreach.index < $listOperationLastIndex),#end
+        #end
+    #end
+#end
+})
+const formRules = reactive({
+#set ($listOperationLastIndex = -1)## 求最后一个需要 , 的地方
+#foreach ($column in $columns)
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+        #set ($listOperationLastIndex = $foreach.index)
+    #end
+#end
+#foreach ($column in $columns)
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+        #set($comment=$column.columnComment)
+  $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }]#if($foreach.index < $listOperationLastIndex),#end
+    #end
+#end
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const openModal = async (type: string, id?: number) => {
+  modelVisible.value = true
+  modelTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ${simpleClassName}Api.get${simpleClassName}(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ${simpleClassName}Api.${simpleClassName}VO
+    if (formType.value === 'create') {
+      await ${simpleClassName}Api.create${simpleClassName}(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ${simpleClassName}Api.update${simpleClassName}(data)
+      message.success(t('common.updateSuccess'))
+    }
+    modelVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+#set ($listOperationLastIndex = -1)## 求最后一个需要 , 的地方
+#foreach ($column in $columns)
+  #if ($column.createOperation || $column.updateOperation)
+      #set ($listOperationLastIndex = $foreach.index)
+  #end
+#end
+#foreach ($column in $columns)
+  #if ($column.createOperation || $column.updateOperation)
+      #if ($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.index < $listOperationLastIndex),#end
+      #else
+    $column.javaField: undefined#if($foreach.index < $listOperationLastIndex),#end
+      #end
+  #end
+#end
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 5622d7895..9a57c83f9 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -92,7 +92,7 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        #if ($permissionPrefix <= 14)
+        #if ($permissionPrefix.length() < 15)
         <el-button type="primary" @click="openModal('create')" v-hasPermi="['${permissionPrefix}:create']">
         #else
         <el-button

From e8d2dc513b2060db0500d4110869a4f08f3cb3cb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 22 Mar 2023 20:50:09 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20Vue3=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/codegen/inner/CodegenEngine.java  | 13 +++--
 .../resources/codegen/vue3/views/form.vue.vm  | 58 ++++++++++---------
 .../resources/codegen/vue3/views/index.vue.vm | 21 ++++---
 3 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 94eab36b1..b41821b80 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -97,20 +97,21 @@ public class CodegenEngine {
      * value：生成的路径
      */
     private static final Table<Integer, String, String> FRONT_TEMPLATES = ImmutableTable.<Integer, String, String>builder()
-            // Vue2
+            // Vue2 标准模版
             .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/index.vue"),
                     vueFilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
             .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("api/api.js"),
                     vueFilePath("api/${table.moduleName}/${classNameVar}.js"))
-            // Vue3
+            // Vue3 标准模版
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
                     vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/form.vue"),
-                    vue3FilePath("views/${table.moduleName}/${classNameVar}/form.vue"))
-//            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
-//                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
+                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${simpleClassName}Form.vue"))
             .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
                     vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
+            // Vue3 Schema 模版
+//            .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/data.ts"),
+//                    vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
             .build();
 
     @Resource
@@ -203,6 +204,8 @@ public class CodegenEngine {
                 getStr(bindingMap, "basePackage").replaceAll("\\.", "/"));
         filePath = StrUtil.replace(filePath, "${classNameVar}",
                 getStr(bindingMap, "classNameVar"));
+        filePath = StrUtil.replace(filePath, "${simpleClassName}",
+                getStr(bindingMap, "simpleClassName"));
         // sceneEnum 包含的字段
         CodegenSceneEnum sceneEnum = (CodegenSceneEnum) bindingMap.get("sceneEnum");
         filePath = StrUtil.replace(filePath, "${sceneEnum.prefixClass}", sceneEnum.getPrefixClass());
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 8209c92c3..690d7cf72 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -27,17 +27,17 @@
       <el-form-item label="${comment}" prop="${javaField}">
         <el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
       </el-form-item>
-        #elseif($column.htmlType == "imageUpload")## 图片上传 TODO 芋艿：待测试
+        #elseif($column.htmlType == "imageUpload")## 图片上传
             #set ($hasImageUploadColumn = true)
-          <el-form-item label="${comment}">
-            <imageUpload v-model="formData.${javaField}"/>
-          </el-form-item>
-        #elseif($column.htmlType == "fileUpload")## 文件上传 TODO 芋艿：待测试
+      <el-form-item label="${comment}">
+        <UploadImg v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "fileUpload")## 文件上传
             #set ($hasFileUploadColumn = true)
-          <el-form-item label="${comment}">
-            <fileUpload v-model="formData.${javaField}"/>
-          </el-form-item>
-        #elseif($column.htmlType == "editor")## 文本编辑器 TODO 芋艿：待测试
+      <el-form-item label="${comment}">
+        <UploadFile v-model="formData.${javaField}" />
+      </el-form-item>
+        #elseif($column.htmlType == "editor")## 文本编辑器
       <el-form-item label="${comment}">
         <Editor :model-value="formData.${javaField}" height="150px" />
       </el-form-item>
@@ -59,19 +59,20 @@
                 #end
         </el-select>
       </el-form-item>
-        #elseif($column.htmlType == "checkbox")## 多选框 TODO 芋艿：待测试
+        #elseif($column.htmlType == "checkbox")## 多选框
       <el-form-item label="${comment}" prop="${javaField}">
         <el-checkbox-group v-model="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
                     #if (!$dictMethods.contains($dictMethod))## 如果不存在，则添加到 dictMethods 数组中，后续好 import
                       #set($ignore = $dictMethods.add($dictMethod) )
                     #end
-              <el-checkbox
-                v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
-                key="dict.value"
-                :label="dict.value">
-                {{dict.label}}
-              </el-checkbox>
+          <el-checkbox
+            v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-checkbox>
                 #else##没数据字典
           <el-checkbox>请选择字典生成</el-checkbox>
                 #end
@@ -96,14 +97,19 @@
                 #end
         </el-radio-group>
       </el-form-item>
-        #elseif($column.htmlType == "datetime")## 时间框 TODO 芋艿：待测试
-          <el-form-item label="${comment}" prop="${javaField}">
-            <el-date-picker clearable v-model="formData.${javaField}" type="date" value-format="timestamp" placeholder="选择${comment}" />
-          </el-form-item>
-        #elseif($column.htmlType == "textarea")## 文本框 TODO 芋艿：待测试
-          <el-form-item label="${comment}" prop="${javaField}">
-            <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
-          </el-form-item>
+        #elseif($column.htmlType == "datetime")## 时间框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-date-picker
+          v-model="formData.${javaField}"
+          type="date"
+          value-format="timestamp"
+          placeholder="选择${comment}"
+        />
+      </el-form-item>
+        #elseif($column.htmlType == "textarea")## 文本框
+      <el-form-item label="${comment}" prop="${javaField}">
+        <el-input v-model="formData.${javaField}" type="textarea" placeholder="请输入${comment}" />
+      </el-form-item>
         #end
     #end
 #end
@@ -163,7 +169,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const openModal = async (type: string, id?: number) => {
+const open = async (type: string, id?: number) => {
   modelVisible.value = true
   modelTitle.value = t('action.' + type)
   formType.value = type
@@ -178,7 +184,7 @@ const openModal = async (type: string, id?: number) => {
     }
   }
 }
-defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 9a57c83f9..1d9158f71 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -92,12 +92,12 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        #if ($permissionPrefix.length() < 15)
-        <el-button type="primary" @click="openModal('create')" v-hasPermi="['${permissionPrefix}:create']">
+        #if ($permissionPrefix.length() <= 12)
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['${permissionPrefix}:create']">
         #else
         <el-button
           type="primary"
-          @click="openModal('create')"
+          @click="openForm('create')"
           v-hasPermi="['${permissionPrefix}:create']"
         >
         #end
@@ -148,7 +148,7 @@
           <el-button
             link
             type="primary"
-            @click="openModal('update', scope.row.id)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['${permissionPrefix}:update']"
           >
             编辑
@@ -172,6 +172,9 @@
       @pagination="getList"
     />
   </content-wrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <${simpleClassName}Form ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts" name="${simpleClassName}">
@@ -181,7 +184,7 @@ import { DICT_TYPE#foreach ($dictMethod in $dictMethods), ${dictMethod}#end } fr
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
-// import ConfigForm from './form.vue'
+import ${simpleClassName}Form from './${simpleClassName}Form.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -236,10 +239,10 @@ const resetQuery = () => {
 }
 
 /** 添加/修改操作 */
-// const modalRef = ref()
-// const openModal = (type: string, id?: number) => {
-//   modalRef.value.openModal(type, id)
-// }
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {

From 79eb90d65317c8a62a43cca32f09bcbd662a989c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 2 Apr 2023 18:58:01 +0800
Subject: [PATCH 17/20] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E7=89=88=202.=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20Vue2=20=E6=89=80=E5=9C=A8=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/codegen/vue3/views/form.vue.vm     | 6 ++----
 .../src/main/resources/codegen/vue3/views/index.vue.vm    | 8 ++++----
 .../system/sms/{smsChannel.vue => channel/index.vue}      | 0
 .../src/views/system/sms/{smsLog.vue => log/index.vue}    | 0
 .../system/sms/{smsTemplate.vue => template/index.vue}    | 0
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename yudao-ui-admin/src/views/system/sms/{smsChannel.vue => channel/index.vue} (100%)
 rename yudao-ui-admin/src/views/system/sms/{smsLog.vue => log/index.vue} (100%)
 rename yudao-ui-admin/src/views/system/sms/{smsTemplate.vue => template/index.vue} (100%)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 690d7cf72..770ed1e75 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -115,10 +115,8 @@
 #end
     </el-form>
     <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="modelVisible = false">取 消</el-button>
-      </div>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="modelVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 1d9158f71..1b9854e51 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -1,5 +1,5 @@
 <template>
-  <content-wrap>
+  <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
@@ -114,10 +114,10 @@
         </el-button>
       </el-form-item>
     </el-form>
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 列表 -->
-  <content-wrap>
+  <ContentWrap>
     <el-table v-loading="loading" :data="list">
     #foreach($column in $columns)
       #if ($column.listOperationResult)
@@ -171,7 +171,7 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-  </content-wrap>
+  </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
   <${simpleClassName}Form ref="formRef" @success="getList" />
diff --git a/yudao-ui-admin/src/views/system/sms/smsChannel.vue b/yudao-ui-admin/src/views/system/sms/channel/index.vue
similarity index 100%
rename from yudao-ui-admin/src/views/system/sms/smsChannel.vue
rename to yudao-ui-admin/src/views/system/sms/channel/index.vue
diff --git a/yudao-ui-admin/src/views/system/sms/smsLog.vue b/yudao-ui-admin/src/views/system/sms/log/index.vue
similarity index 100%
rename from yudao-ui-admin/src/views/system/sms/smsLog.vue
rename to yudao-ui-admin/src/views/system/sms/log/index.vue
diff --git a/yudao-ui-admin/src/views/system/sms/smsTemplate.vue b/yudao-ui-admin/src/views/system/sms/template/index.vue
similarity index 100%
rename from yudao-ui-admin/src/views/system/sms/smsTemplate.vue
rename to yudao-ui-admin/src/views/system/sms/template/index.vue

From 99f92310e2725c5357771c2573b99120fafc058b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 3 Apr 2023 00:35:29 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=20Vue3=20=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=EF=BC=8C=E4=BF=AE=E6=94=B9=20title=E3=80=81visible=20?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/codegen/vue3/views/form.vue.vm  | 14 +++++++-------
 .../main/resources/codegen/vue3/views/index.vue.vm |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 770ed1e75..99cce39f2 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="modelTitle" v-model="modelVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
       ref="formRef"
       :model="formData"
@@ -116,7 +116,7 @@
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="modelVisible = false">取 消</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
@@ -129,8 +129,8 @@ import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const modelVisible = ref(false) // 弹窗的是否展示
-const modelTitle = ref('') // 弹窗的标题
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -168,8 +168,8 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  modelVisible.value = true
-  modelTitle.value = t('action.' + type)
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   // 修改时，设置数据
@@ -202,7 +202,7 @@ const submitForm = async () => {
       await ${simpleClassName}Api.update${simpleClassName}(data)
       message.success(t('common.updateSuccess'))
     }
-    modelVisible.value = false
+    dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
   } finally {
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
index 1b9854e51..39463332c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm
@@ -97,6 +97,7 @@
         #else
         <el-button
           type="primary"
+          plain
           @click="openForm('create')"
           v-hasPermi="['${permissionPrefix}:create']"
         >
@@ -214,7 +215,7 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
-/** 查询参数列表 */
+/** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {

From 00a2818c013d9d799f0da4214eb51bc850a150de Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 7 Apr 2023 23:25:43 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20swagger=E3=80=81drui?=
 =?UTF-8?q?d=E3=80=81skywalking=E3=80=81admin=20=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/config/ConfigController.java        |   2 +-
 yudao-ui-admin/src/api/infra/redis.js         |  45 ------
 .../src/views/infra/druid/index.vue           |  17 ++-
 .../src/views/infra/redis/index.vue           | 129 +-----------------
 .../src/views/infra/server/index.vue          |  16 ++-
 .../src/views/infra/skywalking/index.vue      |  16 ++-
 .../src/views/infra/swagger/index.vue         |  18 ++-
 7 files changed, 62 insertions(+), 181 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
index afaee6fa4..f9a6a8e9e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
@@ -73,7 +73,7 @@ public class ConfigController {
     public CommonResult<String> getConfigKey(@RequestParam("key") String key) {
         ConfigDO config = configService.getConfigByKey(key);
         if (config == null) {
-            return null;
+            return success(null);
         }
         if (!config.getVisible()) {
             throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
diff --git a/yudao-ui-admin/src/api/infra/redis.js b/yudao-ui-admin/src/api/infra/redis.js
index dadc221bf..fce187475 100644
--- a/yudao-ui-admin/src/api/infra/redis.js
+++ b/yudao-ui-admin/src/api/infra/redis.js
@@ -7,48 +7,3 @@ export function getCache() {
     method: 'get'
   })
 }
-
-// 获取模块
-export function getKeyDefineList() {
-  return request({
-    url: '/infra/redis/get-key-define-list',
-    method: 'get'
-  })
-}
-
-// 获取键名列表
-export function getKeyList(keyTemplate) {
-  return request({
-    url: '/infra/redis/get-key-list',
-    method: 'get',
-    params: {
-      keyTemplate
-    }
-  })
-}
-
-// 获取缓存内容
-export function getKeyValue(key) {
-  return request({
-    url: '/infra/redis/get-key-value?key=' + key,
-    method: 'get'
-  })
-}
-
-// 根据键名删除缓存
-export function deleteKey(key) {
-  return request({
-    url: '/infra/redis/delete-key?key=' + key,
-    method: 'delete'
-  })
-}
-
-export function deleteKeys(keyTemplate) {
-  return request({
-    url: '/infra/redis/delete-keys?',
-    method: 'delete',
-    params: {
-      keyTemplate
-    }
-  })
-}
diff --git a/yudao-ui-admin/src/views/infra/druid/index.vue b/yudao-ui-admin/src/views/infra/druid/index.vue
index 78751251a..88a70a5ba 100644
--- a/yudao-ui-admin/src/views/infra/druid/index.vue
+++ b/yudao-ui-admin/src/views/infra/druid/index.vue
@@ -2,18 +2,31 @@
   <div>
     <doc-alert title="数据库 MyBatis" url="https://doc.iocoder.cn/mybatis/" />
     <doc-alert title="多数据源（读写分离）" url="https://doc.iocoder.cn/dynamic-datasource/" />
-    <i-frame :src="url" />
+
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/druid/index.html"
+      url: process.env.VUE_APP_BASE_API + "/druid/index.html",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.druid").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/redis/index.vue b/yudao-ui-admin/src/views/infra/redis/index.vue
index 63be640bc..38e1cf823 100644
--- a/yudao-ui-admin/src/views/infra/redis/index.vue
+++ b/yudao-ui-admin/src/views/infra/redis/index.vue
@@ -65,77 +65,11 @@
         </el-card>
       </el-col>
     </el-row>
-
-    <el-table v-loading="keyDefineListLoad" :data="keyDefineList" row-key="id" @row-click="openKeyTemplate">
-      <el-table-column prop="keyTemplate" label="Key 模板" width="200" />
-      <el-table-column prop="keyType" label="Key 类型" width="100" />
-      <el-table-column prop="valueType" label="Value 类型" />
-      <el-table-column prop="timeoutType" label="超时时间" width="200">
-        <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE"
-            :value="scope.row.timeoutType"
-          />
-          <span v-if="scope.row.timeout > 0"
-            >({{ scope.row.timeout / 1000 }} 秒)</span
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="memo" label="备注" />
-    </el-table>
-
-    <!-- 缓存模块信息框 -->
-    <el-dialog :title="keyTemplate + ' 模板'" :visible.sync="open" width="70vw" append-to-body>
-      <el-row :gutter="10">
-        <el-col :span="14" class="card-box">
-          <el-card style="height: 70vh; overflow: scroll">
-            <div slot="header">
-              <span>键名列表</span>
-              <el-button style="float: right; padding: 3px 0" type="text" icon="el-icon-refresh-right" @click="refreshKeys" />
-            </div>
-            <el-table :data="cacheKeys" style="width: 100%" @row-click="handleKeyValue">
-              <el-table-column label="缓存键名" align="center" :show-overflow-tooltip="true">
-                <template v-slot="scope">{{ scope.row }}</template>
-              </el-table-column>
-              <el-table-column label="操作" width="60" align="center" class-name="small-padding fixed-width">
-                <template v-slot="scope">
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteKey(scope.row)" />
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </el-col>
-
-        <el-col :span="10">
-          <el-card :bordered="false" style="height: 70vh">
-            <div slot="header">
-              <span>缓存内容</span>
-              <el-button style="float: right; padding: 3px 0" type="text" icon="el-icon-refresh-right"
-                         @click="handleDeleteKeys(keyTemplate)">清理全部</el-button>
-            </div>
-          <el-form :model="cacheForm">
-            <el-row :gutter="32">
-              <el-col :offset="1" :span="22">
-                <el-form-item label="缓存键名:" prop="key">
-                  <el-input v-model="cacheForm.key" :readOnly="true" />
-                </el-form-item>
-                </el-col>
-                <el-col :offset="1" :span="22">
-                  <el-form-item label="缓存内容:" prop="value">
-                    <el-input v-model="cacheForm.value" type="textarea" :rows="12" :readOnly="true"/>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import {getCache, getKeyDefineList, getKeyList, getKeyValue, deleteKey, deleteKeys} from "@/api/infra/redis";
+import { getCache } from "@/api/infra/redis";
 import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 export default {
@@ -147,15 +81,7 @@ export default {
       // 使用内存
       usedmemory: null,
       // cache 信息
-      cache: [],
-      // key 列表
-      keyDefineListLoad: true,
-      keyDefineList: [],
-      // 模块弹出框
-      open: false,
-      keyTemplate: "",
-      cacheKeys: [],
-      cacheForm: {}
+      cache: []
     };
   },
   created () {
@@ -220,61 +146,12 @@ export default {
           ],
         });
       });
-
-      // 查询 Redis Key 列表
-      getKeyDefineList().then(response => {
-        this.keyDefineList = response.data;
-        this.keyDefineListLoad = false;
-      });
     },
 
     // 打开加载层
     openLoading () {
       this.$modal.loading("正在加载缓存监控数据，请稍后！");
-    },
-
-    // 打开缓存弹窗
-    openKeyTemplate (keyDefine) {
-      this.open = true;
-      // 加载键名列表
-      this.keyTemplate = keyDefine.keyTemplate;
-      this.doGetKeyList(this.keyTemplate);
-    },
-
-    // 获取键名列表
-    doGetKeyList (keyTemplate) {
-      getKeyList(keyTemplate).then(response => {
-        this.cacheKeys = response.data
-        this.cacheForm = {}
-      })
-    },
-
-    // 获取缓存值
-    handleKeyValue (key) {
-      getKeyValue(key).then(response => {
-        this.cacheForm = response.data
-      })
-    },
-
-    // 刷新键名列表
-    refreshKeys() {
-      this.$modal.msgSuccess("刷新键名列表成功");
-      this.doGetKeyList(this.keyTemplate);
-    },
-
-    // 删除缓存
-    handleDeleteKey(key){
-      deleteKey(key).then(response => {
-        this.$modal.msgSuccess("清理缓存键名[" + key + "]成功");
-        this.doGetKeyList(this.keyTemplate);
-      })
-    },
-    handleDeleteKeys(keyTemplate){
-      deleteKeys(keyTemplate).then(response => {
-        this.$modal.msgSuccess("清空[" + keyTemplate + "]成功");
-        this.doGetKeyList(this.keyTemplate);
-      })
-    },
+    }
   },
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/server/index.vue b/yudao-ui-admin/src/views/infra/server/index.vue
index 7a5570cc2..409bd7325 100644
--- a/yudao-ui-admin/src/views/infra/server/index.vue
+++ b/yudao-ui-admin/src/views/infra/server/index.vue
@@ -1,18 +1,30 @@
 <template>
   <div>
     <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/admin/applications"
+      url: process.env.VUE_APP_BASE_API + "/admin/applications",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.spring-boot-admin").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/skywalking/index.vue b/yudao-ui-admin/src/views/infra/skywalking/index.vue
index 4628d619d..6f5e7dc7f 100644
--- a/yudao-ui-admin/src/views/infra/skywalking/index.vue
+++ b/yudao-ui-admin/src/views/infra/skywalking/index.vue
@@ -1,18 +1,30 @@
 <template>
   <div>
     <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      url: "http://skywalking.shop.iocoder.cn", // TODO 芋艿，后续改成配置读取
+      url: "http://skywalking.shop.iocoder.cn",
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.skywalking").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/infra/swagger/index.vue b/yudao-ui-admin/src/views/infra/swagger/index.vue
index 3cf0d8ab3..0558fa694 100644
--- a/yudao-ui-admin/src/views/infra/swagger/index.vue
+++ b/yudao-ui-admin/src/views/infra/swagger/index.vue
@@ -1,19 +1,31 @@
 <template>
   <div>
     <doc-alert title="接口文档" url="https://doc.iocoder.cn/api-doc/" />
-    <i-frame :src="url" />
+    <i-frame v-if="!loading" :src="url" />
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
+import { getConfigKey } from "@/api/infra/config";
 export default {
   name: "Druid",
   components: { iFrame },
   data() {
     return {
-      // url: process.env.VUE_APP_BASE_API + "/doc.html"
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui"
+      url: process.env.VUE_APP_BASE_API + "/doc.html", // Knife4j UI
+      // url: process.env.VUE_APP_BASE_API + "/swagger-ui", // Swagger UI
+      loading: true
     };
   },
+  created() {
+    getConfigKey("url.swagger").then(response => {
+      if (!response.data || response.data.length === 0) {
+        return
+      }
+      this.url = response.data;
+    }).finally(() => {
+      this.loading = false;
+    })
+  }
 };
 </script>

From f46c0e24feeaf32bff33fb89417e043cdbd499a4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 8 Apr 2023 11:49:28 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=20name=20=E9=83=BD=E5=8A=A0=E4=B8=8A=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=89=8D=E7=BC=80=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/router/index.js            | 28 +++++++++----------
 .../src/views/bpm/definition/index.vue        |  2 +-
 yudao-ui-admin/src/views/bpm/form/index.vue   |  6 ++--
 yudao-ui-admin/src/views/bpm/group/index.vue  |  2 +-
 yudao-ui-admin/src/views/bpm/model/index.vue  |  6 ++--
 .../src/views/bpm/model/modelEditor.vue       |  2 +-
 .../src/views/bpm/oa/leave/create.vue         |  2 +-
 .../src/views/bpm/oa/leave/detail.vue         |  2 +-
 .../src/views/bpm/oa/leave/index.vue          |  8 +++---
 .../src/views/bpm/processInstance/index.vue   |  6 ++--
 yudao-ui-admin/src/views/bpm/task/done.vue    |  4 +--
 yudao-ui-admin/src/views/bpm/task/todo.vue    |  4 +--
 .../taskAssignRule/taskAssignRuleDialog.vue   |  2 +-
 .../src/views/infra/apiAccessLog/index.vue    |  2 +-
 .../src/views/infra/apiErrorLog/index.vue     |  2 +-
 .../src/views/infra/build/index.vue           |  1 +
 .../src/views/infra/codegen/index.vue         |  2 +-
 .../src/views/infra/config/index.vue          |  2 +-
 .../views/infra/dataSourceConfig/index.vue    |  2 +-
 .../src/views/infra/dbDoc/index.vue           |  2 +-
 yudao-ui-admin/src/views/infra/file/index.vue |  2 +-
 .../src/views/infra/fileConfig/index.vue      |  2 +-
 yudao-ui-admin/src/views/infra/job/index.vue  |  2 +-
 yudao-ui-admin/src/views/infra/job/log.vue    |  2 +-
 .../src/views/infra/redis/index.vue           |  2 +-
 .../src/views/infra/server/index.vue          |  2 +-
 .../src/views/infra/skywalking/index.vue      |  2 +-
 .../src/views/infra/swagger/index.vue         |  2 +-
 .../src/views/mall/product/property/index.vue |  2 +-
 .../src/views/mall/product/property/value.vue |  2 +-
 .../src/views/mall/product/spu/index.vue      |  6 ++--
 .../src/views/mall/product/spu/save.vue       |  2 +-
 .../src/views/mall/promotion/coupon/index.vue |  2 +-
 .../mall/promotion/couponTemplate/index.vue   |  2 +-
 .../mall/promotion/discountActivity/index.vue |  2 +-
 .../mall/promotion/rewardActivity/index.vue   |  2 +-
 .../seckill/seckillActivity/index.vue         |  2 +-
 .../promotion/seckill/seckillTime/index.vue   |  2 +-
 .../src/views/mall/trade/afterSale/index.vue  |  2 +-
 .../src/views/mall/trade/order/detail.vue     |  2 +-
 .../src/views/mall/trade/order/index.vue      |  4 +--
 yudao-ui-admin/src/views/pay/app/index.vue    |  2 +-
 .../src/views/pay/merchant/index.vue          |  2 +-
 yudao-ui-admin/src/views/pay/refund/index.vue |  2 +-
 .../src/views/system/area/index.vue           |  2 +-
 .../src/views/system/dept/index.vue           |  2 +-
 yudao-ui-admin/src/views/system/dict/data.vue |  2 +-
 .../src/views/system/dict/index.vue           |  2 +-
 .../src/views/system/errorCode/index.vue      |  2 +-
 .../src/views/system/loginlog/index.vue       |  2 +-
 .../src/views/system/mail/account/index.vue   |  2 +-
 .../src/views/system/mail/log/index.vue       |  2 +-
 .../src/views/system/mail/template/index.vue  |  2 +-
 .../src/views/system/menu/index.vue           |  2 +-
 .../src/views/system/notice/index.vue         |  2 +-
 .../src/views/system/notify/message/index.vue |  2 +-
 .../src/views/system/notify/my/index.vue      |  2 +-
 .../views/system/notify/template/index.vue    |  2 +-
 .../src/views/system/oauth2/client/index.vue  |  2 +-
 .../src/views/system/oauth2/token/index.vue   |  2 +-
 .../src/views/system/operatelog/index.vue     |  2 +-
 .../src/views/system/post/index.vue           |  2 +-
 .../src/views/system/role/index.vue           |  2 +-
 .../src/views/system/sensitiveWord/index.vue  |  2 +-
 .../src/views/system/sms/channel/index.vue    |  2 +-
 .../src/views/system/sms/log/index.vue        |  2 +-
 .../src/views/system/sms/template/index.vue   |  2 +-
 .../src/views/system/tenant/index.vue         |  2 +-
 .../src/views/system/tenantPackage/index.vue  |  2 +-
 .../src/views/system/user/index.vue           |  2 +-
 70 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js
index d38e6c42d..1d64f59bc 100644
--- a/yudao-ui-admin/src/router/index.js
+++ b/yudao-ui-admin/src/router/index.js
@@ -100,7 +100,7 @@ export const constantRoutes = [
     children: [{
         path: 'type/data/:dictId(\\d+)',
         component: (resolve) => require(['@/views/system/dict/data'], resolve),
-        name: 'Data',
+        name: 'SystemDictData',
         meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'}
       }
     ]
@@ -112,7 +112,7 @@ export const constantRoutes = [
     children: [{
         path: 'log',
         component: (resolve) => require(['@/views/infra/job/log'], resolve),
-        name: 'JobLog',
+        name: 'InfraJobLog',
         meta: {title: '调度日志', activeMenu: '/infra/job'}
       }
     ]
@@ -123,7 +123,7 @@ export const constantRoutes = [
     children: [{
         path: 'edit/:tableId(\\d+)',
         component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
-        name: 'GenEdit',
+        name: 'InfraCodegenEditTable',
         meta: {title: '修改生成配置', activeMenu: '/infra/codegen'}
       }
     ]
@@ -136,12 +136,12 @@ export const constantRoutes = [
     children: [{
         path: 'oa/leave/create',
         component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve),
-        name: '发起 OA 请假',
+        name: 'BpmOALeaveCreate',
         meta: {title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave'}
       }, {
         path: 'oa/leave/detail',
         component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve),
-        name: '查看 OA 请假',
+        name: 'BpmOALeaveDetail',
         meta: {title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave'}
       }
     ]
@@ -153,27 +153,27 @@ export const constantRoutes = [
     children: [{
         path: 'manager/form/edit',
         component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve),
-        name: '流程表单-编辑',
+        name: 'BpmFormEditor',
         meta: {title: '流程表单-编辑', activeMenu: '/bpm/manager/form'}
       }, {
         path: 'manager/definition',
         component: (resolve) => require(['@/views/bpm/definition/index'], resolve),
-        name: '流程定义',
+        name: 'BpmProcessDefinition',
         meta: {title: '流程定义', activeMenu: '/bpm/manager/model'}
       }, {
         path: 'manager/model/design',
         component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve),
-        name: '设计流程',
+        name: 'BpmModelEditor',
         meta: {title: '设计流程', activeMenu: '/bpm/manager/model'}
       }, {
         path: 'process-instance/create',
         component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve),
-        name: '发起流程',
+        name: 'BpmProcessInstanceCreate',
         meta: {title: '发起流程', activeMenu: '/bpm/task/my'}
       }, {
         path: 'process-instance/detail',
         component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
-        name: '流程详情',
+        name: 'BpmProcessInstanceDetail',
         meta: {title: '流程详情', activeMenu: '/bpm/task/my'}
       }
     ]
@@ -185,7 +185,7 @@ export const constantRoutes = [
     children: [{
       path: 'value/:propertyId(\\d+)',
       component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
-      name: 'PropertyValue',
+      name: 'ProductPropertyValue',
       meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'}
     }
     ]
@@ -197,13 +197,13 @@ export const constantRoutes = [
     children: [{
       path: 'edit/:spuId(\\d+)',
       component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-      name: 'SpuEdit',
+      name: 'ProductSpuUpdate',
       meta: {title: '修改商品', activeMenu: '/product/spu'}
     },
       {
         path: 'add',
         component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-        name: 'SpuAdd',
+        name: 'ProductSpuCreate',
         meta: {title: '添加商品', activeMenu: '/product/spu'}
       }
     ]
@@ -215,7 +215,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'detail',
-        name: '订单详情',
+        name: 'TradeOrderDetail',
         hidden: true,
         meta: { title: '订单详情' },
         component: (resolve) => require(['@/views/mall/trade/order/detail'], resolve)
diff --git a/yudao-ui-admin/src/views/bpm/definition/index.vue b/yudao-ui-admin/src/views/bpm/definition/index.vue
index 0ef67b2a3..dc992545f 100644
--- a/yudao-ui-admin/src/views/bpm/definition/index.vue
+++ b/yudao-ui-admin/src/views/bpm/definition/index.vue
@@ -81,7 +81,7 @@ import Parser from '@/components/parser/Parser'
 import taskAssignRuleDialog from "../taskAssignRule/taskAssignRuleDialog";
 
 export default {
-  name: "processDefinition",
+  name: "BpmProcessDefinition",
   components: {
     Parser,
     taskAssignRuleDialog
diff --git a/yudao-ui-admin/src/views/bpm/form/index.vue b/yudao-ui-admin/src/views/bpm/form/index.vue
index db730abde..f9bcb7264 100644
--- a/yudao-ui-admin/src/views/bpm/form/index.vue
+++ b/yudao-ui-admin/src/views/bpm/form/index.vue
@@ -67,7 +67,7 @@ import Parser from '@/components/parser/Parser'
 import {decodeFields} from "@/utils/formGenerator";
 
 export default {
-  name: "Form",
+  name: "BpmForm",
   components: {
     Parser
   },
@@ -134,13 +134,13 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.$router.push({
-        path:"/bpm/manager/form/edit"
+        name: "BpmFormEditor"
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.$router.push({
-        path:"/bpm/manager/form/edit",
+        name: "BpmFormEditor",
         query:{
           formId: row.id
         }
diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue
index ffb3f2046..6c23a947f 100644
--- a/yudao-ui-admin/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin/src/views/bpm/group/index.vue
@@ -102,7 +102,7 @@ import {CommonStatusEnum} from "@/utils/constants";
 import {listSimpleUsers} from "@/api/system/user";
 
 export default {
-  name: "UserGroup",
+  name: "BpmUserGroup",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue
index fbb580fe3..e80b96429 100644
--- a/yudao-ui-admin/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin/src/views/bpm/model/index.vue
@@ -233,7 +233,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "model",
+  name: "BpmModel",
   components: {
     Parser,
     Treeselect,
@@ -380,7 +380,7 @@ export default {
     /** 设计按钮操作 */
     handleDesign(row) {
       this.$router.push({
-        path:"/bpm/manager/model/design",
+        name: "BpmModelEditor",
         query:{
           modelId: row.id
         }
@@ -473,7 +473,7 @@ export default {
     /** 跳转流程定义的列表 */
     handleDefinitionList(row) {
       this.$router.push({
-        path:"/bpm/manager/definition",
+        name: "BpmProcessDefinition",
         query:{
           key: row.key
         }
diff --git a/yudao-ui-admin/src/views/bpm/model/modelEditor.vue b/yudao-ui-admin/src/views/bpm/model/modelEditor.vue
index 91be300a7..78e78d317 100644
--- a/yudao-ui-admin/src/views/bpm/model/modelEditor.vue
+++ b/yudao-ui-admin/src/views/bpm/model/modelEditor.vue
@@ -26,7 +26,7 @@ import {createModel, getModel, updateModel} from "@/api/bpm/model";
 // import MyProcessPanel from "../package/process-panel/ProcessPanel";
 
 export default {
-  name: "App",
+  name: "BpmModelEditor",
   components: { MyProcessPalette },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/create.vue b/yudao-ui-admin/src/views/bpm/oa/leave/create.vue
index 14b6ed566..3ac54173c 100644
--- a/yudao-ui-admin/src/views/bpm/oa/leave/create.vue
+++ b/yudao-ui-admin/src/views/bpm/oa/leave/create.vue
@@ -30,7 +30,7 @@ import { createLeave}  from "@/api/bpm/leave"
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "LeaveCreate",
+  name: "BpmOALeaveCreate",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue b/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
index 1e1e464fa..0436b02fc 100644
--- a/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
+++ b/yudao-ui-admin/src/views/bpm/oa/leave/detail.vue
@@ -16,7 +16,7 @@
 import { getLeave}  from "@/api/bpm/leave"
 import {getDictDatas, DICT_TYPE} from '@/utils/dict'
 export default {
-  name: "LeaveDetail",
+  name: "BpmOALeaveDetail",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
index 8a2f01eef..49d5d21f0 100644
--- a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
+++ b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue
@@ -89,7 +89,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {cancelProcessInstance} from "@/api/bpm/processInstance";
 
 export default {
-  name: "Leave",
+  name: "BpmOALeave",
   components: {
   },
   data() {
@@ -142,15 +142,15 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({ path: "/bpm/oa/leave/create"});
+      this.$router.push({ name: "BpmOALeaveCreate"});
     },
     /** 详情按钮操作 */
     handleDetail(row) {
-      this.$router.push({ path: "/bpm/oa/leave/detail", query: { id: row.id}});
+      this.$router.push({ name: "BpmOALeaveDetail", query: { id: row.id}});
     },
     /** 查看审批进度的操作 */
     handleProcessDetail(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstanceId}});
+      this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.processInstanceId}});
     },
     /** 取消请假 */
     handleCancel(row) {
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
index b15751325..4e681ac24 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
@@ -103,7 +103,7 @@
 import { getMyProcessInstancePage, cancelProcessInstance } from "@/api/bpm/processInstance";
 
 export default {
-  name: "ProcessInstance",
+  name: "BpmProcessInstance",
   components: {
   },
   data() {
@@ -155,7 +155,7 @@ export default {
     },
     /** 新增按钮操作 **/
     handleAdd() {
-      this.$router.push({ path: "/bpm/process-instance/create"})
+      this.$router.push({ name: "BpmProcessInstanceCreate"})
     },
     /** 取消按钮操作 */
     handleCancel(row) {
@@ -175,7 +175,7 @@ export default {
     },
     /** 处理详情按钮 */
     handleDetail(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.id}});
+      this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.id}});
     },
   }
 };
diff --git a/yudao-ui-admin/src/views/bpm/task/done.vue b/yudao-ui-admin/src/views/bpm/task/done.vue
index c6d8e4cc3..9d522bec5 100644
--- a/yudao-ui-admin/src/views/bpm/task/done.vue
+++ b/yudao-ui-admin/src/views/bpm/task/done.vue
@@ -63,7 +63,7 @@ import {getDoneTaskPage} from '@/api/bpm/task'
 import {getDate} from "@/utils/dateUtils";
 
 export default {
-  name: "Done",
+  name: "BpmDoneTask",
   components: {
   },
   data() {
@@ -113,7 +113,7 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}});
+      this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.processInstance.id}});
     },
   }
 };
diff --git a/yudao-ui-admin/src/views/bpm/task/todo.vue b/yudao-ui-admin/src/views/bpm/task/todo.vue
index 79b922d95..a14dc5644 100644
--- a/yudao-ui-admin/src/views/bpm/task/todo.vue
+++ b/yudao-ui-admin/src/views/bpm/task/todo.vue
@@ -52,7 +52,7 @@
 import {getTodoTaskPage} from '@/api/bpm/task'
 
 export default {
-  name: "Todo",
+  name: "BpmTodoTask",
   components: {
   },
   data() {
@@ -100,7 +100,7 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}});
+      this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.processInstance.id}});
     },
   }
 };
diff --git a/yudao-ui-admin/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue b/yudao-ui-admin/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
index dd337475d..ec503b40e 100644
--- a/yudao-ui-admin/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
+++ b/yudao-ui-admin/src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
@@ -91,7 +91,7 @@ import {listSimpleUsers} from "@/api/system/user";
 import {listSimpleUserGroups} from "@/api/bpm/userGroup";
 
 export default {
-  name: "taskAssignRuleDialog",
+  name: "BpmTaskAssignRule",
   components: {
     Treeselect
   },
diff --git a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
index ce5d1e471..345adf631 100644
--- a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
@@ -116,7 +116,7 @@
 import { getApiAccessLogPage, exportApiAccessLogExcel } from "@/api/infra/apiAccessLog";
 
 export default {
-  name: "ApiAccessLog",
+  name: "InfraApiAccessLog",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
index cea4893e0..f076bc723 100644
--- a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
@@ -123,7 +123,7 @@ import { updateApiErrorLogProcess, getApiErrorLogPage, exportApiErrorLogExcel }
 import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
 
 export default {
-  name: "ApiErrorLog",
+  name: "InfraApiErrorLog",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/infra/build/index.vue b/yudao-ui-admin/src/views/infra/build/index.vue
index a77daae98..83f682400 100644
--- a/yudao-ui-admin/src/views/infra/build/index.vue
+++ b/yudao-ui-admin/src/views/infra/build/index.vue
@@ -158,6 +158,7 @@ const formConfInDB = getFormConf()
 const idGlobal = getIdGlobal()
 
 export default {
+  name: "InfraBuild",
   components: {
     draggable,
     render,
diff --git a/yudao-ui-admin/src/views/infra/codegen/index.vue b/yudao-ui-admin/src/views/infra/codegen/index.vue
index a5405b7c5..252f1197f 100644
--- a/yudao-ui-admin/src/views/infra/codegen/index.vue
+++ b/yudao-ui-admin/src/views/infra/codegen/index.vue
@@ -100,7 +100,7 @@ hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascri
 hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
 hljs.registerLanguage("typescript", require("highlight.js/lib/languages/typescript"));
 export default {
-  name: "Codegen",
+  name: "InfraCodegen",
   components: { importTable },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/infra/config/index.vue b/yudao-ui-admin/src/views/infra/config/index.vue
index 802abeb08..6ec5ac0b2 100644
--- a/yudao-ui-admin/src/views/infra/config/index.vue
+++ b/yudao-ui-admin/src/views/infra/config/index.vue
@@ -110,7 +110,7 @@
 import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig } from "@/api/infra/config";
 
 export default {
-  name: "Config",
+  name: "InfraConfig",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue b/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
index 6a8e3da1c..576259cec 100755
--- a/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
+++ b/yudao-ui-admin/src/views/infra/dataSourceConfig/index.vue
@@ -57,7 +57,7 @@
 import { createDataSourceConfig, updateDataSourceConfig, deleteDataSourceConfig, getDataSourceConfig, getDataSourceConfigList } from "@/api/infra/dataSourceConfig";
 
 export default {
-  name: "DataSourceConfig",
+  name: "InfraDataSourceConfig",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/infra/dbDoc/index.vue b/yudao-ui-admin/src/views/infra/dbDoc/index.vue
index 3df8f36b7..a7b40f8ca 100644
--- a/yudao-ui-admin/src/views/infra/dbDoc/index.vue
+++ b/yudao-ui-admin/src/views/infra/dbDoc/index.vue
@@ -21,7 +21,7 @@ import { exportHtml, exportWord, exportMarkdown} from "@/api/infra/dbDoc";
 import iFrame from "@/components/iFrame/index";
 
 export default {
-  name: "DBDoc",
+  name: "InfraDBDoc",
   components: { iFrame },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/infra/file/index.vue b/yudao-ui-admin/src/views/infra/file/index.vue
index bd569a377..b4ebf35f9 100644
--- a/yudao-ui-admin/src/views/infra/file/index.vue
+++ b/yudao-ui-admin/src/views/infra/file/index.vue
@@ -92,7 +92,7 @@ import {getAccessToken} from "@/utils/auth";
 import ImagePreview from "@/components/ImagePreview";
 
 export default {
-  name: "File",
+  name: "InfraFile",
   components: {
     ImagePreview
   },
diff --git a/yudao-ui-admin/src/views/infra/fileConfig/index.vue b/yudao-ui-admin/src/views/infra/fileConfig/index.vue
index 1ee8c5f5d..01e671fab 100755
--- a/yudao-ui-admin/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin/src/views/infra/fileConfig/index.vue
@@ -145,7 +145,7 @@ import {
 } from "@/api/infra/fileConfig";
 
 export default {
-  name: "FileConfig",
+  name: "InfraFileConfig",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/infra/job/index.vue b/yudao-ui-admin/src/views/infra/job/index.vue
index 2bd387cc0..052e3417f 100644
--- a/yudao-ui-admin/src/views/infra/job/index.vue
+++ b/yudao-ui-admin/src/views/infra/job/index.vue
@@ -155,7 +155,7 @@ import Crontab from '@/components/Crontab'
 
 export default {
   components: { Crontab },
-  name: "Job",
+  name: "InfraJob",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/infra/job/log.vue b/yudao-ui-admin/src/views/infra/job/log.vue
index 8febf83db..ab47bb070 100644
--- a/yudao-ui-admin/src/views/infra/job/log.vue
+++ b/yudao-ui-admin/src/views/infra/job/log.vue
@@ -96,7 +96,7 @@
 import { getJobLogPage, exportJobLogExcel } from "@/api/infra/jobLog";
 
 export default {
-  name: "JobLog",
+  name: "InfraJobLog",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/infra/redis/index.vue b/yudao-ui-admin/src/views/infra/redis/index.vue
index 38e1cf823..0f08aef83 100644
--- a/yudao-ui-admin/src/views/infra/redis/index.vue
+++ b/yudao-ui-admin/src/views/infra/redis/index.vue
@@ -73,7 +73,7 @@ import { getCache } from "@/api/infra/redis";
 import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 export default {
-  name: "Server",
+  name: "InfraRedis",
   data () {
     return {
       // 统计命令信息
diff --git a/yudao-ui-admin/src/views/infra/server/index.vue b/yudao-ui-admin/src/views/infra/server/index.vue
index 409bd7325..575597d84 100644
--- a/yudao-ui-admin/src/views/infra/server/index.vue
+++ b/yudao-ui-admin/src/views/infra/server/index.vue
@@ -8,7 +8,7 @@
 import iFrame from "@/components/iFrame/index";
 import { getConfigKey } from "@/api/infra/config";
 export default {
-  name: "Druid",
+  name: "InfraAdminServer",
   components: { iFrame },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/infra/skywalking/index.vue b/yudao-ui-admin/src/views/infra/skywalking/index.vue
index 6f5e7dc7f..2b3f2a196 100644
--- a/yudao-ui-admin/src/views/infra/skywalking/index.vue
+++ b/yudao-ui-admin/src/views/infra/skywalking/index.vue
@@ -8,7 +8,7 @@
 import iFrame from "@/components/iFrame/index";
 import { getConfigKey } from "@/api/infra/config";
 export default {
-  name: "Druid",
+  name: "InfraSkyWalking",
   components: { iFrame },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/infra/swagger/index.vue b/yudao-ui-admin/src/views/infra/swagger/index.vue
index 0558fa694..249269c8b 100644
--- a/yudao-ui-admin/src/views/infra/swagger/index.vue
+++ b/yudao-ui-admin/src/views/infra/swagger/index.vue
@@ -8,7 +8,7 @@
 import iFrame from "@/components/iFrame/index";
 import { getConfigKey } from "@/api/infra/config";
 export default {
-  name: "Druid",
+  name: "InfraSwagger",
   components: { iFrame },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue
index a4044cfe1..5b105bfcf 100644
--- a/yudao-ui-admin/src/views/mall/product/property/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/index.vue
@@ -77,7 +77,7 @@
 import { createProperty, updateProperty, deleteProperty, getProperty, getPropertyPage } from "@/api/mall/product/property";
 
 export default {
-  name: "Property",
+  name: "ProductProperty",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/product/property/value.vue b/yudao-ui-admin/src/views/mall/product/property/value.vue
index 86fc54f00..cb61fe76b 100644
--- a/yudao-ui-admin/src/views/mall/product/property/value.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/value.vue
@@ -83,7 +83,7 @@ import {
 } from '@/api/mall/product/property'
 
 export default {
-  name: "PropertyValue",
+  name: "ProductPropertyValue",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index d77229203..806e4f205 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -227,7 +227,7 @@ import {getBrandList} from "@/api/mall/product/brand";
 import {ProductSpuStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "Spu",
+  name: "ProductSpu",
   data() {
     return {
       activeTabs: "all",
@@ -318,11 +318,11 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({ name: 'SpuAdd'})
+      this.$router.push({ name: 'ProductSpuCreate'})
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push({ name: 'SpuEdit', params: { spuId: row.id }})
+      this.$router.push({ name: 'ProductSpuUpdate', params: { spuId: row.id }})
     },
     /** 删除按钮操作 */
     handleDelete(row) {
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 1e2f48255..307f58f3b 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -187,7 +187,6 @@
 </template>
 
 <script>
-
 import {getBrandList} from "@/api/mall/product/brand";
 import {getProductCategoryList} from "@/api/mall/product/category";
 import {createSpu, getSpuDetail, updateSpu} from "@/api/mall/product/spu";
@@ -197,6 +196,7 @@ import ImageUpload from "@/components/ImageUpload";
 import VideoUpload from "@/components/VideoUpload";
 
 export default {
+  name: "ProductSave",
   components: {
     Editor,
     ImageUpload,
diff --git a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
index afc34b68d..45a132f7d 100755
--- a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
@@ -74,7 +74,7 @@ import { deleteCoupon, getCouponPage } from "@/api/mall/promotion/coupon";
 import { DICT_TYPE, getDictDatas} from "@/utils/dict";
 
 export default {
-  name: "Coupon",
+  name: "PromotionCoupon",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
index c1a12a319..db81ab3cc 100755
--- a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
@@ -179,7 +179,7 @@ import { parseTime } from "@/utils/ruoyi";
 import {changeRoleStatus} from "@/api/system/role";
 
 export default {
-  name: "CouponTemplate",
+  name: "PromotionCouponTemplate",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
index 4e71d1ec1..157f51dfb 100755
--- a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
@@ -156,7 +156,7 @@ import { getSkuOptionList } from "@/api/mall/product/sku";
 import { deepClone } from "@/utils";
 
 export default {
-  name: "DiscountActivity",
+  name: "PromotionDiscountActivity",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
index 65fc70432..19c043c34 100755
--- a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
@@ -129,7 +129,7 @@ import {
 import {getSpuSimpleList} from "@/api/mall/product/spu";
 
 export default {
-  name: "RewardActivity",
+  name: "PromotionRewardActivity",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
index 48b146441..5616fb983 100644
--- a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
@@ -192,7 +192,7 @@ import { getSeckillTimeList } from "@/api/mall/promotion/seckillTime";
 import { deepClone } from "@/utils";
 
 export default {
-    name: "SeckillActivity",
+    name: "PromotionSeckillActivity",
     components: {
     },
     data() {
diff --git a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
index 6393fedf7..898ead781 100644
--- a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
@@ -68,7 +68,7 @@ import router from "@/router";
 import { deepClone } from "@/utils";
 
 export default {
-  name: "SeckillTime",
+  name: "PromotionSeckillTime",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
index 21e24c0d4..271ecd269 100644
--- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -104,7 +104,7 @@ import { datePickerOptions } from "@/utils/constants";
 import { DICT_TYPE, getDictDatas } from "@/utils/dict";
 
 export default {
-  name: "AfterSale",
+  name: "TradeAfterSale",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/mall/trade/order/detail.vue b/yudao-ui-admin/src/views/mall/trade/order/detail.vue
index c2b74bb77..15bc705a9 100644
--- a/yudao-ui-admin/src/views/mall/trade/order/detail.vue
+++ b/yudao-ui-admin/src/views/mall/trade/order/detail.vue
@@ -165,7 +165,7 @@
 import { getOrderDetail } from "@/api/mall/trade/order";
 
 export default {
-  name: "detail",
+  name: "TradeOrderDetail",
   data () {
     return {
       detailGroups: [
diff --git a/yudao-ui-admin/src/views/mall/trade/order/index.vue b/yudao-ui-admin/src/views/mall/trade/order/index.vue
index 5c7aa987c..fb25056b6 100644
--- a/yudao-ui-admin/src/views/mall/trade/order/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/order/index.vue
@@ -143,7 +143,7 @@ import { datePickerOptions } from "@/utils/constants";
 import { DICT_TYPE, getDictDatas } from "@/utils/dict";
 
 export default {
-  name: "index",
+  name: "TradeOrder",
   data () {
     return {
       // 遮罩层
@@ -232,7 +232,7 @@ export default {
       this.getList();
     },
     goToDetail (row) {
-      this.$router.push({ path: '/trade/order/detail', query: { id: row.id }})
+      this.$router.push({ name: 'TradeOrderDetail', query: { id: row.id }})
     }
   }
 }
diff --git a/yudao-ui-admin/src/views/pay/app/index.vue b/yudao-ui-admin/src/views/pay/app/index.vue
index 723d85cb5..bea522ef1 100644
--- a/yudao-ui-admin/src/views/pay/app/index.vue
+++ b/yudao-ui-admin/src/views/pay/app/index.vue
@@ -229,7 +229,7 @@ import wechatChannelForm from "@/views/pay/app/components/wechatChannelForm";
 import aliPayChannelForm from "@/views/pay/app/components/aliPayChannelForm";
 
 export default {
-  name: "App",
+  name: "PayApp",
   components: {
     "wechatChannelForm": wechatChannelForm,
     "aliPayChannelForm": aliPayChannelForm
diff --git a/yudao-ui-admin/src/views/pay/merchant/index.vue b/yudao-ui-admin/src/views/pay/merchant/index.vue
index 568e6adb0..f0d56c5ad 100644
--- a/yudao-ui-admin/src/views/pay/merchant/index.vue
+++ b/yudao-ui-admin/src/views/pay/merchant/index.vue
@@ -117,7 +117,7 @@ import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "Merchant",
+  name: "PayMerchant",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/pay/refund/index.vue b/yudao-ui-admin/src/views/pay/refund/index.vue
index 4a719d1a1..cc2ef5c3e 100755
--- a/yudao-ui-admin/src/views/pay/refund/index.vue
+++ b/yudao-ui-admin/src/views/pay/refund/index.vue
@@ -264,7 +264,7 @@ const defaultRefundDetail = {
 }
 
 export default {
-  name: "Refund",
+  name: "PayRefund",
   components: {},
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/system/area/index.vue b/yudao-ui-admin/src/views/system/area/index.vue
index dc93d4237..7890d1a8b 100644
--- a/yudao-ui-admin/src/views/system/area/index.vue
+++ b/yudao-ui-admin/src/views/system/area/index.vue
@@ -39,7 +39,7 @@
 import {getAreaByIp, getAreaTree} from "@/api/system/area";
 
 export default {
-  name: "Area",
+  name: "SystemArea",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/dept/index.vue b/yudao-ui-admin/src/views/system/dept/index.vue
index 0ec798622..3397a935b 100644
--- a/yudao-ui-admin/src/views/system/dept/index.vue
+++ b/yudao-ui-admin/src/views/system/dept/index.vue
@@ -117,7 +117,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {listSimpleUsers} from "@/api/system/user";
 
 export default {
-  name: "Dept",
+  name: "SystemDept",
   components: { Treeselect },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/system/dict/data.vue b/yudao-ui-admin/src/views/system/dict/data.vue
index 5fc28f11d..fc4041d01 100644
--- a/yudao-ui-admin/src/views/system/dict/data.vue
+++ b/yudao-ui-admin/src/views/system/dict/data.vue
@@ -111,7 +111,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "Data",
+  name: "SystemDictData",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue
index 6584f49c0..d3e5ec8ef 100644
--- a/yudao-ui-admin/src/views/system/dict/index.vue
+++ b/yudao-ui-admin/src/views/system/dict/index.vue
@@ -101,7 +101,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "Dict",
+  name: "SystemDictType",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/errorCode/index.vue b/yudao-ui-admin/src/views/system/errorCode/index.vue
index 9c53eaac3..8d6858ddd 100644
--- a/yudao-ui-admin/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin/src/views/system/errorCode/index.vue
@@ -99,7 +99,7 @@
 import { createErrorCode, updateErrorCode, deleteErrorCode, getErrorCode, getErrorCodePage, exportErrorCodeExcel } from "@/api/system/errorCode";
 
 export default {
-  name: "ErrorCode",
+  name: "SystemErrorCode",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/loginlog/index.vue b/yudao-ui-admin/src/views/system/loginlog/index.vue
index cbc0213df..53b7d712e 100644
--- a/yudao-ui-admin/src/views/system/loginlog/index.vue
+++ b/yudao-ui-admin/src/views/system/loginlog/index.vue
@@ -66,7 +66,7 @@
 import { list, exportLoginLog } from "@/api/system/loginlog";
 
 export default {
-  name: "Logininfor",
+  name: "SystemLoginLog",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
index 56b6f3b84..c5ade9172 100755
--- a/yudao-ui-admin/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -92,7 +92,7 @@
 import { createMailAccount, updateMailAccount, deleteMailAccount, getMailAccount, getMailAccountPage } from "@/api/system/mail/account";
 
 export default {
-  name: "MailAccount",
+  name: "SystemMailAccount",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/mail/log/index.vue b/yudao-ui-admin/src/views/system/mail/log/index.vue
index fca363bfb..e1ef53c84 100755
--- a/yudao-ui-admin/src/views/system/mail/log/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/log/index.vue
@@ -123,7 +123,7 @@ import Editor from '@/components/Editor';
 import { getSimpleMailAccountList } from "@/api/system/mail/account";
 
 export default {
-  name: "MailLog",
+  name: "SystemMailLog",
   components: {
     Editor,
   },
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
index e1361464a..e90d40762 100755
--- a/yudao-ui-admin/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -144,7 +144,7 @@ import { CommonStatusEnum } from "@/utils/constants";
 import { getSimpleMailAccountList } from "@/api/system/mail/account";
 
 export default {
-  name: "MailTemplate",
+  name: "SystemMailTemplate",
   components: {
     Editor,
   },
diff --git a/yudao-ui-admin/src/views/system/menu/index.vue b/yudao-ui-admin/src/views/system/menu/index.vue
index db093a484..a8be162d1 100644
--- a/yudao-ui-admin/src/views/system/menu/index.vue
+++ b/yudao-ui-admin/src/views/system/menu/index.vue
@@ -207,7 +207,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {isExternal} from "@/utils/validate";
 
 export default {
-  name: "Menu",
+  name: "SystemMenu",
   components: { Treeselect, IconSelect },
   data() {
     return {
diff --git a/yudao-ui-admin/src/views/system/notice/index.vue b/yudao-ui-admin/src/views/system/notice/index.vue
index dc4418801..a322b6a72 100644
--- a/yudao-ui-admin/src/views/system/notice/index.vue
+++ b/yudao-ui-admin/src/views/system/notice/index.vue
@@ -110,7 +110,7 @@ import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "Notice",
+  name: "SystemNotice",
   components: {
     Editor
   },
diff --git a/yudao-ui-admin/src/views/system/notify/message/index.vue b/yudao-ui-admin/src/views/system/notify/message/index.vue
index 0e354f931..dedc55096 100644
--- a/yudao-ui-admin/src/views/system/notify/message/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/message/index.vue
@@ -116,7 +116,7 @@
 import { getNotifyMessagePage } from "@/api/system/notify/message";
 
 export default {
-  name: "NotifyMessage",
+  name: "SystemNotifyMessage",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/notify/my/index.vue b/yudao-ui-admin/src/views/system/notify/my/index.vue
index 5ad1bbee1..9c13e6998 100644
--- a/yudao-ui-admin/src/views/system/notify/my/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/my/index.vue
@@ -68,7 +68,7 @@
 import {getMyNotifyMessagePage, updateAllNotifyMessageRead, updateNotifyMessageRead} from "@/api/system/notify/message";
 
 export default {
-  name: "myNotify",
+  name: "SystemMyNotify",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/notify/template/index.vue b/yudao-ui-admin/src/views/system/notify/template/index.vue
index d12d64210..f6973a159 100644
--- a/yudao-ui-admin/src/views/system/notify/template/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/template/index.vue
@@ -140,7 +140,7 @@ import {listSimpleUsers} from "@/api/system/user";
 import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "NotifyTemplate",
+  name: "SystemNotifyTemplate",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/oauth2/client/index.vue b/yudao-ui-admin/src/views/system/oauth2/client/index.vue
index fb7ce7c45..39b6297f7 100755
--- a/yudao-ui-admin/src/views/system/oauth2/client/index.vue
+++ b/yudao-ui-admin/src/views/system/oauth2/client/index.vue
@@ -155,7 +155,7 @@ import {CommonStatusEnum} from "@/utils/constants";
 import FileUpload from "@/components/FileUpload";
 
 export default {
-  name: "OAuth2Client",
+  name: "SystemOAuth2Client",
   components: {
     FileUpload,
     ImageUpload,
diff --git a/yudao-ui-admin/src/views/system/oauth2/token/index.vue b/yudao-ui-admin/src/views/system/oauth2/token/index.vue
index e4b15495e..7c2f64e4d 100644
--- a/yudao-ui-admin/src/views/system/oauth2/token/index.vue
+++ b/yudao-ui-admin/src/views/system/oauth2/token/index.vue
@@ -59,7 +59,7 @@
 import { getAccessTokenPage, deleteAccessToken } from "@/api/system/oauth2/oauth2Token";
 
 export default {
-  name: "OAuth2Token",
+  name: "SystemTokenClient",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/operatelog/index.vue b/yudao-ui-admin/src/views/system/operatelog/index.vue
index ea71b830e..3869343c9 100644
--- a/yudao-ui-admin/src/views/system/operatelog/index.vue
+++ b/yudao-ui-admin/src/views/system/operatelog/index.vue
@@ -131,7 +131,7 @@
 import { listOperateLog, exportOperateLog } from "@/api/system/operatelog";
 
 export default {
-  name: "Operlog",
+  name: "SystemOperateLog",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/post/index.vue b/yudao-ui-admin/src/views/system/post/index.vue
index 4667cd199..628cee7b4 100644
--- a/yudao-ui-admin/src/views/system/post/index.vue
+++ b/yudao-ui-admin/src/views/system/post/index.vue
@@ -95,7 +95,7 @@ import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "Post",
+  name: "SystemPost",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/role/index.vue b/yudao-ui-admin/src/views/system/role/index.vue
index 2dfd13423..0cc9fb5bf 100644
--- a/yudao-ui-admin/src/views/system/role/index.vue
+++ b/yudao-ui-admin/src/views/system/role/index.vue
@@ -180,7 +180,7 @@ import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 
 export default {
-  name: "Role",
+  name: "SystemRole",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
index 99c9e64ec..acc681c64 100644
--- a/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
+++ b/yudao-ui-admin/src/views/system/sensitiveWord/index.vue
@@ -133,7 +133,7 @@ import { createSensitiveWord, updateSensitiveWord, deleteSensitiveWord, getSensi
 import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
-  name: "SensitiveWord",
+  name: "SystemSensitiveWord",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/sms/channel/index.vue b/yudao-ui-admin/src/views/system/sms/channel/index.vue
index 135c7d8ea..8687666a6 100644
--- a/yudao-ui-admin/src/views/system/sms/channel/index.vue
+++ b/yudao-ui-admin/src/views/system/sms/channel/index.vue
@@ -110,7 +110,7 @@
 import { createSmsChannel, updateSmsChannel, deleteSmsChannel, getSmsChannel, getSmsChannelPage } from "@/api/system/sms/smsChannel";
 
 export default {
-  name: "SmsChannel",
+  name: "SystemSmsChannel",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/sms/log/index.vue b/yudao-ui-admin/src/views/system/sms/log/index.vue
index f9b2825ba..07ac763ce 100644
--- a/yudao-ui-admin/src/views/system/sms/log/index.vue
+++ b/yudao-ui-admin/src/views/system/sms/log/index.vue
@@ -189,7 +189,7 @@ import { getSmsLogPage, exportSmsLogExcel } from "@/api/system/sms/smsLog";
 import {  getSimpleSmsChannels } from "@/api/system/sms/smsChannel";
 
 export default {
-  name: "SmsLog",
+  name: "SystemSmsLog",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/sms/template/index.vue b/yudao-ui-admin/src/views/system/sms/template/index.vue
index 07fbd4beb..1f8747a40 100644
--- a/yudao-ui-admin/src/views/system/sms/template/index.vue
+++ b/yudao-ui-admin/src/views/system/sms/template/index.vue
@@ -166,7 +166,7 @@ import { createSmsTemplate, updateSmsTemplate, deleteSmsTemplate, getSmsTemplate
 import {  getSimpleSmsChannels } from "@/api/system/sms/smsChannel";
 
 export default {
-  name: "SmsTemplate",
+  name: "SystemSmsTemplate",
   data() {
     return {
       // 遮罩层
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index 5bdb75a39..52548a607 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -141,7 +141,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import {getTenantPackageList} from "@/api/system/tenantPackage";
 
 export default {
-  name: "Tenant",
+  name: "SystemTenant",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/tenantPackage/index.vue b/yudao-ui-admin/src/views/system/tenantPackage/index.vue
index 822849b21..0f8c17c00 100755
--- a/yudao-ui-admin/src/views/system/tenantPackage/index.vue
+++ b/yudao-ui-admin/src/views/system/tenantPackage/index.vue
@@ -95,7 +95,7 @@ import {CommonStatusEnum} from "@/utils/constants";
 import {listSimpleMenus} from "@/api/system/menu";
 
 export default {
-  name: "TenantPackage",
+  name: "SystemTenantPackage",
   components: {
   },
   data() {
diff --git a/yudao-ui-admin/src/views/system/user/index.vue b/yudao-ui-admin/src/views/system/user/index.vue
index 5c3bb1655..1ad899616 100644
--- a/yudao-ui-admin/src/views/system/user/index.vue
+++ b/yudao-ui-admin/src/views/system/user/index.vue
@@ -248,7 +248,7 @@ import {listSimpleRoles} from "@/api/system/role";
 import {getBaseHeader} from "@/utils/request";
 
 export default {
-  name: "User",
+  name: "SystemUser",
   components: { Treeselect },
   data() {
     return {