wms / wms4_hh · Commits

Commit 56ab403506efc28f99c9802dfa81562fbe259169

Authored by zhangdaiscott
1 parent 526a40b7
master ... develop

【issues/I4ZRF3】代码生成器componentProps{}后面少一个逗号

Inline Side-by-side
Showing 17 changed files with 139 additions and 139 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -204,7 +204,7 @@ export const formSchema: FormSchema[] = [
204 204 fieldConfig:${po.dictField},
205 205 multi:${po.extendParams.popupMulti?c},
206 206 }
207   - }
  207 + },
208 208 <#elseif po.classType =='sel_depart'>
209 209 component: 'JSelectDept',
210 210 <#elseif po.classType =='switch'>
... ... @@ -213,7 +213,7 @@ export const formSchema: FormSchema[] = [
213 213 <#if po.dictField != 'is_open'>
214 214 options:${po.dictField}
215 215 </#if>
216   - }
  216 + },
217 217 <#elseif po.classType =='pca'>
218 218 component: 'JAreaLinkage',
219 219 <#elseif po.classType =='markdown'>
... ... @@ -224,30 +224,30 @@ export const formSchema: FormSchema[] = [
224 224 component: 'JSelectUserByDept',
225 225 componentProps:{
226 226 labelKey:'realname',
227   - }
  227 + },
228 228 <#elseif po.classType =='textarea'>
229 229 component: 'InputTextArea',//TODO 注意string转换问题
230 230 <#elseif po.classType=='list' || po.classType=='radio'>
231 231 component: 'JDictSelectTag',
232 232 componentProps:{
233 233 dictCode:"${form_field_dictCode}"
234   - }
  234 + },
235 235 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
236 236 component: 'JMultiSelectTag',//TODO 暂无该组件
237 237 componentProps:{
238 238 dictCode:"${form_field_dictCode}"
239   - }
  239 + },
240 240 <#elseif po.classType=='sel_search'>
241 241 component: 'JSearchSelect',
242 242 componentProps:{
243 243 dict:"${form_field_dictCode}"
244   - }
  244 + },
245 245 <#elseif po.classType=='cat_tree'>
246 246 <#assign form_cat_tree = true>
247 247 component: 'JCategorySelect',
248 248 componentProps:{
249 249 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
250   - }
  250 + },
251 251 <#if po.dictText?default("")?trim?length gt 1>
252 252 <#assign form_cat_back = "${po.dictText}">
253 253 </#if>
... ... @@ -259,14 +259,14 @@ export const formSchema: FormSchema[] = [
259 259 <#if po.uploadnum??>
260 260 maxCount:${po.uploadnum}
261 261 </#if>
262   - }
  262 + },
263 263 <#elseif po.classType=='image'>
264 264 component: 'JImageUpload',
265 265 componentProps:{
266 266 <#if po.uploadnum??>
267 267 fileMax:${po.uploadnum}
268 268 </#if>
269   - }
  269 + },
270 270 <#elseif po.classType=='umeditor'>
271 271 component: 'JCodeEditor', //TODO String后缀暂未添加
272 272 <#elseif po.classType == 'sel_tree'>
... ... @@ -282,7 +282,7 @@ export const formSchema: FormSchema[] = [
282 282 </#if>
283 283 </#if>
284 284 pidValue:"${po.dictField}",
285   - }
  285 + },
286 286 <#else>
287 287 component: 'Input',
288 288 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -55,7 +55,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
55 55 }
56 56  
57 57 @Override
58   - @Transactional
  58 + @Transactional(rollbackFor = Exception.class)
59 59 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
60 60 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
61 61  
... ... @@ -83,7 +83,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
83 83 }
84 84  
85 85 @Override
86   - @Transactional
  86 + @Transactional(rollbackFor = Exception.class)
87 87 public void delMain(String id) {
88 88 <#list subTables as sub>
89 89 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -92,7 +92,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
92 92 }
93 93  
94 94 @Override
95   - @Transactional
  95 + @Transactional(rollbackFor = Exception.class)
96 96 public void delBatchMain(Collection<? extends Serializable> idList) {
97 97 for(Serializable id:idList) {
98 98 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -204,7 +204,7 @@ export const formSchema: FormSchema[] = [
204 204 fieldConfig:${po.dictField},
205 205 multi:${po.extendParams.popupMulti?c},
206 206 }
207   - }
  207 + },
208 208 <#elseif po.classType =='sel_depart'>
209 209 component: 'JSelectDept',
210 210 <#elseif po.classType =='switch'>
... ... @@ -213,7 +213,7 @@ export const formSchema: FormSchema[] = [
213 213 <#if po.dictField != 'is_open'>
214 214 options:${po.dictField}
215 215 </#if>
216   - }
  216 + },
