-
+
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -17,14 +17,14 @@
v-model="queryParams.${column.javaField}"
placeholder="请输入${comment}"
clearable
- @keyup.enter.native="handleQuery"
+ @keyup.enter="handleQuery"
/>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-
+
#end
#end
#end
- 搜索
- 重置
+ 搜索
+ 重置
@@ -73,8 +72,7 @@
新增
@@ -83,12 +81,11 @@
展开/折叠
-
+
-
+
{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}
@@ -122,11 +119,11 @@
#elseif($column.list && $column.dictType && "" != $column.dictType)
-
+
#if($column.htmlType == "checkbox")
-
+
#else
-
+
#end
@@ -139,35 +136,17 @@
#end
#end
-
- 修改
- 新增
- 删除
-
+
+ 修改
+ 新增
+ 删除
+
-
-
+
+
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
@@ -180,7 +159,14 @@
#set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode)
-
+
#elseif($column.htmlType == "input")
@@ -202,7 +188,7 @@
{{dict.label}}
@@ -240,7 +226,7 @@
@@ -273,66 +259,51 @@
#end
#end
-
+
+
+
-
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 7eb0212c8..808e3e6f5 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -1,6 +1,6 @@
-
-
-#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)
-#elseif($column.list && $column.htmlType == "datetime")
-
-
- {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}
-
-
-#elseif($column.list && $column.htmlType == "imageUpload")
-
-
-
-
-
-#elseif($column.list && $column.dictType && "" != $column.dictType)
-
-
-#if($column.htmlType == "checkbox")
-
-#else
-
-#end
-
-
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
-
-#else
-
-#end
-#end
-#end
-
-
- 修改
- 新增
- 删除
-
-
-
-
-
-
-
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$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("" != $treeParentCode && $column.javaField == $treeParentCode)
-
-
-
-#elseif($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
-
-
-
-
-
-
-
-
-
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
deleted file mode 100644
index 808e3e6f5..000000000
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ /dev/null
@@ -1,490 +0,0 @@
-