Commit 549c7ee97a2a006566848d7889aa8eed0e0dde20
1 parent
5fcf342f
代码生成添加select必填选项
Showing
2 changed files
with
5 additions
and
7 deletions
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
| @@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
| 66 | v-hasPermi="['${moduleName}:${businessName}:add']" | 66 | v-hasPermi="['${moduleName}:${businessName}:add']" |
| 67 | >新增</el-button> | 67 | >新增</el-button> |
| 68 | </el-col> | 68 | </el-col> |
| 69 | - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | 69 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> |
| 70 | </el-row> | 70 | </el-row> |
| 71 | 71 | ||
| 72 | <el-table | 72 | <el-table |
| @@ -140,7 +140,7 @@ | @@ -140,7 +140,7 @@ | ||
| 140 | <el-input v-model="form.${field}" placeholder="请输入${comment}" /> | 140 | <el-input v-model="form.${field}" placeholder="请输入${comment}" /> |
| 141 | </el-form-item> | 141 | </el-form-item> |
| 142 | #elseif($column.htmlType == "select" && "" != $dictType) | 142 | #elseif($column.htmlType == "select" && "" != $dictType) |
| 143 | - <el-form-item label="${comment}"> | 143 | + <el-form-item label="${comment}" prop="${field}"> |
| 144 | <el-select v-model="form.${field}" placeholder="请选择${comment}"> | 144 | <el-select v-model="form.${field}" placeholder="请选择${comment}"> |
| 145 | <el-option | 145 | <el-option |
| 146 | v-for="dict in ${field}Options" | 146 | v-for="dict in ${field}Options" |
| @@ -152,7 +152,7 @@ | @@ -152,7 +152,7 @@ | ||
| 152 | </el-select> | 152 | </el-select> |
| 153 | </el-form-item> | 153 | </el-form-item> |
| 154 | #elseif($column.htmlType == "select" && $dictType) | 154 | #elseif($column.htmlType == "select" && $dictType) |
| 155 | - <el-form-item label="${comment}"> | 155 | + <el-form-item label="${comment}" prop="${field}"> |
| 156 | <el-select v-model="form.${field}" placeholder="请选择${comment}"> | 156 | <el-select v-model="form.${field}" placeholder="请选择${comment}"> |
| 157 | <el-option label="请选择字典生成" value="" /> | 157 | <el-option label="请选择字典生成" value="" /> |
| 158 | </el-select> | 158 | </el-select> |
| @@ -272,9 +272,8 @@ export default { | @@ -272,9 +272,8 @@ export default { | ||
| 272 | #else | 272 | #else |
| 273 | #set($comment=$column.columnComment) | 273 | #set($comment=$column.columnComment) |
| 274 | #end | 274 | #end |
| 275 | -#set($comment=$column.columnComment) | ||
| 276 | $column.javaField: [ | 275 | $column.javaField: [ |
| 277 | - { required: true, message: "$comment不能为空", trigger: "blur" } | 276 | + { required: true, message: "$comment不能为空", trigger: "#if($column.htmlType == "select")"change"#else"blur"#end" } |
| 278 | ]#if($velocityCount != $columns.size()),#end | 277 | ]#if($velocityCount != $columns.size()),#end |
| 279 | 278 | ||
| 280 | #end | 279 | #end |
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
| @@ -306,9 +306,8 @@ export default { | @@ -306,9 +306,8 @@ export default { | ||
| 306 | #else | 306 | #else |
| 307 | #set($comment=$column.columnComment) | 307 | #set($comment=$column.columnComment) |
| 308 | #end | 308 | #end |
| 309 | -#set($comment=$column.columnComment) | ||
| 310 | $column.javaField: [ | 309 | $column.javaField: [ |
| 311 | - { required: true, message: "$comment不能为空", #if($column.htmlType == "select")"change"#else"blur"#end } | 310 | + { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } |
| 312 | ]#if($velocityCount != $columns.size()),#end | 311 | ]#if($velocityCount != $columns.size()),#end |
| 313 | 312 | ||
| 314 | #end | 313 | #end |