217 217 <#elseif po.classType =='pca'>
218 218 component: 'JAreaLinkage',
219 219 <#elseif po.classType =='markdown'>
... ... @@ -224,30 +224,30 @@ export const formSchema: FormSchema[] = [
224 224 component: 'JSelectUserByDept',
225 225 componentProps:{
226 226 labelKey:'realname',
227   - }
  227 + },
228 228 <#elseif po.classType =='textarea'>
229 229 component: 'InputTextArea',//TODO 注意string转换问题
230 230 <#elseif po.classType=='list' || po.classType=='radio'>
231 231 component: 'JDictSelectTag',
232 232 componentProps:{
233 233 dictCode:"${form_field_dictCode}"
234   - }
  234 + },
235 235 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
236 236 component: 'JMultiSelectTag',//TODO 暂无该组件
237 237 componentProps:{
238 238 dictCode:"${form_field_dictCode}"
239   - }
  239 + },
240 240 <#elseif po.classType=='sel_search'>
241 241 component: 'JSearchSelect',
242 242 componentProps:{
243 243 dict:"${form_field_dictCode}"
244   - }
  244 + },
245 245 <#elseif po.classType=='cat_tree'>
246 246 <#assign form_cat_tree = true>
247 247 component: 'JCategorySelect',
248 248 componentProps:{
249 249 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
250   - }
  250 + },
251 251 <#if po.dictText?default("")?trim?length gt 1>
252 252 <#assign form_cat_back = "${po.dictText}">
253 253 </#if>
... ... @@ -259,14 +259,14 @@ export const formSchema: FormSchema[] = [
259 259 <#if po.uploadnum??>
260 260 maxCount:${po.uploadnum}
261 261 </#if>
262   - }
  262 + },
263 263 <#elseif po.classType=='image'>
264 264 component: 'JImageUpload',
265 265 componentProps:{
266 266 <#if po.uploadnum??>
267 267 fileMax:${po.uploadnum}
268 268 </#if>
269   - }
  269 + },
270 270 <#elseif po.classType=='umeditor'>
271 271 component: 'JCodeEditor', //TODO String后缀暂未添加
272 272 <#elseif po.classType == 'sel_tree'>
... ... @@ -282,7 +282,7 @@ export const formSchema: FormSchema[] = [
282 282 </#if>
283 283 </#if>
284 284 pidValue:"${po.dictField}",
285   - }
  285 + },
286 286 <#else>
287 287 component: 'Input',
288 288 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void delMain(String id) {
39 39 <#list subTables as sub>
40 40 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -43,7 +43,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
43 43 }
44 44  
45 45 @Override
46   - @Transactional
  46 + @Transactional(rollbackFor = Exception.class)
47 47 public void delBatchMain(Collection<? extends Serializable> idList) {
48 48 for(Serializable id:idList) {
49 49 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -202,7 +202,7 @@ export const formSchema: FormSchema[] = [
202 202 fieldConfig:${po.dictField},
203 203 multi:${po.extendParams.popupMulti?c},
204 204 }
205   - }
  205 + },
206 206 <#elseif po.classType =='sel_depart'>
207 207 component: 'JSelectDept',
208 208 <#elseif po.classType =='switch'>
... ... @@ -211,7 +211,7 @@ export const formSchema: FormSchema[] = [
211 211 <#if po.dictField != 'is_open'>
212 212 options:${po.dictField}
213 213 </#if>
214   - }
  214 + },
215 215 <#elseif po.classType =='pca'>
216 216 component: 'JAreaLinkage',
217 217 <#elseif po.classType =='markdown'>
... ... @@ -222,30 +222,30 @@ export const formSchema: FormSchema[] = [
222 222 component: 'JSelectUserByDept',
223 223 componentProps:{
224 224 labelKey:'realname',
225   - }
  225 + },
226 226 <#elseif po.classType =='textarea'>
227 227 component: 'InputTextArea',//TODO 注意string转换问题
228 228 <#elseif po.classType=='list' || po.classType=='radio'>
229 229 component: 'JDictSelectTag',
230 230 componentProps:{
231 231 dictCode:"${form_field_dictCode}"
232   - }
  232 + },
233 233 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
234 234 component: 'JMultiSelectTag',//TODO 暂无该组件
235 235 componentProps:{
236 236 dictCode:"${form_field_dictCode}"
237   - }
  237 + },
238 238 <#elseif po.classType=='sel_search'>
239 239 component: 'JSearchSelect',
240 240 componentProps:{
241 241 dict:"${form_field_dictCode}"
242   - }
  242 + },
243 243 <#elseif po.classType=='cat_tree'>
244 244 <#assign form_cat_tree = true>
245 245 component: 'JCategorySelect',
246 246 componentProps:{
247 247 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
248   - }
  248 + },
