Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

c

Browse Source
This commit is contained in:
WenG 2022-04-23 22:26:16 +08:00
parent d24cbb6dd5
commit 18806f981d
7 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
module-form/src/main/java/ink/wgink/module/form/controller/app/route/report/FormReportAppRouteController.java
View File

@ -29,29 +29,56 @@ public class FormReportAppRouteController {
private IFormReportRouteService formReportService; private IFormReportRouteService formReportService;
@GetMapping("save/code/{formCode}/version/{formVersion}") @GetMapping("save/code/{formCode}/version/{formVersion}")
public void get(@PathVariable("formCode") String formCode, public void save(@PathVariable("formCode") String formCode,
@PathVariable("formVersion") Integer formVersion, @PathVariable("formVersion") Integer formVersion,
HttpSession httpSession, HttpSession httpSession,
HttpServletRequest httpServletRequest, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) { 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); formReportService.appSave(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse);
} }
@GetMapping("update/code/{formCode}/version/{formVersion}") @GetMapping("update/code/{formCode}/version/{formVersion}")
public void update(@PathVariable("formCode") String formCode, public void update(@PathVariable("formCode") String formCode,
@PathVariable("formVersion") Integer formVersion, @PathVariable("formVersion") Integer formVersion,
HttpSession httpSession, HttpSession httpSession,
HttpServletRequest httpServletRequest, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) { 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); formReportService.appUpdate(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse);
} }
@GetMapping("show/code/{formCode}/version/{formVersion}") @GetMapping("show/code/{formCode}/version/{formVersion}")
public void show(@PathVariable("formCode") String formCode, public void show(@PathVariable("formCode") String formCode,
@PathVariable("formVersion") Integer formVersion, @PathVariable("formVersion") Integer formVersion,
HttpSession httpSession, HttpSession httpSession,
HttpServletRequest httpServletRequest, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) { 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); formReportService.appShow(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse);
} }

1
module-form/src/main/java/ink/wgink/module/form/enums/design/FormTypeEnum.java
View File

@ -9,6 +9,7 @@ package ink.wgink.module.form.enums.design;
*/ */
public enum FormTypeEnum { public enum FormTypeEnum {
DEFAULT("default", "默认"), DEFAULT("default", "默认"),
FREE_REPORT("freeReport", "自由上报"),
OA("oa", "OA"); OA("oa", "OA");
private String value; private String value;

5
module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java
View File

@ -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_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_COMMIT_PARAM_LIST, Arrays.asList(new String[]{"formCode", "formVersion"}));
model.put(ISystemConstant.FORM_TYPE, formType); 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)) { } 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_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"})); model.put(ISystemConstant.FORM_HIDDEN_INPUT_LIST, Arrays.asList(new String[]{"processDefinitionId", "formCode", "formVersion"}));

17
module-form/src/main/resources/static/form-design/modules/formDesigner.js
View File

