Просмотр исходного кода

升级velocity到最新版本2.3(语法升级)

Ricky лет назад: 4
Родитель
Сommit
2a452a00e0

+ 5 - 9
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -300,8 +300,7 @@ export default {
300
       queryParams: {
300
       queryParams: {
301
 #foreach ($column in $columns)
301
 #foreach ($column in $columns)
302
 #if($column.query)
302
 #if($column.query)
303
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
304
-
303
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
305
 #end
304
 #end
306
 #end
305
 #end
307
       },
306
       },
@@ -319,8 +318,7 @@ export default {
319
 #end
318
 #end
320
         $column.javaField: [
319
         $column.javaField: [
321
           { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
320
           { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
322
-        ]#if($velocityCount != $columns.size()),#end
323
-
321
+        ]#if($foreach.count != $columns.size()),#end
324
 #end
322
 #end
325
 #end
323
 #end
326
       }
324
       }
@@ -383,14 +381,12 @@ export default {
383
       this.form = {
381
       this.form = {
384
 #foreach ($column in $columns)
382
 #foreach ($column in $columns)
385
 #if($column.htmlType == "radio")
383
 #if($column.htmlType == "radio")
386
-        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
384
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
387
 
385
 
388
 #elseif($column.htmlType == "checkbox")
386
 #elseif($column.htmlType == "checkbox")
389
-        $column.javaField: []#if($velocityCount != $columns.size()),#end
390
-
387
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
391
 #else
388
 #else
392
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
393
-
389
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
394
 #end
390
 #end
395
 #end
391
 #end
396
       };
392
       };

+ 5 - 9
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -364,8 +364,7 @@ export default {
364
         pageSize: 10,
364
         pageSize: 10,
365
 #foreach ($column in $columns)
365
 #foreach ($column in $columns)
366
 #if($column.query)
366
 #if($column.query)
367
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
368
-
367
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
369
 #end
368
 #end
370
 #end
369
 #end
371
       },
370
       },
@@ -383,8 +382,7 @@ export default {
383
 #end
382
 #end
384
         $column.javaField: [
383
         $column.javaField: [
385
           { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
384
           { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
386
-        ]#if($velocityCount != $columns.size()),#end
387
-
385
+        ]#if($foreach.count != $columns.size()),#end
388
 #end
386
 #end
389
 #end
387
 #end
390
       }
388
       }
@@ -428,14 +426,12 @@ export default {
428
       this.form = {
426
       this.form = {
429
 #foreach ($column in $columns)
427
 #foreach ($column in $columns)
430
 #if($column.htmlType == "radio")
428
 #if($column.htmlType == "radio")
431
-        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
429
+        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
432
 
430
 
433
 #elseif($column.htmlType == "checkbox")
431
 #elseif($column.htmlType == "checkbox")
434
-        $column.javaField: []#if($velocityCount != $columns.size()),#end
435
-
432
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
436
 #else
433
 #else
437
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
438
-
434
+        $column.javaField: null#if($foreach.count != $columns.size()),#end
439
 #end
435
 #end
440
 #end
436
 #end
441
       };
437
       };

+ 5 - 5
ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
23
 #end
23
 #end
24
 
24
 
25
     <sql id="select${ClassName}Vo">
25
     <sql id="select${ClassName}Vo">
26
-        select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName}
26
+        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
27
     </sql>
27
     </sql>
28
 
28
 
29
     <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
29
     <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
@@ -63,8 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
63
         <include refid="select${ClassName}Vo"/>
63
         <include refid="select${ClassName}Vo"/>
64
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
64
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
65
 #elseif($table.sub)
65
 #elseif($table.sub)
66
-        select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end,
67
-           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
66
+        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
67
+           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
68
 
68
 
69
         from ${tableName} a
69
         from ${tableName} a
70
         left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
70
         left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
@@ -126,9 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
126
     </delete>
126
     </delete>
127
 
127
 
128
     <insert id="batch${subClassName}">
128
     <insert id="batch${subClassName}">
129
-        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($velocityCount != $subTable.columns.size()),#end#end) values
129
+        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
130
 		<foreach item="item" index="index" collection="list" separator=",">
130
 		<foreach item="item" index="index" collection="list" separator=",">
131
-            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($velocityCount != $subTable.columns.size()),#end#end)
131
+            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
132
         </foreach>
132
         </foreach>
133
     </insert>
133
     </insert>
134
 #end
134
 #end