fix 修复代码生成字典为null问题
This commit is contained in:
parent
fdad98b321
commit
3b765f3ac9
|
@ -285,7 +285,7 @@ export default {
|
||||||
#else
|
#else
|
||||||
#set($comment=$column.columnComment)
|
#set($comment=$column.columnComment)
|
||||||
#end
|
#end
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
// $comment字典
|
// $comment字典
|
||||||
${column.javaField}Options: [],
|
${column.javaField}Options: [],
|
||||||
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
|
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
|
||||||
|
@ -327,7 +327,7 @@ export default {
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList();
|
||||||
#foreach ($column in $columns)
|
#foreach ($column in $columns)
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
this.getDicts("${column.dictType}").then(response => {
|
this.getDicts("${column.dictType}").then(response => {
|
||||||
this.${column.javaField}Options = response.data;
|
this.${column.javaField}Options = response.data;
|
||||||
});
|
});
|
||||||
|
@ -379,7 +379,7 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
#foreach ($column in $columns)
|
#foreach ($column in $columns)
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
#set($parentheseIndex=$column.columnComment.indexOf("("))
|
#set($parentheseIndex=$column.columnComment.indexOf("("))
|
||||||
#if($parentheseIndex != -1)
|
#if($parentheseIndex != -1)
|
||||||
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
|
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
|
||||||
|
|
|
@ -350,7 +350,7 @@ export default {
|
||||||
#else
|
#else
|
||||||
#set($comment=$column.columnComment)
|
#set($comment=$column.columnComment)
|
||||||
#end
|
#end
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
// $comment字典
|
// $comment字典
|
||||||
${column.javaField}Options: [],
|
${column.javaField}Options: [],
|
||||||
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
|
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
|
||||||
|
@ -394,7 +394,7 @@ export default {
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList();
|
||||||
#foreach ($column in $columns)
|
#foreach ($column in $columns)
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
this.getDicts("${column.dictType}").then(response => {
|
this.getDicts("${column.dictType}").then(response => {
|
||||||
this.${column.javaField}Options = response.data;
|
this.${column.javaField}Options = response.data;
|
||||||
});
|
});
|
||||||
|
@ -427,7 +427,7 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
#foreach ($column in $columns)
|
#foreach ($column in $columns)
|
||||||
#if(${column.dictType} != '')
|
#if(${column.dictType} && ${column.dictType} != '')
|
||||||
#set($parentheseIndex=$column.columnComment.indexOf("("))
|
#set($parentheseIndex=$column.columnComment.indexOf("("))
|
||||||
#if($parentheseIndex != -1)
|
#if($parentheseIndex != -1)
|
||||||
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
|
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
|
||||||
|
|
Loading…
Reference in New Issue