Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
多鱼的夏天
RuoYi-Cloud-Docker
提交
2a452a00
R
RuoYi-Cloud-Docker
项目概览
多鱼的夏天
/
RuoYi-Cloud-Docker
通知
210
Star
7
Fork
6
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Cloud-Docker
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2a452a00
编写于
11月 25, 2021
作者:
R
Ricky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级velocity到最新版本2.3(语法升级)
上级
4d412324
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
15 addition
and
23 deletion
+15
-23
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
...les/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+5
-9
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
...-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
+5
-9
ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
...modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
+5
-5
未找到文件。
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
浏览文件 @
2a452a00
...
...
@@ -300,8 +300,7 @@ export default {
queryParams
:
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
query
)
$
column
.
javaField
:
null
#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
null
#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
},
...
...
@@ -319,8 +318,7 @@ export default {
#
end
$
column
.
javaField
:
[
{
required
:
true
,
message
:
"
$
comment
不能为空
"
,
trigger
:
#
if
($
column
.
htmlType
==
"select"
)
"
change
"
#
else
"
blur
"
#
end
}
]#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
]#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
}
...
...
@@ -383,14 +381,12 @@ export default {
this
.
form
=
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
htmlType
==
"radio"
)
$
column
.
javaField
:
#
if
($
column
.
javaType
==
"Integer"
||
$
column
.
javaType
==
"Long"
)
0
#
else
"
0
"
#
end
#
if
($
velocityC
ount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
#
if
($
column
.
javaType
==
"Integer"
||
$
column
.
javaType
==
"Long"
)
0
#
else
"
0
"
#
end
#
if
($
foreach
.
c
ount
!=
$
columns
.
size
()),#
end
#
elseif
($
column
.
htmlType
==
"checkbox"
)
$
column
.
javaField
:
[]#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
[]#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
else
$
column
.
javaField
:
null
#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
null
#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
};
...
...
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
浏览文件 @
2a452a00
...
...
@@ -364,8 +364,7 @@ export default {
pageSize
:
10
,
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
query
)
$
column
.
javaField
:
null
#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
null
#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
},
...
...
@@ -383,8 +382,7 @@ export default {
#
end
$
column
.
javaField
:
[
{
required
:
true
,
message
:
"
$
comment
不能为空
"
,
trigger
:
#
if
($
column
.
htmlType
==
"select"
)
"
change
"
#
else
"
blur
"
#
end
}
]#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
]#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
}
...
...
@@ -428,14 +426,12 @@ export default {
this
.
form
=
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
htmlType
==
"radio"
)
$
column
.
javaField
:
#
if
($
column
.
javaType
==
"Integer"
||
$
column
.
javaType
==
"Long"
)
0
#
else
"
0
"
#
end
#
if
($
velocityC
ount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
#
if
($
column
.
javaType
==
"Integer"
||
$
column
.
javaType
==
"Long"
)
0
#
else
"
0
"
#
end
#
if
($
foreach
.
c
ount
!=
$
columns
.
size
()),#
end
#
elseif
($
column
.
htmlType
==
"checkbox"
)
$
column
.
javaField
:
[]#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
[]#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
else
$
column
.
javaField
:
null
#
if
($
velocityCount
!=
$
columns
.
size
()),#
end
$
column
.
javaField
:
null
#
if
($
foreach
.
count
!=
$
columns
.
size
()),#
end
#
end
#
end
};
...
...
ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
浏览文件 @
2a452a00
...
...
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#
end
<sql
id=
"select
${
ClassName
}
Vo"
>
select
#
foreach
($
column
in
$
columns
)
$
column
.
columnName
#
if
($
velocityC
ount
!=
$
columns
.
size
())
,
#
end
#
end
from
${
tableName
}
select
#
foreach
($
column
in
$
columns
)
$
column
.
columnName
#
if
($
foreach
.
c
ount
!=
$
columns
.
size
())
,
#
end
#
end
from
${
tableName
}
</sql>
<select
id=
"select
${
ClassName
}
List"
parameterType=
"
${
ClassName
}
"
resultMap=
"
${
ClassName
}
Result"
>
...
...
@@ -63,8 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include
refid=
"select
${
ClassName
}
Vo"
/>
where
${
pkColumn
.
columnName
}
=
#{
${
pkColumn
.
javaField
}
}
#
elseif
($
table
.
sub
)
select
#
foreach
($
column
in
$
columns
)
a.
$
column
.
columnName
#
if
($
velocityC
ount
!=
$
columns
.
size
())
,
#
end
#
end
,
#
foreach
($
column
in
$
subTable
.
columns
)
b.
$
column
.
columnName
as sub_
$
column
.
columnName
#
if
($
velocityC
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
select
#
foreach
($
column
in
$
columns
)
a.
$
column
.
columnName
#
if
($
foreach
.
c
ount
!=
$
columns
.
size
())
,
#
end
#
end
,
#
foreach
($
column
in
$
subTable
.
columns
)
b.
$
column
.
columnName
as sub_
$
column
.
columnName
#
if
($
foreach
.
c
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
from
${
tableName
}
a
left join
${
subTableName
}
b on b.
${
subTableFkName
}
= a.
${
pkColumn
.
columnName
}
...
...
@@ -126,9 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<insert
id=
"batch
${
subClassName
}
"
>
insert into
${
subTableName
}
(
#
foreach
($
column
in
$
subTable
.
columns
)
$
column
.
columnName
#
if
($
velocityC
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
) values
insert into
${
subTableName
}
(
#
foreach
($
column
in
$
subTable
.
columns
)
$
column
.
columnName
#
if
($
foreach
.
c
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
) values
<foreach
item=
"item"
index=
"index"
collection=
"list"
separator=
","
>
(
#
foreach
($
column
in
$
subTable
.
columns
)
#{
item
.
$
column
.
javaField
}#
if
($
velocityC
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
)
(
#
foreach
($
column
in
$
subTable
.
columns
)
#{
item
.
$
column
.
javaField
}#
if
($
foreach
.
c
ount
!=
$
subTable
.
columns
.
size
())
,
#
end
#
end
)
</foreach>
</insert>
#
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录