From 3384270797abbfca82e8ae0110704f74c28e6a02 Mon Sep 17 00:00:00 2001
From: LiuTime <12459386+itlxdyjz@user.noreply.gitee.com>
Date: Tue, 8 Apr 2025 14:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF=E9=AB=98?=
=?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../generator/constant/GenConstants.java | 5 +
.../dromara/generator/util/VelocityUtils.java | 2 +
.../main/resources/vm/vue/index-search.vue.vm | 718 ++++++++++++++++++
3 files changed, 725 insertions(+)
create mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
index b9888fb63..41a43e559 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
@@ -11,6 +11,11 @@ public interface GenConstants {
*/
String TPL_CRUD = "crud";
+ /**
+ * 单表（增删改查-高级搜索）
+ */
+ String TPL_CRUD_SEARCH = "crudSearch";
+
/**
* 树表（增删改查）
*/
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
index 6e111e3a8..ba8738eed 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
@@ -131,6 +131,8 @@ public class VelocityUtils {
templates.add("vm/ts/types.ts.vm");
if (GenConstants.TPL_CRUD.equals(tplCategory)) {
templates.add("vm/vue/index.vue.vm");
+ } else if (GenConstants.TPL_CRUD_SEARCH.equals(tplCategory)) {
+ templates.add("vm/vue/index-search.vue.vm");
} else if (GenConstants.TPL_TREE.equals(tplCategory)) {
templates.add("vm/vue/index-tree.vue.vm");
}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm
new file mode 100644
index 000000000..b119787eb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-search.vue.vm
@@ -0,0 +1,718 @@
+
+
+
+
+
+ #foreach($column in $columns)
+ #if($column.query)
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+
+
+ #end
+ #end
+ #end
+
+ 搜索
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+ #foreach($column in $columns)
+ #set($javaField=$column.javaField)
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.pk)
+
+ #if($column.query)
+
+ ${comment}
+
+
+
+
+
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+ #end
+ 确认
+
+
+
+ #end
+
+ #elseif($column.list && $column.htmlType == "datetime")
+
+ #if($column.query)
+
+ ${comment}
+
+
+
+
+
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+ #end
+ 确认
+
+
+
+ #end
+
+ {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}
+
+
+ #elseif($column.list && $column.htmlType == "imageUpload")
+
+ #if($column.query)
+
+ ${comment}
+
+
+
+
+
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+ #end
+ 确认
+
+
+
+ #end
+
+
+
+
+ #elseif($column.list && $column.dictType && "" != $column.dictType)
+
+ #if($column.query)
+
+ ${comment}
+
+
+
+
+
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+ #end
+ 确认
+
+
+
+ #end
+
+ #if($column.htmlType == "checkbox")
+
+ #else
+
+ #end
+
+
+ #elseif($column.list && "" != $javaField)
+
+ #if($column.query)
+
+ ${comment}
+
+
+
+
+
+ #set($dictType=$column.dictType)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #if($column.htmlType == "input" || $column.htmlType == "textarea")
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+
+
+
+ #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+ #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+ #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+ #end
+ 确认
+
+
+
+ #end
+
+ #end
+ #end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #foreach($column in $columns)
+ #set($field=$column.javaField)
+ #if(($column.insert || $column.edit) && !$column.pk)
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+ #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+ #set($comment=$column.columnComment)
+ #end
+ #set($dictType=$column.dictType)
+ #if($column.htmlType == "input")
+
+
+
+ #elseif($column.htmlType == "imageUpload")
+
+
+
+ #elseif($column.htmlType == "fileUpload")
+
+
+
+ #elseif($column.htmlType == "editor")
+
+
+
+ #elseif($column.htmlType == "select" && "" != $dictType)
+
+
+
+
+
+ #elseif($column.htmlType == "select" && $dictType)
+
+
+
+
+
+ #elseif($column.htmlType == "checkbox" && "" != $dictType)
+
+
+
+ {{dict.label}}
+
+
+
+ #elseif($column.htmlType == "checkbox" && $dictType)
+
+
+ 请选择字典生成
+
+
+ #elseif($column.htmlType == "radio" && "" != $dictType)
+
+
+ {{dict.label}}
+
+
+ #elseif($column.htmlType == "radio" && $dictType)
+
+
+ 请选择字典生成
+
+
+ #elseif($column.htmlType == "datetime")
+
+
+
+
+ #elseif($column.htmlType == "textarea")
+
+
+
+ #end
+ #end
+ #end
+
+
+
+
+
+