diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java b/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java index e3eabb98..4d0a7374 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java @@ -5,6 +5,7 @@ import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.enums.design.FormStatusEnum; import ink.wgink.module.form.pojo.dtos.design.FormDTO; +import ink.wgink.module.form.pojo.vos.design.FormVO; import ink.wgink.module.form.service.design.IFormService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; @@ -61,6 +62,84 @@ public class FormController extends DefaultBaseController { return new SuccessResult(); } + @ApiOperation(value = "修改新增页面代码", notes = "修改新增页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-save-page-code/{formId}") + public SuccessResult updateSavePageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getSavePageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateSavePageCode(formId, formVO.getSavePageCode()); + return new SuccessResult(); + } + + @ApiOperation(value = "修改修改页面代码", notes = "修改修改页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-update-page-code/{formId}") + public SuccessResult updateUpdatePageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getUpdatePageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateUpdatePageCode(formId, formVO.getUpdatePageCode()); + return new SuccessResult(); + } + + @ApiOperation(value = "修改详情页面代码", notes = "修改详情页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-show-page-code/{formId}") + public SuccessResult updateShowPageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getShowPageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateShowPageCode(formId, formVO.getShowPageCode()); + return new SuccessResult(); + } + + @ApiOperation(value = "修改App新增页面代码", notes = "修改App新增页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-app-save-page-code/{formId}") + public SuccessResult updateAppSavePageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getAppSavePageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateAppSavePageCode(formId, formVO.getAppSavePageCode()); + return new SuccessResult(); + } + + @ApiOperation(value = "修改App修改页面代码", notes = "修改App修改页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-app-update-page-code/{formId}") + public SuccessResult updateAppUpdatePageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getAppUpdatePageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateAppUpdatePageCode(formId, formVO.getAppUpdatePageCode()); + return new SuccessResult(); + } + + @ApiOperation(value = "修改App详情页面代码", notes = "修改App详情页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-app-show-page-code/{formId}") + public SuccessResult updateAppShowPageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getAppShowPageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updateAppShowPageCode(formId, formVO.getAppShowPageCode()); + return new SuccessResult(); + } + @ApiOperation(value = "表单列表", notes = "表单列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list") @@ -79,14 +158,82 @@ public class FormController extends DefaultBaseController { return formService.get(formId); } - @ApiOperation(value = "查看code", notes = "查看code接口") + @ApiOperation(value = "新增页面代码", notes = "新增页面代码接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("get-form-page-code/{formId}") - public FormDTO getFormPageCode(@PathVariable("formId") String formId) { - return formService.getFormPageCode(formId); + @GetMapping("get-save-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getSavePageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setSavePageCode(formService.getSavePageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + + @ApiOperation(value = "修改页面代码", notes = "修改页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-update-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getUpdatePageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setUpdatePageCode(formService.getUpdatePageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + + @ApiOperation(value = "详情页面代码", notes = "详情页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-show-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getShowPageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setShowPageCode(formService.getShowPageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + + @ApiOperation(value = "APP新增页面代码", notes = "APP新增页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app-save-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getAppSavePageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setAppSavePageCode(formService.getAppSavePageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + + @ApiOperation(value = "修改页面代码", notes = "修改页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app-update-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getAppUpdatePageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setAppUpdatePageCode(formService.getAppUpdatePageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + + @ApiOperation(value = "详情页面代码", notes = "详情页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app-show-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getAppShowPageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setAppShowPageCode(formService.getAppShowPageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; } @ApiOperation(value = "查看data", notes = "查看data接口") diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java index 9e7fe08e..99ffea71 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java @@ -24,9 +24,39 @@ public class FormRouteController { return mv; } - @GetMapping("get-form-page-code") - public ModelAndView getFormPageCode() { - ModelAndView mv = new ModelAndView("form/get-form-page-code"); + @GetMapping("get-save-page-code") + public ModelAndView getSavePageCode() { + ModelAndView mv = new ModelAndView("form/get-save-page-code"); + return mv; + } + + @GetMapping("get-update-page-code") + public ModelAndView getUpdatePageCode() { + ModelAndView mv = new ModelAndView("form/get-update-page-code"); + return mv; + } + + @GetMapping("get-show-page-code") + public ModelAndView getShowPageCode() { + ModelAndView mv = new ModelAndView("form/get-show-page-code"); + return mv; + } + + @GetMapping("get-app-save-page-code") + public ModelAndView getAppSavePageCode() { + ModelAndView mv = new ModelAndView("form/get-app-save-page-code"); + return mv; + } + + @GetMapping("get-app-update-page-code") + public ModelAndView getAppUpdatePageCode() { + ModelAndView mv = new ModelAndView("form/get-app-update-page-code"); + return mv; + } + + @GetMapping("get-app-show-page-code") + public ModelAndView getAppShowPageCode() { + ModelAndView mv = new ModelAndView("form/get-app-show-page-code"); return mv; } diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java index 43979e0a..c6da81b9 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/report/FormReportRouteController.java @@ -1,7 +1,7 @@ package ink.wgink.module.form.controller.route.report; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.form.service.report.IFormReportService; +import ink.wgink.module.form.service.report.IFormReportRouteService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -26,7 +26,7 @@ import javax.servlet.http.HttpSession; public class FormReportRouteController { @Autowired - private IFormReportService formReportService; + private IFormReportRouteService formReportService; @GetMapping("save/code/{formCode}/version/{formVersion}") public void get(@PathVariable("formCode") String formCode, @@ -34,7 +34,25 @@ public class FormReportRouteController { HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { - formReportService.get(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); + formReportService.save(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) { + formReportService.update(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) { + formReportService.show(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } } diff --git a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java index 1e5557b2..8c20e44a 100644 --- a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java +++ b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java @@ -25,8 +25,6 @@ public interface IFormDao extends IInitBaseTable { void update(Map params) throws UpdateException; - void updateStatus(Map params) throws UpdateException; - FormDTO get(Map params) throws SearchException; FormPO getPO(Map params) throws SearchException; @@ -37,4 +35,15 @@ public interface IFormDao extends IInitBaseTable { List listPO(Map params) throws SearchException; + String getSavePageCodeByCodeAndVersion(Map params) throws SearchException; + + String getUpdatePageCodeByCodeAndVersion(Map params) throws SearchException; + + String getShowPageCodeByCodeAndVersion(Map params) throws SearchException; + + String getAppSavePageCodeByCodeAndVersion(Map params) throws SearchException; + + String getAppUpdatePageCodeByCodeAndVersion(Map params) throws SearchException; + + String getAppShowPageCodeByCodeAndVersion(Map params) throws SearchException; } diff --git a/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java b/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java index 3e2cbe08..74fd9d0e 100644 --- a/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java +++ b/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java @@ -13,7 +13,12 @@ public class FormPO implements Serializable { private String formType; private String formStatus; private String formSourceData; - private String formPageCode; + private String savePageCode; + private String updatePageCode; + private String showPageCode; + private String appSavePageCode; + private String appUpdatePageCode; + private String appShowPageCode; private String formTableName; private Integer formVersion; private String creator; @@ -86,12 +91,52 @@ public class FormPO implements Serializable { this.formSourceData = formSourceData; } - public String getFormPageCode() { - return formPageCode; + public String getSavePageCode() { + return savePageCode == null ? "" : savePageCode.trim(); } - public void setFormPageCode(String formPageCode) { - this.formPageCode = formPageCode; + public void setSavePageCode(String savePageCode) { + this.savePageCode = savePageCode; + } + + public String getUpdatePageCode() { + return updatePageCode == null ? "" : updatePageCode.trim(); + } + + public void setUpdatePageCode(String updatePageCode) { + this.updatePageCode = updatePageCode; + } + + public String getShowPageCode() { + return showPageCode == null ? "" : showPageCode.trim(); + } + + public void setShowPageCode(String showPageCode) { + this.showPageCode = showPageCode; + } + + public String getAppSavePageCode() { + return appSavePageCode == null ? "" : appSavePageCode.trim(); + } + + public void setAppSavePageCode(String appSavePageCode) { + this.appSavePageCode = appSavePageCode; + } + + public String getAppUpdatePageCode() { + return appUpdatePageCode == null ? "" : appUpdatePageCode.trim(); + } + + public void setAppUpdatePageCode(String appUpdatePageCode) { + this.appUpdatePageCode = appUpdatePageCode; + } + + public String getAppShowPageCode() { + return appShowPageCode == null ? "" : appShowPageCode.trim(); + } + + public void setAppShowPageCode(String appShowPageCode) { + this.appShowPageCode = appShowPageCode; } public String getFormTableName() { diff --git a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormDesignVO.java b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormDesignVO.java index 852dd426..55fbb1e9 100644 --- a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormDesignVO.java +++ b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormDesignVO.java @@ -15,7 +15,12 @@ public class FormDesignVO { private String formSummary; private Integer formVersion; private JSONArray data; - private String code; + private String savePageCode; + private String updatePageCode; + private String showPageCode; + private String appSavePageCode; + private String appUpdatePageCode; + private String appShowPageCode; public String getFormCode() { return formCode == null ? "" : formCode.trim(); @@ -57,11 +62,51 @@ public class FormDesignVO { this.data = data; } - public String getCode() { - return code; + public String getSavePageCode() { + return savePageCode == null ? "" : savePageCode.trim(); } - public void setCode(String code) { - this.code = code; + public void setSavePageCode(String savePageCode) { + this.savePageCode = savePageCode; + } + + public String getUpdatePageCode() { + return updatePageCode == null ? "" : updatePageCode.trim(); + } + + public void setUpdatePageCode(String updatePageCode) { + this.updatePageCode = updatePageCode; + } + + public String getShowPageCode() { + return showPageCode == null ? "" : showPageCode.trim(); + } + + public void setShowPageCode(String showPageCode) { + this.showPageCode = showPageCode; + } + + public String getAppSavePageCode() { + return appSavePageCode == null ? "" : appSavePageCode.trim(); + } + + public void setAppSavePageCode(String appSavePageCode) { + this.appSavePageCode = appSavePageCode; + } + + public String getAppUpdatePageCode() { + return appUpdatePageCode == null ? "" : appUpdatePageCode.trim(); + } + + public void setAppUpdatePageCode(String appUpdatePageCode) { + this.appUpdatePageCode = appUpdatePageCode; + } + + public String getAppShowPageCode() { + return appShowPageCode == null ? "" : appShowPageCode.trim(); + } + + public void setAppShowPageCode(String appShowPageCode) { + this.appShowPageCode = appShowPageCode; } } diff --git a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java index 061261c7..8dfbafc1 100644 --- a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java +++ b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java @@ -18,12 +18,22 @@ public class FormVO { private String formStatus; @ApiModelProperty(name = "formSourceData", value = "表单源代码") private String formSourceData; - @ApiModelProperty(name = "formPageCode", value = "表单页面代码") - private String formPageCode; @ApiModelProperty(name = "formTableName", value = "表单表名") private String formTableName; @ApiModelProperty(name = "formVersion", value = "表单版本") private Integer formVersion; + @ApiModelProperty(name = "savePageCode", value = "新增页面代码") + private String savePageCode; + @ApiModelProperty(name = "updatePageCode", value = "修改页面代码") + private String updatePageCode; + @ApiModelProperty(name = "showPageCode", value = "展示页面代码") + private String showPageCode; + @ApiModelProperty(name = "appSavePageCode", value = "APP新增页面代码") + private String appSavePageCode; + @ApiModelProperty(name = "appUpdatePageCode", value = "APP修改页面代码") + private String appUpdatePageCode; + @ApiModelProperty(name = "appShowPageCode", value = "APP展示页面代码") + private String appShowPageCode; public String getFormCode() { return formCode; @@ -73,14 +83,6 @@ public class FormVO { this.formSourceData = formSourceData; } - public String getFormPageCode() { - return formPageCode; - } - - public void setFormPageCode(String formPageCode) { - this.formPageCode = formPageCode; - } - public String getFormTableName() { return formTableName; } @@ -96,4 +98,52 @@ public class FormVO { public void setFormVersion(Integer formVersion) { this.formVersion = formVersion; } + + public String getSavePageCode() { + return savePageCode == null ? "" : savePageCode.trim(); + } + + public void setSavePageCode(String savePageCode) { + this.savePageCode = savePageCode; + } + + public String getUpdatePageCode() { + return updatePageCode == null ? "" : updatePageCode.trim(); + } + + public void setUpdatePageCode(String updatePageCode) { + this.updatePageCode = updatePageCode; + } + + public String getShowPageCode() { + return showPageCode == null ? "" : showPageCode.trim(); + } + + public void setShowPageCode(String showPageCode) { + this.showPageCode = showPageCode; + } + + public String getAppSavePageCode() { + return appSavePageCode == null ? "" : appSavePageCode.trim(); + } + + public void setAppSavePageCode(String appSavePageCode) { + this.appSavePageCode = appSavePageCode; + } + + public String getAppUpdatePageCode() { + return appUpdatePageCode == null ? "" : appUpdatePageCode.trim(); + } + + public void setAppUpdatePageCode(String appUpdatePageCode) { + this.appUpdatePageCode = appUpdatePageCode; + } + + public String getAppShowPageCode() { + return appShowPageCode == null ? "" : appShowPageCode.trim(); + } + + public void setAppShowPageCode(String appShowPageCode) { + this.appShowPageCode = appShowPageCode; + } } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java index ff3461e2..16fb7faa 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java @@ -65,6 +65,48 @@ public interface IFormService { */ void updateStatus(String formId, String formStatus); + /** + * 修改新增页面代码 + * @param formId + * @param savePageCode + */ + void updateSavePageCode(String formId, String savePageCode); + + /** + * 修改修改页面代码 + * @param formId + * @param updatePageCode + */ + void updateUpdatePageCode(String formId, String updatePageCode); + + /** + * 修改查看页面代码 + * @param formId + * @param showPageCode + */ + void updateShowPageCode(String formId, String showPageCode); + + /** + * 修改App新增页面代码 + * @param formId + * @param appSavePageCode + */ + void updateAppSavePageCode(String formId, String appSavePageCode); + + /** + * 修改App修改页面代码 + * @param formId + * @param appUpdatePageCode + */ + void updateAppUpdatePageCode(String formId, String appUpdatePageCode); + + /** + * 修改App详情页面代码 + * @param formId + * @param appShowPageCode + */ + void updateAppShowPageCode(String formId, String appShowPageCode); + /** * 详情 * @@ -115,12 +157,58 @@ public interface IFormService { FormPO getPOByCodeAndVersion(String formCode, Integer formVersion); /** - * 查看代码 + * 新增页面代码 * - * @param formId + * @param formCode + * @param formVersion * @return */ - FormDTO getFormPageCode(String formId); + String getSavePageCodeByCodeAndVersion(String formCode, Integer formVersion); + + /** + * 修改页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getUpdatePageCodeByCodeAndVersion(String formCode, Integer formVersion); + + /** + * 详情页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getShowPageCodeByCodeAndVersion(String formCode, Integer formVersion); + + /** + * APP新增页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getAppSavePageCodeByCodeAndVersion(String formCode, Integer formVersion); + + /** + * APP修改页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getAppUpdatePageCodeByCodeAndVersion(String formCode, Integer formVersion); + + /** + * APP详情页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getAppShowPageCodeByCodeAndVersion(String formCode, Integer formVersion); /** * 查看data @@ -161,4 +249,5 @@ public interface IFormService { */ SuccessResultList> listPage(ListPage page); + } 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 2b0dba18..70146baa 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 @@ -6,8 +6,6 @@ import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.PropertiesException; -import ink.wgink.exceptions.base.SystemException; -import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.consts.IFormDesignConst; import ink.wgink.module.form.enums.design.FormFieldTypeEnum; import ink.wgink.module.form.enums.design.FormStatusEnum; @@ -24,7 +22,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.*; import java.util.ArrayList; import java.util.List; @@ -78,7 +75,12 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe formVO.setFormStatus(FormStatusEnum.ACTIVE.getValue()); formVO.setFormVersion(version); formVO.setFormSourceData(JSON.toJSONString(formDesignVO.getData())); - formVO.setFormPageCode(formDesignVO.getCode()); + formVO.setSavePageCode(formDesignVO.getSavePageCode()); + formVO.setUpdatePageCode(formDesignVO.getUpdatePageCode()); + formVO.setShowPageCode(formDesignVO.getShowPageCode()); + formVO.setAppSavePageCode(formDesignVO.getAppSavePageCode()); + formVO.setAppUpdatePageCode(formDesignVO.getAppUpdatePageCode()); + formVO.setAppShowPageCode(formDesignVO.getAppShowPageCode()); String formId = formService.saveReturnId(formVO); LOG.debug("保存表单字段"); @@ -88,27 +90,8 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe }); LOG.debug("建表"); - String createTableSQL = getCreateTableSQL(tableName, formFields); + String createTableSQL = getCreateTableSQL(tableName, formDesignVO.getFormName(), formFields); formService.createDynamicForm(createTableSQL); - - LOG.debug("创建静态页面"); - File formFolder = new File(formProperties.getTemplatePath()); - if (!formFolder.exists()) { - formFolder.mkdirs(); - } - try ( - FileOutputStream fileOutputStream = new FileOutputStream(formProperties.getTemplatePath() + formCode + ".ftl"); - OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fileOutputStream, ISystemConstant.CHARSET_UTF8); - BufferedWriter bufferedWriter = new BufferedWriter(outputStreamWriter) - ) { - bufferedWriter.write(formDesignVO.getCode()); - bufferedWriter.flush(); - } catch (IOException e) { - LOG.error(e.getMessage(), e); - throw new SystemException("创建模板文件异常"); - } - - } /** @@ -118,7 +101,7 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe * @param formFieldVOs * @return */ - private String getCreateTableSQL(String tableName, List formFieldVOs) { + private String getCreateTableSQL(String tableName, String formName, List formFieldVOs) { StringBuffer createTableSB = new StringBuffer("CREATE TABLE `").append(tableName).append("`("); createTableSB.append("`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,"); createTableSB.append("`uid` char(36) NOT NULL,"); @@ -131,7 +114,7 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe createTableSB.append("`gmt_modified` datetime DEFAULT NULL,"); createTableSB.append("`is_delete` int(2) DEFAULT '0',"); createTableSB.append("PRIMARY KEY (`id`)"); - createTableSB.append(") ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + createTableSB.append(") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='").append(formName).append("';"); return createTableSB.toString(); } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java index bb014ccb..8d926223 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java @@ -77,7 +77,61 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService params.put("formId", formId); params.put("formStatus", formStatus); setUpdateInfo(params); - formDao.updateStatus(params); + formDao.update(params); + } + + @Override + public void updateSavePageCode(String formId, String savePageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("savePageCode", savePageCode); + setUpdateInfo(params); + formDao.update(params); + } + + @Override + public void updateUpdatePageCode(String formId, String updatePageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("updatePageCode", updatePageCode); + setUpdateInfo(params); + formDao.update(params); + } + + @Override + public void updateShowPageCode(String formId, String showPageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("showPageCode", showPageCode); + setUpdateInfo(params); + formDao.update(params); + } + + @Override + public void updateAppSavePageCode(String formId, String appSavePageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("appSavePageCode", appSavePageCode); + setUpdateInfo(params); + formDao.update(params); + } + + @Override + public void updateAppUpdatePageCode(String formId, String appUpdatePageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("appUpdatePageCode", appUpdatePageCode); + setUpdateInfo(params); + formDao.update(params); + } + + @Override + public void updateAppShowPageCode(String formId, String appShowPageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("appShowPageCode", appShowPageCode); + setUpdateInfo(params); + formDao.update(params); } @Override @@ -122,11 +176,51 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService } @Override - public FormDTO getFormPageCode(String formId) { - FormPO formPO = getPO(formId); - FormDTO formDTO = new FormDTO(); - formDTO.setFormPageCode(formPO.getFormPageCode()); - return formDTO; + public String getSavePageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getSavePageCodeByCodeAndVersion(params); + } + + @Override + public String getUpdatePageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getUpdatePageCodeByCodeAndVersion(params); + } + + @Override + public String getShowPageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getShowPageCodeByCodeAndVersion(params); + } + + @Override + public String getAppSavePageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getAppSavePageCodeByCodeAndVersion(params); + } + + @Override + public String getAppUpdatePageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getAppUpdatePageCodeByCodeAndVersion(params); + } + + @Override + public String getAppShowPageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getAppShowPageCodeByCodeAndVersion(params); } @Override diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportRouteService.java b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportRouteService.java new file mode 100644 index 00000000..5afe185c --- /dev/null +++ b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportRouteService.java @@ -0,0 +1,49 @@ +package ink.wgink.module.form.service.report; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +/** + * @ClassName: IFormReportService + * @Description: 表单上报 + * @Author: wanggeng + * @Date: 2022/3/10 7:33 PM + * @Version: 1.0 + */ +public interface IFormReportRouteService { + + /** + * 新增页面 + * + * @param formCode + * @param formVersion + * @param httpSession + * @param httpServletRequest + * @param httpServletResponse + */ + void save(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + + /** + * 修改页面 + * + * @param formCode + * @param formVersion + * @param httpSession + * @param httpServletRequest + * @param httpServletResponse + */ + void update(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + + /** + * 详情页面 + * + * @param formCode + * @param formVersion + * @param httpSession + * @param httpServletRequest + * @param httpServletResponse + */ + void show(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + +} diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java deleted file mode 100644 index b9ab071c..00000000 --- a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java +++ /dev/null @@ -1,26 +0,0 @@ -package ink.wgink.module.form.service.report; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -/** - * @ClassName: IFormReportService - * @Description: 表单上报 - * @Author: wanggeng - * @Date: 2022/3/10 7:33 PM - * @Version: 1.0 - */ -public interface IFormReportService { - - /** - * 打开页面 - * - * @param formCode - * @param formVersion - * @param httpSession - * @param httpServletRequest - * @param httpServletResponse - */ - void get(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); -} diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportRouteServiceImpl.java similarity index 77% rename from module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java rename to module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportRouteServiceImpl.java index 8bb3b98d..384e61d1 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/report/impl/FormReportRouteServiceImpl.java @@ -10,7 +10,7 @@ import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.form.enums.design.FormStatusEnum; import ink.wgink.module.form.pojo.pos.design.FormPO; import ink.wgink.module.form.service.design.IFormService; -import ink.wgink.module.form.service.report.IFormReportService; +import ink.wgink.module.form.service.report.IFormReportRouteService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -32,7 +32,7 @@ import java.util.Map; * @Version: 1.0 */ @Service -public class FormReportServiceImpl extends DefaultBaseService implements IFormReportService { +public class FormReportRouteServiceImpl extends DefaultBaseService implements IFormReportRouteService { @Autowired private FreeMarkerConfigurer freeMarkerConfigurer; @@ -40,7 +40,7 @@ public class FormReportServiceImpl extends DefaultBaseService implements IFormRe private IFormService formService; @Override - public void get(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + public void save(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { FormPO formPO = formService.getPOByCodeAndVersion(formCode, formVersion); if (formPO == null) { httpServletResponse.setStatus(HttpStatus.NOT_FOUND.value()); @@ -53,9 +53,11 @@ public class FormReportServiceImpl extends DefaultBaseService implements IFormRe } httpServletResponse.setContentType("text/html; charset=" + ISystemConstant.CHARSET_UTF8); try { - Template template = getTemplate(formCode, formPO.getFormPageCode()); + Template template = getTemplate(formCode, formPO.getSavePageCode()); PrintWriter out = httpServletResponse.getWriter(); Map modal = getHashMap(2); + modal.put("contextPath", httpServletRequest.getContextPath() + "/"); + modal.put("formName", formPO.getFormName()); template.process(modal, out); } catch (IOException e) { httpServletResponse.setStatus(HttpStatus.NOT_FOUND.value()); @@ -65,6 +67,16 @@ public class FormReportServiceImpl extends DefaultBaseService implements IFormRe } } + @Override + public void update(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + + } + + @Override + public void show(String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + + } + /** * 获取配置 * diff --git a/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml b/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml index 1e26835c..61413c0f 100644 --- a/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml +++ b/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml @@ -11,7 +11,12 @@ - + + + + + + @@ -29,7 +34,12 @@ - + + + + + + @@ -46,7 +56,12 @@ `form_type` varchar(20) DEFAULT NULL COMMENT '表单类型:default、oa', `form_status` varchar(20) DEFAULT NULL COMMENT '表单状态:unactive、active', `form_source_data` longtext COMMENT '表单页面源数据', - `form_page_code` longtext COMMENT '表单页面代码', + `save_page_code` longtext COMMENT '新增页面代码', + `update_page_code` longtext COMMENT '更新页面代码', + `show_page_code` longtext COMMENT '展示页面代码', + `app_save_page_code` longtext COMMENT 'APP新增页面代码', + `app_update_page_code` longtext COMMENT 'APP更新页面代码', + `app_show_page_code` longtext COMMENT 'APP展示页面代码', `form_table_name` varchar(255) DEFAULT NULL COMMENT '表单表名', `form_version` int(11) DEFAULT NULL COMMENT '表单版本', `creator` char(36) DEFAULT NULL COMMENT '创建人', @@ -73,7 +88,12 @@ form_type, form_status, form_source_data, - form_page_code, + save_page_code, + update_page_code, + show_page_code, + app_save_page_code, + app_update_page_code, + app_show_page_code, form_table_name, form_version, creator, @@ -89,7 +109,12 @@ #{formType}, #{formStatus}, #{formSourceData}, - #{formPageCode}, + #{savePageCode}, + #{updatePageCode}, + #{showPageCode}, + #{appSavePageCode}, + #{appUpdatePageCode}, + #{appShowPageCode}, #{formTableName}, #{formVersion}, #{creator}, @@ -131,45 +156,48 @@ UPDATE form_form SET - - form_code = #{formCode}, - - - form_name = #{formName}, - - - form_summary = #{formSummary}, - - - form_type = #{formType}, - - - form_status = #{formStatus}, - - - form_source_data = #{formSourceData}, - - - form_page_code = #{formPageCode}, - - - form_table_name = #{formTableName}, - - - form_version = #{formVersion}, - - modifier = #{modifier}, - gmt_modified = #{gmtModified} - WHERE - form_id = #{formId} - - - - - UPDATE - form_form - SET + + form_code = #{formCode}, + + + form_name = #{formName}, + + + form_summary = #{formSummary}, + + + form_type = #{formType}, + + form_status = #{formStatus}, + + + form_source_data = #{formSourceData}, + + + save_page_code = #{savePageCode}, + + + update_page_code = #{updatePageCode}, + + + show_page_code = #{showPageCode}, + + + app_save_page_code = #{appSavePageCode}, + + + app_update_page_code = #{appUpdatePageCode}, + + + app_show_page_code = #{appShowPageCode}, + + + form_table_name = #{formTableName}, + + + form_version = #{formVersion}, + modifier = #{modifier}, gmt_modified = #{gmtModified} WHERE @@ -186,7 +214,6 @@ form_type, form_status, form_source_data, - form_page_code, form_table_name, form_version FROM @@ -213,7 +240,12 @@ form_type, form_status, form_source_data, - form_page_code, + save_page_code, + update_page_code, + show_page_code, + app_save_page_code, + app_update_page_code, + app_show_page_code, form_table_name, form_version FROM @@ -287,4 +319,88 @@ is_delete = 0 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/static/form-design/js/htmlformat.js b/module-form/src/main/resources/static/form-design/js/htmlformat.js index 1f5ebf1f..16b8d444 100644 --- a/module-form/src/main/resources/static/form-design/js/htmlformat.js +++ b/module-form/src/main/resources/static/form-design/js/htmlformat.js @@ -362,7 +362,7 @@ function style_html(html_source, indent_size, indent_character, max_char) { multi_parser = new Parser(); //wrapping functions Parser - multi_parser.printer(html_source, indent_character, indent_size); //initialize starting values + multi_parser.printer(html_source, indent_character, indent_size, max_char); //initialize starting values diff --git a/module-form/src/main/resources/static/form-design/modules/components/uploadFile.js b/module-form/src/main/resources/static/form-design/modules/components/uploadFile.js index a1ba86e4..c93f382a 100644 --- a/module-form/src/main/resources/static/form-design/modules/components/uploadFile.js +++ b/module-form/src/main/resources/static/form-design/modules/components/uploadFile.js @@ -33,6 +33,9 @@ layui.define(['jquery', 'upload', 'dialog', 'restajax', 'formUtils'], function(e _html += ''; return _html; }, + update: function(json) { + $('#'+ json.id +' .layui-form-label').text(json.label); + }, /* 获取对象 */ jsonData: function (id, index, columncount) { //分配一个新的ID diff --git a/module-form/src/main/resources/static/form-design/modules/components/uploadImage.js b/module-form/src/main/resources/static/form-design/modules/components/uploadImage.js index bdca51da..445d8c6c 100644 --- a/module-form/src/main/resources/static/form-design/modules/components/uploadImage.js +++ b/module-form/src/main/resources/static/form-design/modules/components/uploadImage.js @@ -19,7 +19,7 @@ layui.define(['jquery', 'upload', 'dialog', 'restajax', 'formUtils'], function(e selected = false; } var _html = '
'.format(json.id, json.tag, selected ? 'active' : '', json.index); - _html += ' '.format(json.label); + _html += ' '.format(json.label); _html += '
'; _html += ' '.format(json.id);; _html += '
'.format(json.id); @@ -50,6 +50,9 @@ layui.define(['jquery', 'upload', 'dialog', 'restajax', 'formUtils'], function(e _html += '
'; return _html; }, + update: function (json) { + $('#'+ json.id +' .layui-form-label').text(json.label); + }, /* 获取对象 */ jsonData: function (id, index, columncount) { //分配一个新的ID @@ -81,7 +84,7 @@ layui.define(['jquery', 'upload', 'dialog', 'restajax', 'formUtils'], function(e function initUpload() { upload.render({ elem: '#' + item.id +'FileUpload', - url: restAjax.path('app/file/upload-image-release/{userId}', ['123']), + url: restAjax.path(item.uploadUrl, []), field: 'image', done: function(res) { var dataset = this.item[0].dataset; diff --git a/module-form/src/main/resources/static/form-design/modules/consts.js b/module-form/src/main/resources/static/form-design/modules/consts.js index ead2c398..b8d36819 100644 --- a/module-form/src/main/resources/static/form-design/modules/consts.js +++ b/module-form/src/main/resources/static/form-design/modules/consts.js @@ -1,98 +1,99 @@ layui.define([], function (exports) { var lang = { - id: "唯一标识", - label: "标题", - index: "序号", - tag: "表单类型", + id: '唯一标识', + label: '标题', + index: '序号', + tag: '表单类型', tagIcon: '图标', width: '宽度', - height: "高度", + height: '高度', span: '网格宽度', - placeholder: "placeholder", - defaultValue: "默认值", + placeholder: 'placeholder', + defaultValue: '默认值', dateDefaultValue: '默认时间', - labelWidth: "文本宽度", - clearable: "是否清楚", - prepend: "前缀", - append: "追加", + labelWidth: '文本宽度', + clearable: '是否清楚', + prepend: '前缀', + append: '追加', prefixIcon: '前缀图标', suffixIcon: '后缀图标', - maxlength: "最大长度", - showWordLimit: "是否限制字符", - readonly: "只读", - disabled: "禁用", - required: "必填", - columns: "列数", - options: "选项", - switchValue: "默认值", - maxValue: "最大值", - minValue: "最小值", - dataMaxValue: "最大日期", - dataMinValue: "最小日期", - stepValue: "步长", - datetype: "日期类型", - dateformat: "日期格式", - half: "显示半星", - theme: "皮肤", - rateLength: "星星个数", - interval: "间隔毫秒", - startIndex: "开始位置", - full: "是否全屏", - arrow: "鼠标样式", - contents: "内容", + maxlength: '最大长度', + showWordLimit: '是否限制字符', + readonly: '只读', + disabled: '禁用', + required: '必填', + columns: '列数', + options: '选项', + switchValue: '默认值', + maxValue: '最大值', + minValue: '最小值', + dataMaxValue: '最大日期', + dataMinValue: '最小日期', + stepValue: '步长', + datetype: '日期类型', + dateformat: '日期格式', + half: '显示半星', + theme: '皮肤', + rateLength: '星星个数', + interval: '间隔毫秒', + startIndex: '开始位置', + full: '是否全屏', + arrow: '鼠标样式', + contents: '内容', document: '帮助文档', - input: "输入框", - select: "下拉", - checkbox: "多选组", - radio: "单选组", - date: "日期", - editor: "iceEditor编辑器", - slider: "滑块", - image: "图片", - grid: "一行多列", - colorpicker: "颜色选择器", - textarea: "多行文本", - rate: "评分控件", - switch: "开关", - password: "密码框", - carousel: "轮播", - text: "显示文本", - uploadUrl: "上传路径", - expression: "验证", - file: "文件", - autoplay: "自动切换", - anim: "切换方式", - arrow: "切换箭头", - tab: "tab选项卡", - tabHeaders: "tab标题", - isInput: "显示输入框", - dateRange: "日期范围", - dateRangeDefaultValue: "默认范围", - menu: "头部菜单", - numberInput: "数字输入框", - iconPicker: "图标选择器", - iconPickerSearch: "是否搜索", - iconPickerPage: "是否分页", - iconPickerLimit: "显示数量", - iconPickerCellWidth: "图标宽度", - cron: "Cron表达式", - cronUrl: "运行路径", - labelGeneration: "标签组件", - isEnter: "是否回车", - buttonIcon: "按钮图标", - buttonType: "按钮类型", - isLabel: "显示标签", - buttonSize: "组件尺寸", - bottom: "按钮组件", - buttonVlaue: "按钮文字", - laySign: "签名组件", - uploadImage: "上传图片", - uploadFile: "上传文件", + input: '输入框', + select: '下拉', + checkbox: '多选组', + radio: '单选组', + date: '日期', + editor: 'iceEditor编辑器', + slider: '滑块', + image: '图片', + grid: '一行多列', + colorpicker: '颜色选择器', + textarea: '多行文本', + rate: '评分控件', + switch: '开关', + password: '密码框', + carousel: '轮播', + text: '显示文本', + uploadUrl: '上传路径', + expression: '验证', + file: '文件', + autoplay: '自动切换', + anim: '切换方式', + arrow: '切换箭头', + tab: 'tab选项卡', + tabHeaders: 'tab标题', + isInput: '显示输入框', + dateRange: '日期范围', + dateRangeDefaultValue: '默认范围', + menu: '头部菜单', + numberInput: '数字输入框', + iconPicker: '图标选择器', + iconPickerSearch: '是否搜索', + iconPickerPage: '是否分页', + iconPickerLimit: '显示数量', + iconPickerCellWidth: '图标宽度', + cron: 'Cron表达式', + cronUrl: '运行路径', + labelGeneration: '标签组件', + isEnter: '是否回车', + buttonIcon: '按钮图标', + buttonType: '按钮类型', + isLabel: '显示标签', + buttonSize: '组件尺寸', + bottom: '按钮组件', + buttonVlaue: '按钮文字', + laySign: '签名组件', + uploadImage: '上传图片', + uploadFile: '上传文件', + count: '总数' }; var expressions = [ { text: '默认', - value: "" + value: '' }, { text: '数字', value: 'number' @@ -164,7 +165,7 @@ layui.define([], function (exports) { value: 'layui-btn-primary' }, { text: '默认', - value: "" + value: '' }, { text: '百搭', value: 'layui-btn-normal' @@ -182,7 +183,7 @@ layui.define([], function (exports) { value: 'layui-btn-lg' }, { text: '默认', - value: "" + value: '' }, { text: '小型', value: 'layui-btn-sm' @@ -191,7 +192,7 @@ layui.define([], function (exports) { value: 'layui-btn-xs' } ]; - var dateformats = ["yyyy年MM月", "yyyy-MM-dd", "dd/MM/yyyy", "yyyyMMdd", "yyyy-MM-dd HH:mm:ss", "yyyy年MM月dd日 HH时mm分ss秒"] + var dateformats = ['yyyy年MM月', 'yyyy-MM-dd', 'dd/MM/yyyy', 'yyyyMMdd', 'yyyy-MM-dd HH:mm:ss', 'yyyy年MM月dd日 HH时mm分ss秒'] var iceEditMenus = [ { value: 'backColor', 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 5d5daf56..70b998b6 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 @@ -33,14 +33,11 @@ layui.config({ layedit = layui.layedit, formField = layui.formField, hint = layui.hint, - iconPicker = layui.iconPicker, - input = layui.input, numberInput = layui.numberInput, password = layui.password, grid = layui.grid, textarea = layui.textarea, - select = layui.select, radio = layui.radio, checkbox = layui.checkbox, @@ -51,14 +48,12 @@ layui.config({ layCarousel = layui.layCarousel, uploadImage = layui.uploadImage, uploadFile = layui.uploadFile, - laySign = layui.laySign, - consts = layui.consts, lang = consts.lang, + //模块名称常量 MOD_NAME = 'formDesigner', - ELEM = '.layui-form-designer', TP_MAIN = [ '
', '
', @@ -128,19 +123,7 @@ layui.config({ '
', '
' ].join(''), - TP_HTML_VIEW = [ - '' - ].join(''), - TP_IMPORT_VIEW = [ - '' - ].join(''), - TP_ABOUT_VIEW = [''].join(''), + //外部接口 formDesigner = { index: layui.formDesigner ? (layui.formDesigner.index + 10000) : 0, @@ -879,7 +862,7 @@ layui.config({ that.components[_json.tag].update(_json); //局部更新 } } - if(_key === 'stepValue') { + if (_key === 'stepValue') { _json[_key] = _value; if (_json.tag == 'numberInput') { that.components[_json.tag].update(_json); //局部更新 @@ -1112,9 +1095,6 @@ layui.config({ _listhtml += '
'; options.elem.html(TP_MAIN); $('#components-form-list').append(_listhtml); - $('body').append(TP_HTML_VIEW); - $('body').append(TP_IMPORT_VIEW); //TP_IMPORT_VIEW - $('body').append(TP_ABOUT_VIEW); //排序事件注册 var sortable1 = Sortable.create(document.getElementById("c1"), { group: { @@ -1245,7 +1225,8 @@ layui.config({ area: ['800px', '640px'], shade: false, resize: false, - success: function (layero, index) {}, + success: function (layero, index) { + }, end: function () { $('.htmlcodeview').css("display", "none") } @@ -1299,79 +1280,848 @@ layui.config({ }); // 生成HTML代码 - function getHtmlCode() { + function getSavePageCode() { var _htmlelem = $('
'); that.generateHtml(options.data, _htmlelem); options.htmlCode.script = ''; - //构件 html - var TP_HTML_CODE = [ - '', - '', - ' ', - ' ', - ' ', - ' 表单设计器代码', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - '
', - '
', - '' + _htmlelem.html() + '', - '
', - '
', - ' ', - ' ', - '
', - '
', - '
' + - '
', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - '' - ].join(''); + var tabsize = 4; var tabchar = ' '; if (tabsize == 1) { tabchar = '\t'; } - return style_html(TP_HTML_CODE, tabsize, tabchar, 400); + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; } + + // 生成HTML代码 + function getUpdatePageCode() { + var _htmlelem = $('
'); + that.generateHtml(options.data, _htmlelem); + options.htmlCode.script = ''; + + var tabsize = 4; + var tabchar = ' '; + if (tabsize == 1) { + tabchar = '\t'; + } + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; + } + + // 生成HTML代码 + function getShowPageCode() { + var _htmlelem = $('
'); + that.generateHtml(options.data, _htmlelem); + options.htmlCode.script = ''; + + var tabsize = 4; + var tabchar = ' '; + if (tabsize == 1) { + tabchar = '\t'; + } + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; + } + + // 生成HTML代码 + function getAppSavePageCode() { + var _htmlelem = $('
'); + that.generateHtml(options.data, _htmlelem); + options.htmlCode.script = ''; + + var tabsize = 4; + var tabchar = ' '; + if (tabsize == 1) { + tabchar = '\t'; + } + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; + } + + // 生成HTML代码 + function getAppUpdatePageCode() { + var _htmlelem = $('
'); + that.generateHtml(options.data, _htmlelem); + options.htmlCode.script = ''; + + var tabsize = 4; + var tabchar = ' '; + if (tabsize == 1) { + tabchar = '\t'; + } + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; + } + + // 生成HTML代码 + function getAppShowPageCode() { + var _htmlelem = $('
'); + that.generateHtml(options.data, _htmlelem); + options.htmlCode.script = ''; + + var tabsize = 4; + var tabchar = ' '; + if (tabsize == 1) { + tabchar = '\t'; + } + + var TP_FORM_CODE = [ + '
', + '
', + '
', + '
', + _htmlelem.html(), + '
', + '
', + ' ', + '
', + '
', + '
' + + '
', + '
', + '
', + ].join(''); + TP_FORM_CODE = style_html(TP_FORM_CODE, tabsize, tabchar, 2000); + + //构件 html + var TP_HTML_CODE = [ + '', + '', + '', + ' ', + ' ', + ' ${formName}', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '', + '', + TP_FORM_CODE, + '', + '', + '', + '', + '' + ].join('\n'); + return TP_HTML_CODE; + } + $('.generateCode').on('click', function () { //构件 html - var TP_HTML_CODE = getHtmlCode(); + var TP_HTML_CODE = getSavePageCode(); document.getElementById('generate-code-view').value = TP_HTML_CODE; console.log($('#generate-code-view').val()); }); @@ -1404,23 +2154,28 @@ layui.config({ }); $('#save').on('click', function () { var formName = $('#formName').val(); - if(!formName) { + if (!formName) { top.dialog.msg('请输入表单名称'); return; } var formSummary = $('#formSummary').val(); - if(!formSummary) { + if (!formSummary) { top.dialog.msg('请输入表单描述'); return; } var data = options.data; - if(data.length == 0) { + if (data.length == 0) { top.dialog.msg('请添加组件'); return; } - var pageCode = getHtmlCode(); + var savePageCode = getSavePageCode(); + var updatePageCode = getUpdatePageCode(); + var showPageCode = getShowPageCode(); + var appSavePageCode = getAppSavePageCode(); + var appUpdatePageCode = getAppUpdatePageCode(); + var appShowPageCode = getAppShowPageCode(); - top.dialog.confirm(top.dataMessage.commit, function(index) { + top.dialog.confirm(top.dataMessage.commit, function (index) { top.dialog.close(index); var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/form-design/save', []), { @@ -1428,25 +2183,30 @@ layui.config({ formName: formName, formSummary: formSummary, data: data, - code: pageCode - }, null, function(code, data) { + savePageCode: savePageCode, + updatePageCode: updatePageCode, + showPageCode: showPageCode, + appSavePageCode: appSavePageCode, + appUpdatePageCode: appUpdatePageCode, + appShowPageCode: appShowPageCode + }, null, function (code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], shade: 0.3, - yes: function(index) { + yes: function (index) { top.dialog.close(index); window.location.reload(); }, - btn2: function() { - closeBox(); + btn2: function () { + parent.layer.close(parent.layer.getFrameIndex(window.name)); } }); - }, function(code, data) { + }, function (code, data) { top.dialog.msg(data.msg); - }, function() { + }, function () { loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3}); - }, function() { + }, function () { top.dialog.close(loadLayerIndex); }); }); @@ -1495,7 +2255,7 @@ layui.config({ layRate.componentRender(item); } else if (item.tag === 'carousel') { layCarousel.componentRender(item); - } else if(item.tag === 'uploadImage') { + } else if (item.tag === 'uploadImage') { uploadImage.componentRender(item); } else if (item.tag === 'uploadFile') { uploadFile.componentRender(item); @@ -1523,23 +2283,11 @@ layui.config({ options.htmlCode.script += ['laydate.render({', 'elem: "#' + item.tag + item.id + '" ,', 'type:"' + item.datetype + '",', 'format:"' + item.dateformat + '",', 'value:"' + item.dateDefaultValue + '",', 'min:"' + item.dataMinValue + '",', 'max:"' + item.dataMaxValue + '"});'].join(''); } else if (item.tag === 'rate') { options.htmlCode.script += ['rate.render({', 'elem: "#' + item.tag + item.id + '" ,', 'value: ' + item.defaultValue + ',', 'text: ' + item.text + ',', 'length: ' + item.rateLength + ',', 'half: ' + item.half + ',', 'readonly: ' + item.readonly + ',', 'choose: function(value){', '$("#' + item.id + '").find("input[name="' + item.id + '"]").val(value);', '}', '});'].join(''); - } else if (item.tag === 'colorpicker') { - options.htmlCode.script += ['colorpicker.render({', 'elem: "#' + item.tag + item.id + '"', ',format: \'rgb\'', ',predefine: true', ',alpha: true', ',done: function (color) {', '$("#' + item.id + '").find("input[name="' + item.id + '"]").val(color);', '}', '});'].join(''); - } else if (item.tag === 'editor') { - options.htmlCode.script += ['var e = new ice.editor(' + item.tag + item.id + ');', 'e.width=' + item.width + '; //宽度', 'e.height=' + item.height + '; //高度', 'e.uploadUrl=' + item.uploadUrl + '; //上传文件路径', 'e.disabled=' + item.disabled + ';', 'e.menu = ' + item.menu + ';', 'e.create();'].join(''); } else if (item.tag === 'carousel') { options.htmlCode.script += ['carousel.render({', 'elem: "#' + item.tag + item.id + '" ', ',width: "' + item.width + '"', ',height: "' + item.height + '"', ',arrow: "' + item.arrow + '"', ',interval: "' + item.interval + '"', ',anim: "' + item.anim + '"', ',autoplay: "' + item.autoplay + '"', '});'].join(''); - } else if (item.tag === 'labelGeneration') { - options.htmlCode.script += ['labelGeneration.render({', 'elem:"#' + item.tag + item.id + '",', 'data:' + item.dateDefaultValue + ',', 'isEnter:' + item.isEnter + '', '});'].join(''); - } else if (item.tag === 'iconPicker') { - options.htmlCode.script += ['iconPicker.render({', 'elem:"#' + item.tag + item.id + '",', 'type:"fontClass",', 'search:' + item.iconPickerSearch + '', 'page:' + item.iconPickerPage + '', 'limit:' + item.iconPickerLimit + '', 'cellWidth:' + item.iconPickerCellWidth + '', ' click: function (data) {},', 'success: function(d) {}', '});', 'iconPicker.checkIcon(' + item.tag + item.id + ',"");'].join(''); - } else if (item.tag === 'dateRange') { - options.htmlCode.script += ['laydate.render({', 'elem:"#' + item.tag + item.id + '",', 'type:' + item.datetype + ',', 'format:' + item.dateformat + '', 'min:' + item.dataMinValue + '', 'max:' + item.dataMaxValue + '', 'range:["#start-' + item.tag + item.id + '", "#end-' + item.tag + item.id + '"]', '});'].join(''); - } else if (item.tag === 'cron' && !item.disabled) { - options.htmlCode.script += ['cron.render({', 'elem:"#' + item.tag + item.id + '-button",', 'url:' + item.cronUrl + ',', 'done: function (cronStr) {', '$("#' + item.tag + item.id + '").val(cronStr);', '},', '});'].join(''); - } else if (item.tag === 'file') { + } else if (item.tag === 'uploadFile') { options.htmlCode.script += ['upload.render({', 'elem: "#' + item.tag + item.id + '" ', ', url: "' + item.uploadUrl + '"', ' ,elemList: $("#list-' + item.id + '")', ',accept: "file"', ',multiple: true', ',number: 3', ',auto: false', ',bindAction: "#listAction-' + item.id + '"', ',choose: function(obj){', 'var that = this;', 'var files = this.files = obj.pushFile();', 'obj.preview(function(index, file, result){', 'var tr = $([""', ',""+ file.name +""', ',""+ (file.size/1014).toFixed(1) +"kb"', ',"
"', ',"","","",""', ',""].join(""));', 'tr.find(".demo-reload").on("click", function(){obj.upload(index, file);});', 'tr.find(".demo-delete").on("click", function(){delete files[index];tr.remove();uploadListIns.config.elem.next()[0].value = ""; });', 'that.elemList.append(tr);', 'element.render("progress");}', ',done: function(res, index, upload)', '{var that = this;if(res.code == 0){var tr = that.elemList.find("tr#upload-"+ index),tds = tr.children();tds.eq(3).html("");delete this.files[index];return;}this.error(index, upload);}', ',allDone: function(obj){console.log(obj)}', ',error: function(index, upload){var that = this;var tr = that.elemList.find("tr#upload-"+ index),', 'tds = tr.children();tds.eq(3).find(".demo-reload").removeClass("layui-hide");}', ',progress: function(n, elem, e, index){element.progress("progress-demo-"+ index, n + "%");}', '});'].join(''); - } else if (item.tag === 'image') { + } else if (item.tag === 'uploadImage') { options.htmlCode.script += ['upload.render({', 'elem: "#' + item.tag + item.id + '" ', ', url: "' + item.uploadUrl + '"', ', multiple: true', ', before: function (obj) {', 'layer.msg("图片上传中...", {', 'icon: 16,', 'shade: 0.01,', 'time: 0', '})', '}', ', done: function (res) {', 'layer.close(layer.msg());', '$("#uploader-list-' + item.id + '").append(', '\'
', '
\'+ res.data.title+\'
', '
\'', ');', '}', '});'].join(''); } else if (item.tag === 'checkbox') { options.htmlCode.script += ['form.verify({otherReq: function(value,item){' + 'var verifyName=$(item).attr("name"), verifyType=$(item).attr("type")' + ',formElem=$(item).parents(".layui-form"),verifyElem=formElem.find("input[name=\'"+verifyName+"\']")' + ',verifyElems = formElem.find("input"),isTrue= verifyElem.is(":checked"),focusElem = verifyElem.next().find("i.layui-icon");' + 'for (let i = 0; i < verifyElems.length; i++) {if (verifyElems[i].checked) {return false;}}' + 'if(!isTrue || !value){' + 'focusElem.css(verifyType=="radio"?{"color":"#FF5722"}:{"border-color":"#FF5722"});' + 'focusElem.first().attr("tabIndex","1").css("outline","0").blur(function() {' + 'focusElem.css(verifyType==\'radio\'?{"color":""}:{"border-color":""});' + '}).focus();' + 'return "必填项不能为空";}}});'].join(''); diff --git a/module-form/src/main/resources/static/form-design/modules/formField.js b/module-form/src/main/resources/static/form-design/modules/formField.js index 4c94d94c..4dc878ee 100644 --- a/module-form/src/main/resources/static/form-design/modules/formField.js +++ b/module-form/src/main/resources/static/form-design/modules/formField.js @@ -348,13 +348,18 @@ layui.define(['layer'], function (exports) { label: "上传图片", tag: "uploadImage", tagIcon: 'image', - placeholder: "请输入", - defaultValue: null, - labelWidth: null, - disabled: false, - required: true, document: '', - uploadUrl: '', + uploadUrl: '${imageUploadPath}', + count: 9 + }, + uploadFile: { + id: '-1', + index: '-1', + label: "上传文件", + tag: "uploadFile", + tagIcon: 'file', + document: '', + uploadUrl: '${fileUploadPath}', count: 9 }, colorpicker: { @@ -373,20 +378,6 @@ layui.define(['layer'], function (exports) { disabled: false, document: '', }, - uploadFile: { - id: '-1', - index: '-1', - label: "上传文件", - tag: "uploadFile", - tagIcon: 'file', - placeholder: "请输入", - defaultValue: null, - labelWidth: null, - disabled: false, - required: true, - document: '', - uploadUrl: '', - }, textarea: { id: '-1', index: '-1', diff --git a/module-form/src/main/resources/static/form-design/modules/formUtils.js b/module-form/src/main/resources/static/form-design/modules/formUtils.js index 94e1c641..dcc4854a 100644 --- a/module-form/src/main/resources/static/form-design/modules/formUtils.js +++ b/module-form/src/main/resources/static/form-design/modules/formUtils.js @@ -12,6 +12,11 @@ layui.define(['form', 'laytpl', 'restajax', 'dialog', 'consts'], function (expor var lang = consts.lang; + /** + * 刷新属性 + * @param json + * @returns {string} + */ var renderCommonProperty = function (json) { var _html = ''; for (var key in json) { @@ -116,6 +121,13 @@ layui.define(['form', 'laytpl', 'restajax', 'dialog', 'consts'], function (expor _html += ' '.format(key, json[key] == undefined ? '' : json[key], lang[key]); _html += ' '; _html += ''; + } else if (key === 'count') { + _html += '
'; + _html += ' '.format(lang[key]); + _html += '
'; + _html += ' '.format(key, json[key] == undefined ? '' : json[key], lang[key]); + _html += '
'; + _html += '
'; } else if (key === 'width' || key === 'labelWidth') { _html += '
'; _html += ' '.format(lang[key]); diff --git a/module-form/src/main/resources/templates/form/get-app-save-page-code.html b/module-form/src/main/resources/templates/form/get-app-save-page-code.html new file mode 100644 index 00000000..65f39fda --- /dev/null +++ b/module-form/src/main/resources/templates/form/get-app-save-page-code.html @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/get-app-show-page-code.html b/module-form/src/main/resources/templates/form/get-app-show-page-code.html new file mode 100644 index 00000000..17ee6829 --- /dev/null +++ b/module-form/src/main/resources/templates/form/get-app-show-page-code.html @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/get-app-update-page-code.html b/module-form/src/main/resources/templates/form/get-app-update-page-code.html new file mode 100644 index 00000000..c3beccf5 --- /dev/null +++ b/module-form/src/main/resources/templates/form/get-app-update-page-code.html @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/get-form-page-code.html b/module-form/src/main/resources/templates/form/get-save-page-code.html similarity index 86% rename from module-form/src/main/resources/templates/form/get-form-page-code.html rename to module-form/src/main/resources/templates/form/get-save-page-code.html index 82dfd29f..ac322cc6 100644 --- a/module-form/src/main/resources/templates/form/get-form-page-code.html +++ b/module-form/src/main/resources/templates/form/get-save-page-code.html @@ -19,7 +19,7 @@
- +
@@ -27,7 +27,6 @@
@@ -50,7 +49,10 @@ var win = $(window) var form = layui.form; var laytpl = layui.laytpl; - var formId = top.restAjax.params(window.location.href).formId; + var params = top.restAjax.params(window.location.href); + var formId = params.formId; + var formCode = params.formCode; + var formVersion = params.formVersion; var codeMirrorConfig = { lineNumbers: true, theme: 'dracula', @@ -74,24 +76,24 @@ } function initFormHtml(value) { - var editor = CodeMirror.fromTextArea(document.getElementById('formPageCode'), codeMirrorConfig); + var editor = CodeMirror.fromTextArea(document.getElementById('savePageCode'), codeMirrorConfig); editor.setValue(value); editor.setSize('100%', win.height() - 90); editor.on('change', function(self, changeValue) { - $('#formPageCode').val(self.getValue()); + $('#savePageCode').val(self.getValue()); }) } // 初始化 function initData() { var loadLayerIndex; - top.restAjax.get(top.restAjax.path('api/form/get-form-page-code/{formId}', [formId]), {}, null, function(code, data) { + top.restAjax.get(top.restAjax.path('api/form/get-save-page-code/code/{formCode}/version/{formVersion}', [formCode, formVersion]), {}, null, function(code, data) { form.val('dataForm', { - formPageCode: data.formPageCode, + savePageCode: data.savePageCode, }); form.render(null, 'dataForm'); - initFormHtml(data.formPageCode); + initFormHtml(data.savePageCode); }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -107,7 +109,7 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - top.restAjax.put(top.restAjax.path('api/login-form/update/{loginFormId}', [loginFormId]), formData.field, null, function(code, data) { + top.restAjax.put(top.restAjax.path('api/form/update-save-page-code/{formId}', [formId]), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], diff --git a/module-form/src/main/resources/templates/form/get-show-page-code.html b/module-form/src/main/resources/templates/form/get-show-page-code.html new file mode 100644 index 00000000..4678ad15 --- /dev/null +++ b/module-form/src/main/resources/templates/form/get-show-page-code.html @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/get-update-page-code.html b/module-form/src/main/resources/templates/form/get-update-page-code.html new file mode 100644 index 00000000..ac634ad5 --- /dev/null +++ b/module-form/src/main/resources/templates/form/get-update-page-code.html @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/list.html b/module-form/src/main/resources/templates/form/list.html index 64eaca05..c0d29af0 100644 --- a/module-form/src/main/resources/templates/form/list.html +++ b/module-form/src/main/resources/templates/form/list.html @@ -110,9 +110,22 @@ } }, {field:'formTableName', width:200, title: '表名', align:'center', }, - {field:'formPageCode', width:100, title: '代码', align:'center', + {field:'pcPageCode', width:220, title: 'PC端代码', align:'center', templet: function(item) { - return ''; + return '
' + + '' + + '' + + '' + + '
'; + } + }, + {field:'appPageCode', width:220, title: 'APP端代码', align:'center', + templet: function(item) { + return '
' + + '' + + '' + + '' + + '
'; } }, {field:'formSourceData', width:100, title: '原数据', align:'center', @@ -120,10 +133,10 @@ return ''; } }, - {field:'opition', width:80, title: '操作', fixed:'right', align:'center', + {field:'opition', width:120, title: '操作', fixed:'right', align:'center', templet: function(item) { return '
' + - ''+ + ''+ '
'; } } @@ -146,7 +159,6 @@ where: { keywords: $('#keywords').val(), }, - height: $win.height() - 60, }); } // 初始化日期 @@ -235,10 +247,55 @@ table.on('tool(dataTable)', function(obj) { var event = obj.event; var data = obj.data; - if(event === 'showCodeEvent') { + if(event === 'savePageCodeEvent') { top.dialog.open({ - title: '模板代码', - url: top.restAjax.path('route/form/get-form-page-code?formId={formId}', [data.formId]), + title: '新增页面模板', + url: top.restAjax.path('route/form/get-save-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '80%', + height: '80%', + onClose: function () { + } + }) + } else if(event === 'updatePageCodeEvent') { + top.dialog.open({ + title: '修改页面模板', + url: top.restAjax.path('route/form/get-update-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '80%', + height: '80%', + onClose: function () { + } + }) + } else if(event === 'showPageCodeEvent') { + top.dialog.open({ + title: '详情页面模板', + url: top.restAjax.path('route/form/get-show-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '80%', + height: '80%', + onClose: function () { + } + }) + } else if(event === 'appSavePageCodeEvent') { + top.dialog.open({ + title: 'APP新增页面模板', + url: top.restAjax.path('route/form/get-app-save-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '80%', + height: '80%', + onClose: function () { + } + }) + } else if(event === 'appUpdatePageCodeEvent') { + top.dialog.open({ + title: 'APP修改页面模板', + url: top.restAjax.path('route/form/get-app-update-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '80%', + height: '80%', + onClose: function () { + } + }) + } else if(event === 'appShowPageCodeEvent') { + top.dialog.open({ + title: 'APP详情页面模板', + url: top.restAjax.path('route/form/get-app-show-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), width: '80%', height: '80%', onClose: function () {