diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 9d29aceed..8fac7cbdb 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -106,7 +106,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk) +#if($column.pkColumn) #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <template slot-scope="scope"> @@ -169,7 +169,7 @@ <el-form ref="form" :model="form" :rules="rules" label-width="80px"> #foreach($column in $columns) #set($field=$column.javaField) -#if($column.insert && !$column.pk) +#if($column.insert && !$column.pkColumn) #if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 8daa05ecc..9de637b35 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -123,7 +123,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk) +#if($column.pkColumn) <el-table-column label="${comment}" align="center" prop="${javaField}" /> #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> @@ -184,7 +184,7 @@ <el-form ref="form" :model="form" :rules="rules" label-width="80px"> #foreach($column in $columns) #set($field=$column.javaField) -#if($column.insert && !$column.pk) +#if($column.insert && !$column.pkColumn) #if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -299,7 +299,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk || $javaField == ${subTableFkclassName}) +#if($column.pkColumn || $javaField == ${subTableFkclassName}) #elseif($column.list && $column.htmlType == "input") <el-table-column label="$comment" prop="${javaField}" width="150"> <template slot-scope="scope"> @@ -563,7 +563,7 @@ export default { handleAdd${subClassName}() { let obj = {}; #foreach($column in $subTable.columns) -#if($column.pk || $column.javaField == ${subTableFkclassName}) +#if($column.pkColumn || $column.javaField == ${subTableFkclassName}) #elseif($column.list && "" != $javaField) obj.$column.javaField = ""; #end diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index 862297c79..41eb4e348 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -103,7 +103,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk) +#if($column.pkColumn) #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <template #default="scope"> @@ -163,7 +163,7 @@ <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #foreach($column in $columns) #set($field=$column.javaField) -#if($column.insert && !$column.pk) +#if($column.insert && !$column.pkColumn) #if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) 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 a363ef364..eadb181ca 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 @@ -118,7 +118,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk) +#if($column.pkColumn) <el-table-column label="${comment}" align="center" prop="${javaField}" /> #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> @@ -177,7 +177,7 @@ <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> #foreach($column in $columns) #set($field=$column.javaField) -#if($column.insert && !$column.pk) +#if($column.insert && !$column.pkColumn) #if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -292,7 +292,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.pk || $javaField == ${subTableFkclassName}) +#if($column.pkColumn || $javaField == ${subTableFkclassName}) #elseif($column.list && $column.htmlType == "input") <el-table-column label="$comment" prop="${javaField}" width="150"> <template #default="scope"> @@ -558,7 +558,7 @@ function row${subClassName}Index({ row, rowIndex }) { function handleAdd${subClassName}() { let obj = {}; #foreach($column in $subTable.columns) -#if($column.pk || $column.javaField == ${subTableFkclassName}) +#if($column.pkColumn || $column.javaField == ${subTableFkclassName}) #elseif($column.list && "" != $javaField) obj.$column.javaField = ""; #end