-
+
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -114,7 +114,12 @@
-
+
+
+
+ {{ scope.$index + 1 }}
+
+
#foreach($column in $columns)
#set($javaField=$column.javaField)
#set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -123,27 +128,34 @@
#else
#set($comment=$column.columnComment)
#end
-#if($column.pk)
+#if($column.pk || ($column.list && ${javaField} == "uuid"))
##
-
-
- {{ scope.$index + 1 }}
-
-
-#elseif($column.list && $column.htmlType == "datetime")
-
+#elseif($column.list && (${javaField} == "createTime" || ${javaField} == "updateTime"))
+
{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}
+#elseif($column.list && ${javaField} == "remark")
+
+#elseif($column.list && (${javaField} == "createBy" || ${javaField} == "updateBy"))
+
#elseif($column.list && $column.htmlType == "imageUpload")
+#elseif($column.list && "image" == $column.htmlType)
+
+
+
+
+
+
#elseif($column.list && "" != $column.dictType)
-
+
#if($column.htmlType == "checkbox")
@@ -153,10 +165,10 @@
#elseif($column.list && "" != $javaField)
-
+
#end
#end
-
+
-
-
+
+
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
@@ -300,8 +312,12 @@
-
-
+
+
+
+ {{ scope.$index + 1 }}
+
+
#foreach($column in $subTable.columns)
#set($javaField=$column.javaField)
#set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -380,7 +396,7 @@ export default {
// 非多个禁用
multiple: true,
// 显示搜索条件
- showSearch: true,
+ showSearch: false,
// 总条数
total: 0,
// ${functionName}表格数据
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 9cb4176..8b25665 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -119,11 +119,6 @@
#set($comment=$column.columnComment)
#end
#if($column.pk)
-
-
- {{ scope.$index+1 }}
-
-
#elseif($column.list && $column.htmlType == "datetime")
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index 0ceb3d8..a9feb0d 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -3,9 +3,10 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
#foreach ($column in $columns)
+
#end
@@ -23,12 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#end
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+ select
+#foreach($column in $columns)
+ $column.columnName#if($foreach.count != $columns.size()),
+#end#end
-
-
-
-
- insert into ${tableName}
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- $column.columnName,
-#end
-#end
-
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- #{$column.javaField},
-#end
-#end
-
-
-
-
- update ${tableName}
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
- $column.columnName = #{$column.javaField},
-#end
-#end
-
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-
-
-
- delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-
-
-
- delete from ${tableName} where ${pkColumn.columnName} in
-
- #{${pkColumn.javaField}}
-
-
-#if($table.sub)
-
-
- delete from ${subTableName} where ${subTableFkName} in
-
- #{${subTableFkclassName}}
-
-
-
-
- delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
-
-
-
- insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
-
- (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
-
-
-#end
+##
+##
+##
+##
+## insert into ${tableName}
+##
+###foreach($column in $columns)
+###if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+## $column.columnName,
+###end
+###end
+##
+##
+###foreach($column in $columns)
+###if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+## #{$column.javaField},
+###end
+###end
+##
+##
+##
+##
+## update ${tableName}
+##
+###foreach($column in $columns)
+###if($column.columnName != $pkColumn.columnName)
+## $column.columnName = #{$column.javaField},
+###end
+###end
+##
+## where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+##
+##
+##
+## delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+##
+##
+##
+## delete from ${tableName} where ${pkColumn.columnName} in
+##
+## #{${pkColumn.javaField}}
+##
+##
+###if($table.sub)
+##
+##
+## delete from ${subTableName} where ${subTableFkName} in
+##
+## #{${subTableFkclassName}}
+##
+##
+##
+##
+## delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
+##
+##
+##
+## insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
+##
+## (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
+##
+##
+###end
\ No newline at end of file