jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布 v2.5.1 针对 v2.5.0 版本新特性bug修复

Browse Source
This commit is contained in:
疯狂的狮子li
2021-07-13 13:57:44 +08:00
parent 49c2809895
commit 51d1e3c8c1
24 changed files with 141 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/resources/application.yml
View File

@ -14,8 +14,6 @@ ruoyi:
addressEnabled: true
captcha:
# 验证码开关
enabled: true
# 验证码类型 math 数组计算 char 字符验证
type: math
# line 线段干扰 circle 圆圈干扰 shear 扭曲干扰

6
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -285,7 +285,7 @@ export default {
#else
#set($comment=$column.columnComment)
#end
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
// $comment字典
${column.javaField}Options: [],
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
@ -327,7 +327,7 @@ export default {
created() {
this.getList();
#foreach ($column in $columns)
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
this.getDicts("${column.dictType}").then(response => {
this.${column.javaField}Options = response.data;
});
@ -379,7 +379,7 @@ export default {
});
},
#foreach ($column in $columns)
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))

6
ruoyi/src/main/resources/vm/vue/index.vue.vm
View File

@ -350,7 +350,7 @@ export default {
#else
#set($comment=$column.columnComment)
#end
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
// $comment字典
${column.javaField}Options: [],
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
@ -394,7 +394,7 @@ export default {
created() {
this.getList();
#foreach ($column in $columns)
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
this.getDicts("${column.dictType}").then(response => {
this.${column.javaField}Options = response.data;
});
@ -427,7 +427,7 @@ export default {
});
},
#foreach ($column in $columns)
#if(${column.dictType} != '')
#if(${column.dictType} && ${column.dictType} != '')
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))