249 249 <#if po.dictText?default("")?trim?length gt 1>
250 250 <#assign form_cat_back = "${po.dictText}">
251 251 </#if>
... ... @@ -257,14 +257,14 @@ export const formSchema: FormSchema[] = [
257 257 <#if po.uploadnum??>
258 258 maxCount:${po.uploadnum}
259 259 </#if>
260   - }
  260 + },
261 261 <#elseif po.classType=='image'>
262 262 component: 'JImageUpload',
263 263 componentProps:{
264 264 <#if po.uploadnum??>
265 265 fileMax:${po.uploadnum}
266 266 </#if>
267   - }
  267 + },
268 268 <#elseif po.classType=='umeditor'>
269 269 component: 'JCodeEditor', //TODO String后缀暂未添加
270 270 <#elseif po.classType == 'sel_tree'>
... ... @@ -280,7 +280,7 @@ export const formSchema: FormSchema[] = [
280 280 </#if>
281 281 </#if>
282 282 pidValue:"${po.dictField}",
283   - }
  283 + },
284 284 <#else>
285 285 component: 'Input',
286 286 </#if>
... ... @@ -344,7 +344,7 @@ export const formSchema: FormSchema[] = [
344 344 },
345 345 </#if>
346 346 <#if po.readonly=='Y'>
347   - dynamicDisabled:true
  347 + dynamicDisabled:true,
348 348 </#if>
349 349 },
350 350 </#if>
... ... @@ -450,7 +450,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
450 450 fieldConfig:${po.dictField},
451 451 multi:${po.extendParams.popupMulti?c},
452 452 }
453   - }
  453 + },
454 454 <#elseif po.classType =='sel_depart'>
455 455 component: 'JSelectDept',
456 456 <#elseif po.classType =='switch'>
... ... @@ -459,7 +459,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
459 459 <#if po.dictField != 'is_open'>
460 460 options:${po.dictField}
461 461 </#if>
462   - }
  462 + },
463 463 <#elseif po.classType =='pca'>
464 464 component: 'JAreaLinkage',
465 465 <#elseif po.classType =='markdown'>
... ... @@ -470,30 +470,30 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
470 470 component: 'JSelectUserByDept',
471 471 componentProps:{
472 472 labelKey:'realname',
473   - }
  473 + },
474 474 <#elseif po.classType =='textarea'>
475 475 component: 'InputTextArea',//TODO 注意string转换问题
476 476 <#elseif po.classType=='list' || po.classType=='radio'>
477 477 component: 'JDictSelectTag',
478 478 componentProps:{
479 479 dictCode:"${form_field_dictCode}"
480   - }
  480 + },
481 481 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
482 482 component: 'JMultiSelectTag',//TODO 暂无该组件
483 483 componentProps:{
484 484 dictCode:"${form_field_dictCode}"
485   - }
  485 + },
486 486 <#elseif po.classType=='sel_search'>
487 487 component: 'JSearchSelect',
488 488 componentProps:{
489 489 dict:"${form_field_dictCode}"
490   - }
  490 + },
491 491 <#elseif po.classType=='cat_tree'>
492 492 <#assign form_cat_tree = true>
493 493 component: 'JCategorySelect',
494 494 componentProps:{
495 495 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
496   - }
  496 + },
497 497 <#if po.dictText?default("")?trim?length gt 1>
498 498 <#assign form_cat_back = "${po.dictText}">
499 499 </#if>
... ... @@ -505,14 +505,14 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
505 505 <#if po.uploadnum??>
506 506 maxCount:${po.uploadnum}
507 507 </#if>
508   - }
  508 + },
509 509 <#elseif po.classType=='image'>
510 510 component: 'JImageUpload',
511 511 componentProps:{
512 512 <#if po.uploadnum??>
513 513 fileMax:${po.uploadnum}
514 514 </#if>
515   - }
  515 + },
516 516 <#elseif po.classType=='umeditor'>
517 517 component: 'JCodeEditor', //TODO String后缀暂未添加
518 518 <#elseif po.classType == 'sel_tree'>
... ... @@ -528,7 +528,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
528 528 </#if>
529 529 </#if>
530 530 pidValue:"${po.dictField}",
531   - }
  531 + },
532 532 <#else>
533 533 component: 'Input',
534 534 </#if>
... ... @@ -592,7 +592,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
592 592 },
593 593 </#if>
594 594 <#if po.readonly=='Y'>
595   - dynamicDisabled:true
  595 + dynamicDisabled:true,
596 596 </#if>
597 597 },
598 598 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -55,7 +55,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
55 55 }
56 56  
57 57 @Override
58   - @Transactional
  58 + @Transactional(rollbackFor = Exception.class)
59 59 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
60 60 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
61 61  
... ... @@ -83,7 +83,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
83 83 }
84 84  
85 85 @Override
86   - @Transactional
  86 + @Transactional(rollbackFor = Exception.class)
