From 18806f981dbdb894bd203fb90d11db7cc7bb0464 Mon Sep 17 00:00:00 2001 From: WenG <450292408@qq.com> Date: Sat, 23 Apr 2022 22:26:16 +0800 Subject: [PATCH] c --- .../report/FormReportAppRouteController.java | 53 ++++++++++++++----- .../form/enums/design/FormTypeEnum.java | 1 + .../design/impl/FormDesignServiceImpl.java | 5 ++ .../form-design/modules/formDesigner.js | 17 +++--- .../resources/templates/form-design/save.html | 3 +- .../templates/form-design/update.html | 3 +- .../resources/templates/form-report/list.html | 7 +-- 7 files changed, 65 insertions(+), 24 deletions(-) diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/app/route/report/FormReportAppRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/app/route/report/FormReportAppRouteController.java index e8a2c7f6..b06848bd 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/app/route/report/FormReportAppRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/app/route/report/FormReportAppRouteController.java @@ -29,29 +29,56 @@ public class FormReportAppRouteController { private IFormReportRouteService formReportService; @GetMapping("save/code/{formCode}/version/{formVersion}") - public void get(@PathVariable("formCode") String formCode, - @PathVariable("formVersion") Integer formVersion, - HttpSession httpSession, - HttpServletRequest httpServletRequest, - HttpServletResponse httpServletResponse) { + public void save(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { + formReportService.appSave(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); + } + + @GetMapping("save-release/code/{formCode}/version/{formVersion}") + public void saveRelease(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { formReportService.appSave(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } @GetMapping("update/code/{formCode}/version/{formVersion}") public void update(@PathVariable("formCode") String formCode, - @PathVariable("formVersion") Integer formVersion, - HttpSession httpSession, - HttpServletRequest httpServletRequest, - HttpServletResponse httpServletResponse) { + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { + formReportService.appUpdate(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); + } + + @GetMapping("update-release/code/{formCode}/version/{formVersion}") + public void updateRelease(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { formReportService.appUpdate(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } @GetMapping("show/code/{formCode}/version/{formVersion}") public void show(@PathVariable("formCode") String formCode, - @PathVariable("formVersion") Integer formVersion, - HttpSession httpSession, - HttpServletRequest httpServletRequest, - HttpServletResponse httpServletResponse) { + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { + formReportService.appShow(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); + } + + @GetMapping("show-release/code/{formCode}/version/{formVersion}") + public void showRelease(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { formReportService.appShow(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } diff --git a/module-form/src/main/java/ink/wgink/module/form/enums/design/FormTypeEnum.java b/module-form/src/main/java/ink/wgink/module/form/enums/design/FormTypeEnum.java index c6130afe..aee06f99 100644 --- a/module-form/src/main/java/ink/wgink/module/form/enums/design/FormTypeEnum.java +++ b/module-form/src/main/java/ink/wgink/module/form/enums/design/FormTypeEnum.java @@ -9,6 +9,7 @@ package ink.wgink.module.form.enums.design; */ public enum FormTypeEnum { DEFAULT("default", "默认"), + FREE_REPORT("freeReport", "自由上报"), OA("oa", "OA"); private String value; 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 613ce082..bb4edd39 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 @@ -129,6 +129,11 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe model.put(ISystemConstant.FORM_HIDDEN_INPUT_LIST, Arrays.asList(new String[]{"formCode", "formVersion"})); model.put(ISystemConstant.FORM_COMMIT_PARAM_LIST, Arrays.asList(new String[]{"formCode", "formVersion"})); model.put(ISystemConstant.FORM_TYPE, formType); + } else if(StringUtils.equals(FormTypeEnum.FREE_REPORT.getValue(), formType)) { + model.put(ISystemConstant.FORM_COMMIT_URL, "api/form-report-public/save/code/{formCode}/version/{formVersion}"); + model.put(ISystemConstant.FORM_HIDDEN_INPUT_LIST, Arrays.asList(new String[]{"formCode", "formVersion"})); + model.put(ISystemConstant.FORM_COMMIT_PARAM_LIST, Arrays.asList(new String[]{"formCode", "formVersion"})); + model.put(ISystemConstant.FORM_TYPE, formType); } else if (StringUtils.equals(FormTypeEnum.OA.getValue(), formType)) { model.put(ISystemConstant.FORM_COMMIT_URL, "api/oa-form-report/save/definition-id/{processDefinitionId}/code/{formCode}/version/{formVersion}"); model.put(ISystemConstant.FORM_HIDDEN_INPUT_LIST, Arrays.asList(new String[]{"processDefinitionId", "formCode", "formVersion"})); diff --git a/module-form/src/main/resources/static/form-design/modules/formDesigner.js b/module-form/src/main/resources/static/form-design/modules/formDesigner.js index 7c95a872..f53d6ebb 100644 --- a/module-form/src/main/resources/static/form-design/modules/formDesigner.js +++ b/module-form/src/main/resources/static/form-design/modules/formDesigner.js @@ -120,12 +120,14 @@ layui.config({ '
', ' ', '
', + '
提示：OA表单数据参与OA流程；默认表单中APP的页面校验用户token；自由上报APP不校验token，但校验refer，需要提交时传唯一用户标识“creator”。
', ' ', '
', - ' ', + ' ', '
', ' ', '
', @@ -931,6 +933,7 @@ layui.config({ } } }); + var SYSTEM_KEY_ARRAY = ['id', 'uid', 'gmt_create', 'creator', 'gmt_modified', 'modifier', 'is_delete', 'MAIN_TITLE']; // 更新 option json $(document).off('blur', '#columnProperty .layui-input').on('blur', '#columnProperty .layui-input', function () { if ($(this).attr("name") !== undefined) { @@ -940,11 +943,13 @@ layui.config({ var _json = options.selectItem; var _oldid = _json.id; if (_key === 'id' && _value !== _oldid) { - if(_value === 'MAIN_TITLE') { - layer.msg('MAIN_TITLE为关键字'); - _json[_key] = _oldid; - that.renderForm(); - return; + for(var i = 0, systemKey; systemKey = SYSTEM_KEY_ARRAY[i++];) { + if(_value === systemKey) { + layer.msg(systemKey +'为关键字'); + _json[_key] = _oldid; + that.renderForm(); + return; + } } //检测id是否存在重复 var _checkid = that.findJsonItem(options.data, _value); diff --git a/module-form/src/main/resources/templates/form-design/save.html b/module-form/src/main/resources/templates/form-design/save.html index 2315c3cf..22eaa6f5 100644 --- a/module-form/src/main/resources/templates/form-design/save.html +++ b/module-form/src/main/resources/templates/form-design/save.html @@ -26,7 +26,8 @@