소스 검색

代码生成添加select必填选项

RuoYi 5 년 전
부모
커밋
82eeb86d60

+ 3 - 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -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
           </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
 #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

+ 4 - 5
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -95,7 +95,7 @@
95
           v-hasPermi="['${moduleName}:${businessName}:export']"
95
           v-hasPermi="['${moduleName}:${businessName}:export']"
96
         >导出</el-button>
96
         >导出</el-button>
97
       </el-col>
97
       </el-col>
98
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
98
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
99
     </el-row>
99
     </el-row>
100
 
100
 
101
     <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
101
     <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
@@ -169,7 +169,7 @@
169
           <el-input v-model="form.${field}" placeholder="请输入${comment}" />
169
           <el-input v-model="form.${field}" placeholder="请输入${comment}" />
170
         </el-form-item>
170
         </el-form-item>
171
 #elseif($column.htmlType == "select" && "" != $dictType)
171
 #elseif($column.htmlType == "select" && "" != $dictType)
172
-        <el-form-item label="${comment}">
172
+        <el-form-item label="${comment}" prop="${field}">
173
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
173
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
174
             <el-option
174
             <el-option
175
               v-for="dict in ${field}Options"
175
               v-for="dict in ${field}Options"
@@ -181,7 +181,7 @@
181
           </el-select>
181
           </el-select>
182
         </el-form-item>
182
         </el-form-item>
183
 #elseif($column.htmlType == "select" && $dictType)
183
 #elseif($column.htmlType == "select" && $dictType)
184
-        <el-form-item label="${comment}">
184
+        <el-form-item label="${comment}" prop="${field}">
185
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
185
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
186
             <el-option label="请选择字典生成" value="" />
186
             <el-option label="请选择字典生成" value="" />
187
           </el-select>
187
           </el-select>
@@ -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不能为空", trigger: "blur" }
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