87 87 public void delMain(String id) {
88 88 <#list subTables as sub>
89 89 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -92,7 +92,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
92 92 }
93 93  
94 94 @Override
95   - @Transactional
  95 + @Transactional(rollbackFor = Exception.class)
96 96 public void delBatchMain(Collection<? extends Serializable> idList) {
97 97 for(Serializable id:idList) {
98 98 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -205,7 +205,7 @@ export const formSchema: FormSchema[] = [
205 205 fieldConfig:${po.dictField},
206 206 multi:${po.extendParams.popupMulti?c},
207 207 }
208   - }
  208 + },
209 209 <#elseif po.classType =='sel_depart'>
210 210 component: 'JSelectDept',
211 211 <#elseif po.classType =='switch'>
... ... @@ -214,7 +214,7 @@ export const formSchema: FormSchema[] = [
214 214 <#if po.dictField != 'is_open'>
215 215 options:${po.dictField}
216 216 </#if>
217   - }
  217 + },
218 218 <#elseif po.classType =='pca'>
219 219 component: 'JAreaLinkage',
220 220 <#elseif po.classType =='markdown'>
... ... @@ -225,30 +225,30 @@ export const formSchema: FormSchema[] = [
225 225 component: 'JSelectUserByDept',
226 226 componentProps:{
227 227 labelKey:'realname',
228   - }
  228 + },
229 229 <#elseif po.classType =='textarea'>
230 230 component: 'InputTextArea',//TODO 注意string转换问题
231 231 <#elseif po.classType=='list' || po.classType=='radio'>
232 232 component: 'JDictSelectTag',
233 233 componentProps:{
234 234 dictCode:"${form_field_dictCode}"
235   - }
  235 + },
236 236 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
237 237 component: 'JMultiSelectTag',//TODO 暂无该组件
238 238 componentProps:{
239 239 dictCode:"${form_field_dictCode}"
240   - }
  240 + },
241 241 <#elseif po.classType=='sel_search'>
242 242 component: 'JSearchSelect',
243 243 componentProps:{
244 244 dict:"${form_field_dictCode}"
245   - }
  245 + },
246 246 <#elseif po.classType=='cat_tree'>
247 247 <#assign form_cat_tree = true>
248 248 component: 'JCategorySelect',
249 249 componentProps:{
250 250 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
251   - }
  251 + },
252 252 <#if po.dictText?default("")?trim?length gt 1>
253 253 <#assign form_cat_back = "${po.dictText}">
254 254 </#if>
... ... @@ -260,14 +260,14 @@ export const formSchema: FormSchema[] = [
260 260 <#if po.uploadnum??>
261 261 maxCount:${po.uploadnum}
262 262 </#if>
263   - }
  263 + },
264 264 <#elseif po.classType=='image'>
265 265 component: 'JImageUpload',
266 266 componentProps:{
267 267 <#if po.uploadnum??>
268 268 fileMax:${po.uploadnum}
269 269 </#if>
270   - }
  270 + },
271 271 <#elseif po.classType=='umeditor'>
272 272 component: 'JCodeEditor', //TODO String后缀暂未添加
273 273 <#elseif po.classType == 'sel_tree'>
... ... @@ -283,7 +283,7 @@ export const formSchema: FormSchema[] = [
283 283 </#if>
284 284 </#if>
285 285 pidValue:"${po.dictField}",
286   - }
  286 + },
287 287 <#else>
288 288 component: 'Input',
289 289 </#if>
... ... @@ -456,7 +456,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
456 456 fieldConfig:${po.dictField},
457 457 multi:${po.extendParams.popupMulti?c},
458 458 }
459   - }
  459 + },
460 460 <#elseif po.classType =='sel_depart'>
461 461 component: 'JSelectDept',
462 462 <#elseif po.classType =='switch'>
... ... @@ -465,7 +465,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
465 465 <#if po.dictField != 'is_open'>
466 466 options:${po.dictField}
467 467 </#if>
468   - }
  468 + },
469 469 <#elseif po.classType =='pca'>
470 470 component: 'JAreaLinkage',
471 471 <#elseif po.classType =='markdown'>
... ... @@ -476,30 +476,30 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
476 476 component: 'JSelectUserByDept',
477 477 componentProps:{
478 478 labelKey:'realname',
479   - }
  479 + },
480 480 <#elseif po.classType =='textarea'>
481 481 component: 'InputTextArea',//TODO 注意string转换问题
482 482 <#elseif po.classType=='list' || po.classType=='radio'>
483 483 component: 'JDictSelectTag',
484 484 componentProps:{
485 485 dictCode:"${form_field_dictCode}"
486   - }
  486 + },
