欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 f11db02ff84efaf69a881a5ffc9f42d1c19a11a8 1 个父辈 d5f5c5d0

修复代码生成图片/文件/单选时选择必填无法校验问题(I64IO2)

内嵌 并排对比
正在显示 4 个修改的文件 包含 72 行增加 和 58 行删除
@@ -187,11 +187,11 @@ @@ -187,11 +187,11 @@
187 <el-input v-model="form.${field}" placeholder="请输入${comment}" /> 187 <el-input v-model="form.${field}" placeholder="请输入${comment}" />
188 </el-form-item> 188 </el-form-item>
189 #elseif($column.htmlType == "imageUpload") 189 #elseif($column.htmlType == "imageUpload")
190 - <el-form-item label="${comment}"> 190 + <el-form-item label="${comment}" prop="${field}">
191 <image-upload v-model="form.${field}"/> 191 <image-upload v-model="form.${field}"/>
192 </el-form-item> 192 </el-form-item>
193 #elseif($column.htmlType == "fileUpload") 193 #elseif($column.htmlType == "fileUpload")
194 - <el-form-item label="${comment}"> 194 + <el-form-item label="${comment}" prop="${field}">
195 <file-upload v-model="form.${field}"/> 195 <file-upload v-model="form.${field}"/>
196 </el-form-item> 196 </el-form-item>
197 #elseif($column.htmlType == "editor") 197 #elseif($column.htmlType == "editor")
@@ -205,8 +205,11 @@ @@ -205,8 +205,11 @@
205 v-for="dict in dict.type.${dictType}" 205 v-for="dict in dict.type.${dictType}"
206 :key="dict.value" 206 :key="dict.value"
207 :label="dict.label" 207 :label="dict.label"
208 - #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end  
209 - 208 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  209 + :value="parseInt(dict.value)"
  210 +#else
  211 + :value="dict.value"
  212 +#end
210 ></el-option> 213 ></el-option>
211 </el-select> 214 </el-select>
212 </el-form-item> 215 </el-form-item>
@@ -217,7 +220,7 @@ @@ -217,7 +220,7 @@
217 </el-select> 220 </el-select>
218 </el-form-item> 221 </el-form-item>
219 #elseif($column.htmlType == "checkbox" && "" != $dictType) 222 #elseif($column.htmlType == "checkbox" && "" != $dictType)
220 - <el-form-item label="${comment}"> 223 + <el-form-item label="${comment}" prop="${field}">
221 <el-checkbox-group v-model="form.${field}"> 224 <el-checkbox-group v-model="form.${field}">
222 <el-checkbox 225 <el-checkbox
223 v-for="dict in dict.type.${dictType}" 226 v-for="dict in dict.type.${dictType}"
@@ -228,24 +231,27 @@ @@ -228,24 +231,27 @@
228 </el-checkbox-group> 231 </el-checkbox-group>
229 </el-form-item> 232 </el-form-item>
230 #elseif($column.htmlType == "checkbox" && $dictType) 233 #elseif($column.htmlType == "checkbox" && $dictType)
231 - <el-form-item label="${comment}"> 234 + <el-form-item label="${comment}" prop="${field}">
232 <el-checkbox-group v-model="form.${field}"> 235 <el-checkbox-group v-model="form.${field}">
233 <el-checkbox>请选择字典生成</el-checkbox> 236 <el-checkbox>请选择字典生成</el-checkbox>
234 </el-checkbox-group> 237 </el-checkbox-group>
235 </el-form-item> 238 </el-form-item>
236 #elseif($column.htmlType == "radio" && "" != $dictType) 239 #elseif($column.htmlType == "radio" && "" != $dictType)
237 - <el-form-item label="${comment}"> 240 + <el-form-item label="${comment}" prop="${field}">
238 <el-radio-group v-model="form.${field}"> 241 <el-radio-group v-model="form.${field}">
239 <el-radio 242 <el-radio
240 v-for="dict in dict.type.${dictType}" 243 v-for="dict in dict.type.${dictType}"
241 :key="dict.value" 244 :key="dict.value"
242 - #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end  
243 - 245 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  246 + :label="parseInt(dict.value)"
  247 +#else
  248 + :label="dict.value"
  249 +#end
