diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java index 58304c4e..fa5aa2ac 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java @@ -89,6 +89,7 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe formFieldService.deleteByFormIds(Arrays.asList(formPO.getFormId())); // 删表 formService.deleteTable(formPO.getFormTableName(), false); + version = latestVersionByCode; } else { version = latestVersionByCode + 1; } diff --git a/module-form/src/main/resources/static/form/js/oa-form-util.js b/module-form/src/main/resources/static/form/js/oa-form-util.js index b927b0ca..6f57b48a 100644 --- a/module-form/src/main/resources/static/form/js/oa-form-util.js +++ b/module-form/src/main/resources/static/form/js/oa-form-util.js @@ -10,6 +10,10 @@ function OaFormUtil(layui) { // 全屏 function fullPage() { $('.layui-card-body').css('height', (win.height() - 75) + 'px'); + $('.save-report-form').css({ + height: (win.height() - 75) + 'px', + overflow: 'auto' + }) } fullPage(); diff --git a/module-form/src/main/resources/templates/form/list-select.html b/module-form/src/main/resources/templates/form/list-select.html index c5a751c4..81a48437 100644 --- a/module-form/src/main/resources/templates/form/list-select.html +++ b/module-form/src/main/resources/templates/form/list-select.html @@ -63,7 +63,7 @@ table.render({ elem: '#dataTable', id: 'dataTable', - url: top.restAjax.path('api/form/listpage', []), + url: top.restAjax.path('api/form/listpage-latest', []), width: admin.screen() > 1 ? '100%' : '', height: $win.height() - 60, limit: 20,