487 487 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
488 488 component: 'JMultiSelectTag',//TODO 暂无该组件
489 489 componentProps:{
490 490 dictCode:"${form_field_dictCode}"
491   - }
  491 + },
492 492 <#elseif po.classType=='sel_search'>
493 493 component: 'JSearchSelect',
494 494 componentProps:{
495 495 dict:"${form_field_dictCode}"
496   - }
  496 + },
497 497 <#elseif po.classType=='cat_tree'>
498 498 <#assign form_cat_tree = true>
499 499 component: 'JCategorySelect',
500 500 componentProps:{
501 501 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
502   - }
  502 + },
503 503 <#if po.dictText?default("")?trim?length gt 1>
504 504 <#assign form_cat_back = "${po.dictText}">
505 505 </#if>
... ... @@ -511,14 +511,14 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
511 511 <#if po.uploadnum??>
512 512 maxCount:${po.uploadnum}
513 513 </#if>
514   - }
  514 + },
515 515 <#elseif po.classType=='image'>
516 516 component: 'JImageUpload',
517 517 componentProps:{
518 518 <#if po.uploadnum??>
519 519 fileMax:${po.uploadnum}
520 520 </#if>
521   - }
  521 + },
522 522 <#elseif po.classType=='umeditor'>
523 523 component: 'JCodeEditor', //TODO String后缀暂未添加
524 524 <#elseif po.classType == 'sel_tree'>
... ... @@ -534,7 +534,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
534 534 </#if>
535 535 </#if>
536 536 pidValue:"${po.dictField}",
537   - }
  537 + },
538 538 <#else>
539 539 component: 'Input',
540 540 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -55,7 +55,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
55 55 }
56 56  
57 57 @Override
58   - @Transactional
  58 + @Transactional(rollbackFor = Exception.class)
59 59 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
60 60 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
61 61  
... ... @@ -83,7 +83,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
83 83 }
84 84  
85 85 @Override
86   - @Transactional
  86 + @Transactional(rollbackFor = Exception.class)
87 87 public void delMain(String id) {
88 88 <#list subTables as sub>
89 89 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -92,7 +92,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
92 92 }
93 93  
94 94 @Override
95   - @Transactional
  95 + @Transactional(rollbackFor = Exception.class)
96 96 public void delBatchMain(Collection<? extends Serializable> idList) {
97 97 for(Serializable id:idList) {
98 98 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -205,7 +205,7 @@ export const formSchema: FormSchema[] = [
205 205 fieldConfig:${po.dictField},
206 206 multi:${po.extendParams.popupMulti?c},
207 207 }
208   - }
  208 + },
209 209 <#elseif po.classType =='sel_depart'>
210 210 component: 'JSelectDept',
211 211 <#elseif po.classType =='switch'>
... ... @@ -214,7 +214,7 @@ export const formSchema: FormSchema[] = [
214 214 <#if po.dictField != 'is_open'>
215 215 options:${po.dictField}
216 216 </#if>
217   - }
  217 + },
218 218 <#elseif po.classType =='pca'>
219 219 component: 'JAreaLinkage',
220 220 <#elseif po.classType =='markdown'>
... ... @@ -225,30 +225,30 @@ export const formSchema: FormSchema[] = [
225 225 component: 'JSelectUserByDept',
226 226 componentProps:{
227 227 labelKey:'realname',
228   - }
  228 + },
229 229 <#elseif po.classType =='textarea'>
230 230 component: 'InputTextArea',//TODO 注意string转换问题
231 231 <#elseif po.classType=='list' || po.classType=='radio'>
232 232 component: 'JDictSelectTag',
233 233 componentProps:{
234 234 dictCode:"${form_field_dictCode}"
235   - }
  235 + },
236 236 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
237 237 component: 'JMultiSelectTag',//TODO 暂无该组件
238 238 componentProps:{
239 239 dictCode:"${form_field_dictCode}"
240   - }
  240 + },
241 241 <#elseif po.classType=='sel_search'>
242 242 component: 'JSearchSelect',
243 243 componentProps:{
244 244 dict:"${form_field_dictCode}"
245   - }
  245 + },
246 246 <#elseif po.classType=='cat_tree'>
247 247 <#assign form_cat_tree = true>
248 248 component: 'JCategorySelect',
249 249 componentProps:{
250 250 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
251   - }
  251 + },
252 252 <#if po.dictText?default("")?trim?length gt 1>
253 253 <#assign form_cat_back = "${po.dictText}">
254 254 </#if>
... ... @@ -260,14 +260,14 @@ export const formSchema: FormSchema[] = [
260 260 <#if po.uploadnum??>
261 261 maxCount:${po.uploadnum}
262 262 </#if>
263   - }
  263 + },