@ -120,12 +120,14 @@ layui.config({
' <div class="layui-input-block">', ' <div class="layui-input-block">',
' <select id="formType" name="formType" lay-verify="required">', ' <select id="formType" name="formType" lay-verify="required">',
' <option value="default">默认</option>', ' <option value="default">默认</option>',
' <option value="freeReport">自由上报</option>',
' <option value="oa">OA表单</option>', ' <option value="oa">OA表单</option>',
' </select>', ' </select>',
' </div>', ' </div>',
' <div class="layui-form-mid layui-word-aux">提示：OA表单数据参与OA流程；默认表单中APP的页面校验用户token；自由上报APP不校验token，但校验refer，需要提交时传唯一用户标识“creator”。</div>',
' </div>', ' </div>',
' <div class="layui-form-item">', ' <div class="layui-form-item">',
' <label class="layui-form-label">主标题模板</label>', ' <label class="layui-form-label">OA标题模板</label>',
' <div class="layui-input-block">', ' <div class="layui-input-block">',
' <input type="text" id="mainTitleTpl" name="mainTitleTpl" placeholder="请输入主标题模板" class="layui-input">', ' <input type="text" id="mainTitleTpl" name="mainTitleTpl" placeholder="请输入主标题模板" class="layui-input">',
' </div>', ' </div>',
@ -931,6 +933,7 @@ layui.config({
} }
} }
}); });
var SYSTEM_KEY_ARRAY = ['id', 'uid', 'gmt_create', 'creator', 'gmt_modified', 'modifier', 'is_delete', 'MAIN_TITLE'];
// 更新 option json // 更新 option json
$(document).off('blur', '#columnProperty .layui-input').on('blur', '#columnProperty .layui-input', function () { $(document).off('blur', '#columnProperty .layui-input').on('blur', '#columnProperty .layui-input', function () {
if ($(this).attr("name") !== undefined) { if ($(this).attr("name") !== undefined) {
@ -940,11 +943,13 @@ layui.config({
var _json = options.selectItem; var _json = options.selectItem;
var _oldid = _json.id; var _oldid = _json.id;
if (_key === 'id' && _value !== _oldid) { if (_key === 'id' && _value !== _oldid) {
if(_value === 'MAIN_TITLE') { for(var i = 0, systemKey; systemKey = SYSTEM_KEY_ARRAY[i++];) {
layer.msg('MAIN_TITLE为关键字'); if(_value === systemKey) {
_json[_key] = _oldid; layer.msg(systemKey +'为关键字');
that.renderForm(); _json[_key] = _oldid;
return; that.renderForm();
return;
}
} }
//检测id是否存在重复 //检测id是否存在重复
var _checkid = that.findJsonItem(options.data, _value); var _checkid = that.findJsonItem(options.data, _value);

3
module-form/src/main/resources/templates/form-design/save.html
View File

@ -26,7 +26,8 @@
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script> <script>
layui.config({ layui.config({
base: 'static/form-design/modules/' base: 'static/form-design/modules/',
version: true
}).use(['layer', 'formDesigner'], function () { }).use(['layer', 'formDesigner'], function () {
var formDesigner = layui.formDesigner; var formDesigner = layui.formDesigner;
var data = []; var data = [];

3
module-form/src/main/resources/templates/form-design/update.html
View File

@ -26,7 +26,8 @@
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script> <script>
layui.config({ layui.config({
base: 'static/form-design/modules/' base: 'static/form-design/modules/',
version: true
}).use(['layer', 'formDesigner'], function () { }).use(['layer', 'formDesigner'], function () {
var formDesigner = layui.formDesigner; var formDesigner = layui.formDesigner;
var formId = top.restAjax.params(window.location.href).formId; var formId = top.restAjax.params(window.location.href).formId;

7
module-form/src/main/resources/templates/form-report/list.html
View File

@ -28,13 +28,13 @@
<!-- 表头按钮字典 --> <!-- 表头按钮字典 -->
<script type="text/html" id="headerToolBar"> <script type="text/html" id="headerToolBar">
<div class="layui-btn-group"> <div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-sm" lay-event="save"> <button type="button" class="layui-btn layui-btn-sm" lay-event="save" th:if="${formType eq 'default'}">
<i class="fa fa-lg fa-plus"></i> 新增 <i class="fa fa-lg fa-plus"></i> 新增
</button> </button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="update"> <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="update" th:if="${formType eq 'default'}">
<i class="fa fa-lg fa-edit"></i> 编辑 <i class="fa fa-lg fa-edit"></i> 编辑
</button> </button>
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="remove"> <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="remove" th:if="${formType eq 'default' or formType eq 'freeReport'}">
<i class="fa fa-lg fa-trash"></i> 删除 <i class="fa fa-lg fa-trash"></i> 删除
</button> </button>
</div> </div>
@ -60,6 +60,7 @@
var common = layui.common; var common = layui.common;
var formCode = [[${formCode}]]; var formCode = [[${formCode}]];
var formVersion = [[${formVersion}]]; var formVersion = [[${formVersion}]];
var formType = [[${formType}]];
var showFields = [[${showFields}]]; var showFields = [[${showFields}]];
// 初始化表格 // 初始化表格