244 >{{dict.label}}</el-radio> 250 >{{dict.label}}</el-radio>
245 </el-radio-group> 251 </el-radio-group>
246 </el-form-item> 252 </el-form-item>
247 #elseif($column.htmlType == "radio" && $dictType) 253 #elseif($column.htmlType == "radio" && $dictType)
248 - <el-form-item label="${comment}"> 254 + <el-form-item label="${comment}" prop="${field}">
249 <el-radio-group v-model="form.${field}"> 255 <el-radio-group v-model="form.${field}">
250 <el-radio label="1">请选择字典生成</el-radio> 256 <el-radio label="1">请选择字典生成</el-radio>
251 </el-radio-group> 257 </el-radio-group>
@@ -335,7 +341,7 @@ export default { @@ -335,7 +341,7 @@ export default {
335 #set($comment=$column.columnComment) 341 #set($comment=$column.columnComment)
336 #end 342 #end
337 $column.javaField: [ 343 $column.javaField: [
338 - { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } 344 + { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
339 ]#if($foreach.count != $columns.size()),#end 345 ]#if($foreach.count != $columns.size()),#end
340 #end 346 #end
341 #end 347 #end
@@ -398,10 +404,7 @@ export default { @@ -398,10 +404,7 @@ export default {
398 reset() { 404 reset() {
399 this.form = { 405 this.form = {
400 #foreach ($column in $columns) 406 #foreach ($column in $columns)
401 -#if($column.htmlType == "radio")  
402 - $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end  
403 -  
404 -#elseif($column.htmlType == "checkbox") 407 +#if($column.htmlType == "checkbox")
405 $column.javaField: []#if($foreach.count != $columns.size()),#end 408 $column.javaField: []#if($foreach.count != $columns.size()),#end
406 #else 409 #else
407 $column.javaField: null#if($foreach.count != $columns.size()),#end 410 $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -198,11 +198,11 @@ @@ -198,11 +198,11 @@
198 <el-input v-model="form.${field}" placeholder="请输入${comment}" /> 198 <el-input v-model="form.${field}" placeholder="请输入${comment}" />
199 </el-form-item> 199 </el-form-item>
200 #elseif($column.htmlType == "imageUpload") 200 #elseif($column.htmlType == "imageUpload")
201 - <el-form-item label="${comment}"> 201 + <el-form-item label="${comment}" prop="${field}">
202 <image-upload v-model="form.${field}"/> 202 <image-upload v-model="form.${field}"/>
203 </el-form-item> 203 </el-form-item>
204 #elseif($column.htmlType == "fileUpload") 204 #elseif($column.htmlType == "fileUpload")
205 - <el-form-item label="${comment}"> 205 + <el-form-item label="${comment}" prop="${field}">
206 <file-upload v-model="form.${field}"/> 206 <file-upload v-model="form.${field}"/>
207 </el-form-item> 207 </el-form-item>
208 #elseif($column.htmlType == "editor") 208 #elseif($column.htmlType == "editor")
@@ -216,8 +216,11 @@ @@ -216,8 +216,11 @@
216 v-for="dict in dict.type.${dictType}" 216 v-for="dict in dict.type.${dictType}"
217 :key="dict.value" 217 :key="dict.value"
218 :label="dict.label" 218 :label="dict.label"
219 - #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end  
220 - 219 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  220 + :value="parseInt(dict.value)"
  221 +#else
  222 + :value="dict.value"
  223 +#end
221 ></el-option> 224 ></el-option>
222 </el-select> 225 </el-select>
223 </el-form-item> 226 </el-form-item>
@@ -228,7 +231,7 @@ @@ -228,7 +231,7 @@
228 </el-select> 231 </el-select>
229 </el-form-item> 232 </el-form-item>
230 #elseif($column.htmlType == "checkbox" && "" != $dictType) 233 #elseif($column.htmlType == "checkbox" && "" != $dictType)
231 - <el-form-item label="${comment}"> 234 + <el-form-item label="${comment}" prop="${field}">
232 <el-checkbox-group v-model="form.${field}"> 235 <el-checkbox-group v-model="form.${field}">
233 <el-checkbox 236 <el-checkbox
234 v-for="dict in dict.type.${dictType}" 237 v-for="dict in dict.type.${dictType}"
@@ -239,24 +242,27 @@ @@ -239,24 +242,27 @@
239 </el-checkbox-group> 242 </el-checkbox-group>
240 </el-form-item> 243 </el-form-item>
241 #elseif($column.htmlType == "checkbox" && $dictType) 244 #elseif($column.htmlType == "checkbox" && $dictType)
242 - <el-form-item label="${comment}"> 245 + <el-form-item label="${comment}" prop="${field}">
243 <el-checkbox-group v-model="form.${field}"> 246 <el-checkbox-group v-model="form.${field}">
244 <el-checkbox>请选择字典生成</el-checkbox> 247 <el-checkbox>请选择字典生成</el-checkbox>
245 </el-checkbox-group> 248 </el-checkbox-group>
246 </el-form-item> 249 </el-form-item>
247 #elseif($column.htmlType == "radio" && "" != $dictType) 250 #elseif($column.htmlType == "radio" && "" != $dictType)
248 - <el-form-item label="${comment}"> 251 + <el-form-item label="${comment}" prop="${field}">
249 <el-radio-group v-model="form.${field}"> 252 <el-radio-group v-model="form.${field}">
250 <el-radio 253 <el-radio
251 v-for="dict in dict.type.${dictType}" 254 v-for="dict in dict.type.${dictType}"
252 :key="dict.value" 255 :key="dict.value"
253 - #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end  
254 - 256 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  257 + :label="parseInt(dict.value)"
  258 +#else
  259 + :label="dict.value"
  260 +#end
255 >{{dict.label}}</el-radio> 261 >{{dict.label}}</el-radio>
256 </el-radio-group> 262 </el-radio-group>
257 </el-form-item> 263 </el-form-item>
258 #elseif($column.htmlType == "radio" && $dictType) 264 #elseif($column.htmlType == "radio" && $dictType)
259 - <el-form-item label="${comment}"> 265 + <el-form-item label="${comment}" prop="${field}">
260 <el-radio-group v-model="form.${field}"> 266 <el-radio-group v-model="form.${field}">
261 <el-radio label="1">请选择字典生成</el-radio> 267 <el-radio label="1">请选择字典生成</el-radio>
262 </el-radio-group> 268 </el-radio-group>
@@ -412,7 +418,7 @@ export default { @@ -412,7 +418,7 @@ export default {
412 #set($comment=$column.columnComment) 418 #set($comment=$column.columnComment)
413 #end 419 #end
414 $column.javaField: [ 420 $column.javaField: [
415 - { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } 421 + { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
416 ]#if($foreach.count != $columns.size()),#end 422 ]#if($foreach.count != $columns.size()),#end
417 #end 423 #end
418 #end 424 #end
@@ -456,9 +462,7 @@ export default { @@ -456,9 +462,7 @@ export default {
456 reset() { 462 reset() {
457 this.form = { 463 this.form = {
458 #foreach ($column in $columns) 464 #foreach ($column in $columns)
459 -#if($column.htmlType == "radio")  
460 - $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end  
461 -#elseif($column.htmlType == "checkbox") 465 +#if($column.htmlType == "checkbox")
462 $column.javaField: []#if($foreach.count != $columns.size()),#end 466 $column.javaField: []#if($foreach.count != $columns.size()),#end
463 #else 467 #else
464 $column.javaField: null#if($foreach.count != $columns.size()),#end 468 $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -174,11 +174,11 @@ @@ -174,11 +174,11 @@
174 <el-input v-model="form.${field}" placeholder="请输入${comment}" /> 174 <el-input v-model="form.${field}" placeholder="请输入${comment}" />
175 </el-form-item> 175 </el-form-item>
176 #elseif($column.htmlType == "imageUpload") 176 #elseif($column.htmlType == "imageUpload")
177 - <el-form-item label="${comment}"> 177 + <el-form-item label="${comment}" prop="${field}">
178 <image-upload v-model="form.${field}"/> 178 <image-upload v-model="form.${field}"/>
179 </el-form-item> 179 </el-form-item>
180 #elseif($column.htmlType == "fileUpload") 180 #elseif($column.htmlType == "fileUpload")
181 - <el-form-item label="${comment}"> 181 + <el-form-item label="${comment}" prop="${field}">
182 <file-upload v-model="form.${field}"/> 182 <file-upload v-model="form.${field}"/>
183 </el-form-item> 183 </el-form-item>
184 #elseif($column.htmlType == "editor") 184 #elseif($column.htmlType == "editor")
@@ -192,8 +192,11 @@ @@ -192,8 +192,11 @@
192 v-for="dict in ${dictType}" 192 v-for="dict in ${dictType}"
193 :key="dict.value" 193 :key="dict.value"
194 :label="dict.label" 194 :label="dict.label"
195 - #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end  
196 - 195 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  196 + :value="parseInt(dict.value)"
  197 +#else
  198 + :value="dict.value"
  199 +#end
197 ></el-option> 200 ></el-option>
198 </el-select> 201 </el-select>
199 </el-form-item> 202 </el-form-item>
@@ -204,7 +207,7 @@ @@ -204,7 +207,7 @@
204 </el-select> 207 </el-select>
205 </el-form-item> 208 </el-form-item>
206 #elseif($column.htmlType == "checkbox" && "" != $dictType) 209 #elseif($column.htmlType == "checkbox" && "" != $dictType)
207 - <el-form-item label="${comment}"> 210 + <el-form-item label="${comment}" prop="${field}">
208 <el-checkbox-group v-model="form.${field}"> 211 <el-checkbox-group v-model="form.${field}">
209 <el-checkbox 212 <el-checkbox
210 v-for="dict in ${dictType}" 213 v-for="dict in ${dictType}"
@@ -215,24 +218,27 @@ @@ -215,24 +218,27 @@
215 </el-checkbox-group> 218 </el-checkbox-group>
216 </el-form-item> 219 </el-form-item>
217 #elseif($column.htmlType == "checkbox" && $dictType) 220 #elseif($column.htmlType == "checkbox" && $dictType)
218 - <el-form-item label="${comment}"> 221 + <el-form-item label="${comment}" prop="${field}">
219 <el-checkbox-group v-model="form.${field}"> 222 <el-checkbox-group v-model="form.${field}">
220 <el-checkbox>请选择字典生成</el-checkbox> 223 <el-checkbox>请选择字典生成</el-checkbox>
221 </el-checkbox-group> 224 </el-checkbox-group>
222 </el-form-item> 225 </el-form-item>
223 #elseif($column.htmlType == "radio" && "" != $dictType) 226 #elseif($column.htmlType == "radio" && "" != $dictType)
224 - <el-form-item label="${comment}"> 227 + <el-form-item label="${comment}" prop="${field}">
225 <el-radio-group v-model="form.${field}"> 228 <el-radio-group v-model="form.${field}">
226 <el-radio 229 <el-radio
227 v-for="dict in ${dictType}" 230 v-for="dict in ${dictType}"
228 :key="dict.value" 231 :key="dict.value"
229 - #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end  
230 - 232 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  233 + :label="parseInt(dict.value)"
  234 +#else
  235 + :label="dict.value"
  236 +#end
231 >{{dict.label}}</el-radio> 237 >{{dict.label}}</el-radio>
232 </el-radio-group> 238 </el-radio-group>
233 </el-form-item> 239 </el-form-item>
234 #elseif($column.htmlType == "radio" && $dictType) 240 #elseif($column.htmlType == "radio" && $dictType)
235 - <el-form-item label="${comment}"> 241 + <el-form-item label="${comment}" prop="${field}">
236 <el-radio-group v-model="form.${field}"> 242 <el-radio-group v-model="form.${field}">
237 <el-radio label="1">请选择字典生成</el-radio> 243 <el-radio label="1">请选择字典生成</el-radio>
238 </el-radio-group> 244 </el-radio-group>
@@ -308,7 +314,7 @@ const data = reactive({ @@ -308,7 +314,7 @@ const data = reactive({
308 #set($comment=$column.columnComment) 314 #set($comment=$column.columnComment)
309 #end 315 #end
310 $column.javaField: [ 316 $column.javaField: [
311 - { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } 317 + { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
312 ]#if($foreach.count != $columns.size()),#end 318 ]#if($foreach.count != $columns.size()),#end
313 #end 319 #end
314 #end 320 #end
@@ -361,10 +367,7 @@ function cancel() { @@ -361,10 +367,7 @@ function cancel() {
361 function reset() { 367 function reset() {
362 form.value = { 368 form.value = {
363 #foreach ($column in $columns) 369 #foreach ($column in $columns)
364 -#if($column.htmlType == "radio")  
365 - $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end  
366 -  
367 -#elseif($column.htmlType == "checkbox") 370 +#if($column.htmlType == "checkbox")
368 $column.javaField: []#if($foreach.count != $columns.size()),#end 371 $column.javaField: []#if($foreach.count != $columns.size()),#end
369 #else 372 #else
370 $column.javaField: null#if($foreach.count != $columns.size()),#end 373 $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -181,11 +181,11 @@ @@ -181,11 +181,11 @@
181 <el-input v-model="form.${field}" placeholder="请输入${comment}" /> 181 <el-input v-model="form.${field}" placeholder="请输入${comment}" />
182 </el-form-item> 182 </el-form-item>
183 #elseif($column.htmlType == "imageUpload") 183 #elseif($column.htmlType == "imageUpload")
184 - <el-form-item label="${comment}"> 184 + <el-form-item label="${comment}" prop="${field}">
185 <image-upload v-model="form.${field}"/> 185 <image-upload v-model="form.${field}"/>
186 </el-form-item> 186 </el-form-item>
187 #elseif($column.htmlType == "fileUpload") 187 #elseif($column.htmlType == "fileUpload")
188 - <el-form-item label="${comment}"> 188 + <el-form-item label="${comment}" prop="${field}">
189 <file-upload v-model="form.${field}"/> 189 <file-upload v-model="form.${field}"/>
190 </el-form-item> 190 </el-form-item>
191 #elseif($column.htmlType == "editor") 191 #elseif($column.htmlType == "editor")
@@ -199,8 +199,11 @@ @@ -199,8 +199,11 @@
199 v-for="dict in ${dictType}" 199 v-for="dict in ${dictType}"
200 :key="dict.value" 200 :key="dict.value"
201 :label="dict.label" 201 :label="dict.label"
202 - #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end  
203 - 202 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  203 + :value="parseInt(dict.value)"
  204 +#else
  205 + :value="dict.value"
  206 +#end
204 ></el-option> 207 ></el-option>
205 </el-select> 208 </el-select>
206 </el-form-item> 209 </el-form-item>
@@ -211,7 +214,7 @@ @@ -211,7 +214,7 @@
211 </el-select> 214 </el-select>
212 </el-form-item> 215 </el-form-item>
213 #elseif($column.htmlType == "checkbox" && "" != $dictType) 216 #elseif($column.htmlType == "checkbox" && "" != $dictType)
214 - <el-form-item label="${comment}"> 217 + <el-form-item label="${comment}" prop="${field}">
215 <el-checkbox-group v-model="form.${field}"> 218 <el-checkbox-group v-model="form.${field}">
216 <el-checkbox 219 <el-checkbox
217 v-for="dict in ${dictType}" 220 v-for="dict in ${dictType}"
@@ -222,24 +225,27 @@ @@ -222,24 +225,27 @@
222 </el-checkbox-group> 225 </el-checkbox-group>
223 </el-form-item> 226 </el-form-item>
224 #elseif($column.htmlType == "checkbox" && $dictType) 227 #elseif($column.htmlType == "checkbox" && $dictType)
225 - <el-form-item label="${comment}"> 228 + <el-form-item label="${comment}" prop="${field}">
226 <el-checkbox-group v-model="form.${field}"> 229 <el-checkbox-group v-model="form.${field}">
227 <el-checkbox>请选择字典生成</el-checkbox> 230 <el-checkbox>请选择字典生成</el-checkbox>
228 </el-checkbox-group> 231 </el-checkbox-group>
229 </el-form-item> 232 </el-form-item>
230 #elseif($column.htmlType == "radio" && "" != $dictType) 233 #elseif($column.htmlType == "radio" && "" != $dictType)
231 - <el-form-item label="${comment}"> 234 + <el-form-item label="${comment}" prop="${field}">
232 <el-radio-group v-model="form.${field}"> 235 <el-radio-group v-model="form.${field}">
233 <el-radio 236 <el-radio
234 v-for="dict in ${dictType}" 237 v-for="dict in ${dictType}"
235 :key="dict.value" 238 :key="dict.value"
236 - #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end  
237 - 239 +#if($column.javaType == "Integer" || $column.javaType == "Long")
  240 + :label="parseInt(dict.value)"
  241 +#else
  242 + :label="dict.value"
  243 +#end
238 >{{dict.label}}</el-radio> 244 >{{dict.label}}</el-radio>
239 </el-radio-group> 245 </el-radio-group>
240 </el-form-item> 246 </el-form-item>
241 #elseif($column.htmlType == "radio" && $dictType) 247 #elseif($column.htmlType == "radio" && $dictType)
242 - <el-form-item label="${comment}"> 248 + <el-form-item label="${comment}" prop="${field}">
243 <el-radio-group v-model="form.${field}"> 249 <el-radio-group v-model="form.${field}">
244 <el-radio label="1">请选择字典生成</el-radio> 250 <el-radio label="1">请选择字典生成</el-radio>
245 </el-radio-group> 251 </el-radio-group>
@@ -388,7 +394,7 @@ const data = reactive({ @@ -388,7 +394,7 @@ const data = reactive({
388 #set($comment=$column.columnComment) 394 #set($comment=$column.columnComment)
389 #end 395 #end
390 $column.javaField: [ 396 $column.javaField: [
391 - { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } 397 + { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
392 ]#if($foreach.count != $columns.size()),#end 398 ]#if($foreach.count != $columns.size()),#end
393 #end 399 #end
394 #end 400 #end
@@ -432,9 +438,7 @@ function cancel() { @@ -432,9 +438,7 @@ function cancel() {
432 function reset() { 438 function reset() {
433 form.value = { 439 form.value = {
434 #foreach ($column in $columns) 440 #foreach ($column in $columns)
435 -#if($column.htmlType == "radio")  
436 - $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end  
437 -#elseif($column.htmlType == "checkbox") 441 +#if($column.htmlType == "checkbox")
438 $column.javaField: []#if($foreach.count != $columns.size()),#end 442 $column.javaField: []#if($foreach.count != $columns.size()),#end
439 #else 443 #else
440 $column.javaField: null#if($foreach.count != $columns.size()),#end 444 $column.javaField: null#if($foreach.count != $columns.size()),#end