264 264 <#elseif po.classType=='image'>
265 265 component: 'JImageUpload',
266 266 componentProps:{
267 267 <#if po.uploadnum??>
268 268 fileMax:${po.uploadnum}
269 269 </#if>
270   - }
  270 + },
271 271 <#elseif po.classType=='umeditor'>
272 272 component: 'JCodeEditor', //TODO String后缀暂未添加
273 273 <#elseif po.classType == 'sel_tree'>
... ... @@ -283,7 +283,7 @@ export const formSchema: FormSchema[] = [
283 283 </#if>
284 284 </#if>
285 285 pidValue:"${po.dictField}",
286   - }
  286 + },
287 287 <#else>
288 288 component: 'Input',
289 289 </#if>
... ... @@ -393,7 +393,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
393 393 fieldConfig:${po.dictField},
394 394 multi:${po.extendParams.popupMulti?c},
395 395 }
396   - }
  396 + },
397 397 <#elseif po.classType =='sel_depart'>
398 398 component: 'JSelectDept',
399 399 <#elseif po.classType =='switch'>
... ... @@ -402,7 +402,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
402 402 <#if po.dictField != 'is_open'>
403 403 options:${po.dictField}
404 404 </#if>
405   - }
  405 + },
406 406 <#elseif po.classType =='pca'>
407 407 component: 'JAreaLinkage',
408 408 <#elseif po.classType =='markdown'>
... ... @@ -413,14 +413,14 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
413 413 component: 'JSelectUserByDept',
414 414 componentProps:{
415 415 labelKey:'realname',
416   - }
  416 + },
417 417 <#elseif po.classType =='textarea'>
418 418 component: 'InputTextArea',//TODO 注意string转换问题
419 419 <#elseif po.classType=='list' || po.classType=='radio'>
420 420 component: 'JDictSelectTag',
421 421 componentProps:{
422 422 dictCode:"${form_field_dictCode}"
423   - }
  423 + },
424 424 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
425 425 component: 'JMultiSelectTag',//TODO 暂无该组件
426 426 componentProps:{
... ... @@ -430,13 +430,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
430 430 component: 'JSearchSelect',
431 431 componentProps:{
432 432 dict:"${form_field_dictCode}"
433   - }
  433 + },
434 434 <#elseif po.classType=='cat_tree'>
435 435 <#assign form_cat_tree = true>
436 436 component: 'JCategorySelect',
437 437 componentProps:{
438 438 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
439   - }
  439 + },
440 440 <#if po.dictText?default("")?trim?length gt 1>
441 441 <#assign form_cat_back = "${po.dictText}">
442 442 </#if>
... ... @@ -448,14 +448,14 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
448 448 <#if po.uploadnum??>
449 449 maxCount:${po.uploadnum}
450 450 </#if>
451   - }
  451 + },
452 452 <#elseif po.classType=='image'>
453 453 component: 'JImageUpload',
454 454 componentProps:{
455 455 <#if po.uploadnum??>
456 456 fileMax:${po.uploadnum}
457 457 </#if>
458   - }
  458 + },
459 459 <#elseif po.classType=='umeditor'>
460 460 component: 'JCodeEditor', //TODO String后缀暂未添加
461 461 <#elseif po.classType == 'sel_tree'>
... ... @@ -471,7 +471,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
471 471 </#if>
472 472 </#if>
473 473 pidValue:"${po.dictField}",
474   - }
  474 + },
475 475 <#else>
476 476 component: 'Input',
477 477 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -55,7 +55,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
55 55 }
56 56  
57 57 @Override
58   - @Transactional
  58 + @Transactional(rollbackFor = Exception.class)
59 59 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
60 60 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
61 61  
... ... @@ -83,7 +83,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
83 83 }
84 84  
85 85 @Override
86   - @Transactional
  86 + @Transactional(rollbackFor = Exception.class)
87 87 public void delMain(String id) {
88 88 <#list subTables as sub>
89 89 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -92,7 +92,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
92 92 }
93 93  
94 94 @Override
95   - @Transactional
  95 + @Transactional(rollbackFor = Exception.class)
96 96 public void delBatchMain(Collection<? extends Serializable> idList) {
97 97 for(Serializable id:idList) {
98 98 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -205,7 +205,7 @@ export const formSchema: FormSchema[] = [
205 205 fieldConfig:${po.dictField},
206 206 multi:${po.extendParams.popupMulti?c},
207 207 }
208   - }
  208 + },
209 209 <#elseif po.classType =='sel_depart'>
210 210 component: 'JSelectDept',
211 211 <#elseif po.classType =='switch'>
... ... @@ -214,7 +214,7 @@ export const formSchema: FormSchema[] = [
214 214 <#if po.dictField != 'is_open'>
215 215 options:${po.dictField}
216 216 </#if>
217   - }
  217 + },
