yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5606 表单和制度建模页面，预览手册报错，需要调整

Browse Source
This commit is contained in:
446052889@qq.com 2022-09-23 09:53:06 +08:00
parent 9f4f683f41
commit 651f57dd9f
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

7
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
View File

@ -2509,6 +2509,13 @@ public class CoEPALController {
// @Mapping("COE_PAL_OUTPUTREPORT_OUTPUT_PROCESS_CREATE") // @Mapping("COE_PAL_OUTPUTREPORT_OUTPUT_PROCESS_CREATE")
@Mapping("com.actionsoft.apps.coe.pal_outputreport_output_process_create") @Mapping("com.actionsoft.apps.coe.pal_outputreport_output_process_create")
public String COEPALOUTPUTREPORTOutputProcessCreate (UserContext me, String wsId, String teamId, String fileId) { public String COEPALOUTPUTREPORTOutputProcessCreate (UserContext me, String wsId, String teamId, String fileId) {
PALRepositoryModel model = PALRepositoryCache.getCache().get(fileId);
String methodId = model.getMethodId();
if ("data.form".equals(methodId)) {
return PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, me.getUID(), teamId, fileId);
} else if ("control.policy".equals(methodId)) {
return PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, me.getUID(), teamId, fileId);
}
return PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, me.getUID(), teamId, fileId); return PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, me.getUID(), teamId, fileId);
} }

6
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java
View File

@ -960,11 +960,15 @@ public class OutPutReportWeb extends ActionWeb {
String appId = model.getAppContext().getId(); String appId = model.getAppContext().getId();
if ("com.actionsoft.apps.coe.pal.output.pr".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) { if ("com.actionsoft.apps.coe.pal.output.pr".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) {
newList.add(model); newList.add(model);
} else if ("com.awspaas.user.apps.coe.pal.output.bd".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) {
newList.add(model);
} else if ("com.awspaas.user.apps.coe.pal.output.zd".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) {
newList.add(model);
} }
} }
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
for (OutputAppProfile model : newList) { for (OutputAppProfile model : newList) {
com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject(); JSONObject object = new JSONObject();
object.put("id", model.getId()); object.put("id", model.getId());
object.put("groupName", model.getGroupName()); object.put("groupName", model.getGroupName());
object.put("title", model.getTitle()); object.put("title", model.getTitle());

8
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
View File

@ -365,6 +365,12 @@
} }
$("#upfile").on('click',openUpFile);//附件上传页面 $("#upfile").on('click',openUpFile);//附件上传页面
if(processOutput) { // 导出流程手册菜单控制 if(processOutput) { // 导出流程手册菜单控制
// debugger;
if (methodId == 'data.form') {
$('#export_report').text('导出表单手册');
} else if (methodId == 'control.policy') {
$('#export_report').text('导出制度手册');
}
outputProcess(); outputProcess();
} }
if (moreShapeButton == '') {// 显示按钮 if (moreShapeButton == '') {// 显示按钮
@ -1566,7 +1572,7 @@
<li class="devider"></li> <li class="devider"></li>
<li ac="processExport">导出</li> <li ac="processExport">导出</li>
<li class="devider" data-name="processOutput" style="display:none;"></li> <li class="devider" data-name="processOutput" style="display:none;"></li>
<li ac="output" data-name="processOutput" style="display:none;">预览流程手册</li> <li id="export_report" ac="output" data-name="processOutput" style="display:none;">预览流程手册</li>
<li class="devider"></li> <li class="devider"></li>
<li ac="saveImage">生成图片和缩略图</li> <li ac="saveImage">生成图片和缩略图</li>
<!--<li class="devider"></li> <!--<li class="devider"></li>