218 218 <#elseif po.classType =='pca'>
219 219 component: 'JAreaLinkage',
220 220 <#elseif po.classType =='markdown'>
... ... @@ -225,30 +225,30 @@ export const formSchema: FormSchema[] = [
225 225 component: 'JSelectUserByDept',
226 226 componentProps:{
227 227 labelKey:'realname',
228   - }
  228 + },
229 229 <#elseif po.classType =='textarea'>
230 230 component: 'InputTextArea',//TODO 注意string转换问题
231 231 <#elseif po.classType=='list' || po.classType=='radio'>
232 232 component: 'JDictSelectTag',
233 233 componentProps:{
234 234 dictCode:"${form_field_dictCode}"
235   - }
  235 + },
236 236 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
237 237 component: 'JMultiSelectTag',//TODO 暂无该组件
238 238 componentProps:{
239 239 dictCode:"${form_field_dictCode}"
240   - }
  240 + },
241 241 <#elseif po.classType=='sel_search'>
242 242 component: 'JSearchSelect',
243 243 componentProps:{
244 244 dict:"${form_field_dictCode}"
245   - }
  245 + },
246 246 <#elseif po.classType=='cat_tree'>
247 247 <#assign form_cat_tree = true>
248 248 component: 'JCategorySelect',
249 249 componentProps:{
250 250 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
251   - }
  251 + },
252 252 <#if po.dictText?default("")?trim?length gt 1>
253 253 <#assign form_cat_back = "${po.dictText}">
254 254 </#if>
... ... @@ -260,14 +260,14 @@ export const formSchema: FormSchema[] = [
260 260 <#if po.uploadnum??>
261 261 maxCount:${po.uploadnum}
262 262 </#if>
263   - }
  263 + },
264 264 <#elseif po.classType=='image'>
265 265 component: 'JImageUpload',
266 266 componentProps:{
267 267 <#if po.uploadnum??>
268 268 fileMax:${po.uploadnum}
269 269 </#if>
270   - }
  270 + },
271 271 <#elseif po.classType=='umeditor'>
272 272 component: 'JCodeEditor', //TODO String后缀暂未添加
273 273 <#elseif po.classType == 'sel_tree'>
... ... @@ -283,7 +283,7 @@ export const formSchema: FormSchema[] = [
283 283 </#if>
284 284 </#if>
285 285 pidValue:"${po.dictField}",
286   - }
  286 + },
287 287 <#else>
288 288 component: 'Input',
289 289 </#if>
... ... @@ -393,7 +393,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
393 393 fieldConfig:${po.dictField},
394 394 multi:${po.extendParams.popupMulti?c},
395 395 }
396   - }
  396 + },
397 397 <#elseif po.classType =='sel_depart'>
398 398 component: 'JSelectDept',
399 399 <#elseif po.classType =='switch'>
... ... @@ -402,7 +402,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
402 402 <#if po.dictField != 'is_open'>
403 403 options:${po.dictField}
404 404 </#if>
405   - }
  405 + },
406 406 <#elseif po.classType =='pca'>
407 407 component: 'JAreaLinkage',
408 408 <#elseif po.classType =='markdown'>
... ... @@ -413,30 +413,30 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
413 413 component: 'JSelectUserByDept',
414 414 componentProps:{
415 415 labelKey:'realname',
416   - }
  416 + },
417 417 <#elseif po.classType =='textarea'>
418 418 component: 'InputTextArea',//TODO 注意string转换问题
419 419 <#elseif po.classType=='list' || po.classType=='radio'>
420 420 component: 'JDictSelectTag',
421 421 componentProps:{
422 422 dictCode:"${form_field_dictCode}"
423   - }
  423 + },
424 424 <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
425 425 component: 'JMultiSelectTag',//TODO 暂无该组件
426 426 componentProps:{
427 427 dictCode:"${form_field_dictCode}"
428   - }
  428 + },
429 429 <#elseif po.classType=='sel_search'>
430 430 component: 'JSearchSelect',
431 431 componentProps:{
432 432 dict:"${form_field_dictCode}"
433   - }
  433 + },
434 434 <#elseif po.classType=='cat_tree'>
435 435 <#assign form_cat_tree = true>
436 436 component: 'JCategorySelect',
437 437 componentProps:{
438 438 pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
439   - }
  439 + },
440 440 <#if po.dictText?default("")?trim?length gt 1>
441 441 <#assign form_cat_back = "${po.dictText}">
442 442 </#if>
... ... @@ -448,14 +448,14 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
448 448 <#if po.uploadnum??>
449 449 maxCount:${po.uploadnum}
450 450 </#if>
451   - }
  451 + },
452 452 <#elseif po.classType=='image'>
453 453 component: 'JImageUpload',
454 454 componentProps:{
455 455 <#if po.uploadnum??>
456 456 fileMax:${po.uploadnum}
457 457 </#if>
458   - }
  458 + },
459 459 <#elseif po.classType=='umeditor'>
460 460 component: 'JCodeEditor', //TODO String后缀暂未添加
461 461 <#elseif po.classType == 'sel_tree'>
... ... @@ -471,7 +471,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
471 471 </#if>
472 472 </#if>
473 473 pidValue:"${po.dictField}",
474   - }
  474 + },
475 475 <#else>
476 476 component: 'Input',
477 477 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -50,12 +50,12 @@ export const formSchema: FormSchema[] = [
50 50 valueFormat: 'YYYY-MM-DD hh:mm:ss',
51 51 },
52 52 <#elseif "int,decimal,double,"?contains(po.fieldType)>
53   - component: 'InputNumber'
  53 + component: 'InputNumber',
54 54 <#else>
55   - component: 'Input'
  55 + component: 'Input',
56 56 </#if>
57 57 <#if po.fieldName =='id'><#rt/>
58   - show:false
  58 + show:false,
59 59 </#if>
60 60 },
61 61 </#list>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -50,12 +50,12 @@ export const formSchema: FormSchema[] = [
50 50 valueFormat: 'YYYY-MM-DD hh:mm:ss',
51 51 },
52 52 <#elseif "int,decimal,double,"?contains(po.fieldType)>
53   - component: 'InputNumber'
  53 + component: 'InputNumber',
54 54 <#else>
55   - component: 'Input'
  55 + component: 'Input',
56 56 </#if>
57 57 <#if po.fieldName =='id'><#rt/>
58   - show:false
  58 + show:false,
59 59 </#if>
60 60 },
61 61 </#list>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -53,7 +53,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
53 53 }
54 54  
55 55 @Override
56   - @Transactional
  56 + @Transactional(rollbackFor = Exception.class)
57 57 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
58 58 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
59 59  
... ... @@ -79,7 +79,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
79 79 }
80 80  
81 81 @Override
82   - @Transactional
  82 + @Transactional(rollbackFor = Exception.class)
83 83 public void delMain(String id) {
84 84 <#list subTables as sub>
85 85 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -88,7 +88,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
88 88 }
89 89  
90 90 @Override
91   - @Transactional
  91 + @Transactional(rollbackFor = Exception.class)
92 92 public void delBatchMain(Collection<? extends Serializable> idList) {
93 93 for(Serializable id:idList) {
94 94 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -59,12 +59,12 @@ export const formSchema: FormSchema[] = [
59 59 valueFormat: 'YYYY-MM-DD hh:mm:ss',
60 60 },
61 61 <#elseif "int,decimal,double,"?contains(po.fieldType)>
62   - component: 'InputNumber'
  62 + component: 'InputNumber',
63 63 <#else>
64   - component: 'Input'
  64 + component: 'Input',
65 65 </#if>
66 66 <#if po.fieldName =='id'><#rt/>
67   - show:false
  67 + show:false,
68 68 </#if>
69 69 },
70 70 </#list>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  View file @56ab403
... ... @@ -34,7 +34,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
34 34 </#list>
35 35  
36 36 @Override
37   - @Transactional
  37 + @Transactional(rollbackFor = Exception.class)
38 38 public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
39 39 ${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
40 40 <#list subTables as sub>
... ... @@ -53,7 +53,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
53 53 }
54 54  
55 55 @Override
56   - @Transactional
  56 + @Transactional(rollbackFor = Exception.class)
57 57 public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
58 58 ${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
59 59  
... ... @@ -79,7 +79,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
79 79 }
80 80  
81 81 @Override
82   - @Transactional
  82 + @Transactional(rollbackFor = Exception.class)
83 83 public void delMain(String id) {
84 84 <#list subTables as sub>
85 85 ${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
... ... @@ -88,7 +88,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl&lt;${entityName}Mapper, $
88 88 }
89 89  
90 90 @Override
91   - @Transactional
  91 + @Transactional(rollbackFor = Exception.class)
92 92 public void delBatchMain(Collection<? extends Serializable> idList) {
93 93 for(Serializable id:idList) {
94 94 <#list subTables as sub>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @56ab403
... ... @@ -58,12 +58,12 @@ export const formSchema: FormSchema[] = [
58 58 valueFormat: 'YYYY-MM-DD hh:mm:ss',
59 59 },
60 60 <#elseif "int,decimal,double,"?contains(po.fieldType)>
61   - component: 'InputNumber'
  61 + component: 'InputNumber',
62 62 <#else>
63   - component: 'Input'
  63 + component: 'Input',
64 64 </#if>
65 65 <#if po.fieldName =='id'><#rt/>
66   - show:false
  66 + show:false,
67 67 </#if>
68 68 },
69 69 </#list>
... ...