图形描述功能

This commit is contained in:
446052889@qq.com 2022-07-01 00:21:08 +08:00
parent 04a06b9ad0
commit 28995fb35e
59 changed files with 285 additions and 214 deletions

File diff suppressed because one or more lines are too long

View File

@ -57,7 +57,7 @@ public class CoEPALController {
@Mapping("com.actionsoft.apps.coe.pal_main_page") @Mapping("com.actionsoft.apps.coe.pal_main_page")
public String COEPALMAIN(UserContext me, String wsuuid) { public String COEPALMAIN(UserContext me, String wsuuid) {
Map<String, Object> macroLibraries = new HashMap<String, Object>(); Map<String, Object> macroLibraries = new HashMap<String, Object>();
CoeWorkSpaceModel model = (CoeWorkSpaceModel) CoeWorkSpaceDaoFactory.createCoeWorkSpace().getInstance(wsuuid); CoeWorkSpaceModel model = CoeWorkSpaceDaoFactory.createCoeWorkSpace().getInstance(wsuuid);
macroLibraries.put("sid", me.getSessionId()); macroLibraries.put("sid", me.getSessionId());
macroLibraries.put("wsuuid", wsuuid); macroLibraries.put("wsuuid", wsuuid);
// 资产库去掉了版本号已不做多版本 // 资产库去掉了版本号已不做多版本
@ -203,6 +203,16 @@ public class CoEPALController {
return web.getManageMethodData(); return web.getManageMethodData();
} }
/**
* 保存形状定义描述
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_pl_manage_method_object_desc_save")
public String coePalPlManageMethodObjectDescSave(UserContext me, String shapeName, String desc, String methodId) {
PalManageWeb web = new PalManageWeb(me);
return web.saveMethodObjectDesc(shapeName, desc, methodId);
}
/** /**
* 建模方法->查询特定建模方法的形状定义数据 * 建模方法->查询特定建模方法的形状定义数据
* @param me * @param me
@ -1331,7 +1341,7 @@ public class CoEPALController {
@Deprecated @Deprecated
@Mapping("com.actionsoft.apps.coe.pal_processlevel_query_check") @Mapping("com.actionsoft.apps.coe.pal_processlevel_query_check")
public String coePALPROCESSLEVELQUERYCHECK(UserContext me, String uuid) { public String coePALPROCESSLEVELQUERYCHECK(UserContext me, String uuid) {
PALRepositoryModel coeProcessLevelModel = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid); PALRepositoryModel coeProcessLevelModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid);
return coeProcessLevelModel != null ? uuid : ""; return coeProcessLevelModel != null ? uuid : "";
} }

View File

@ -418,24 +418,26 @@ public class PalManageWeb extends ActionWeb {
tempSchema = replaceTextEPC(tempSchema); tempSchema = replaceTextEPC(tempSchema);
List<String> list = getSchemaToJson(tempSchema); List<String> list = getSchemaToJson(tempSchema);
String type = I18nRes.findValue(CoEConstant.APP_ID, methodId.split("\\.")[0]); String type = I18nRes.findValue(CoEConstant.APP_ID, methodId.split("\\.")[0]);
// 建模对象描述
JSONObject methodObjectDesc = SDK.getAppAPI().getPropertyJSONObjectValue(CoEConstant.APP_ID, "METHOD_OBJECT_DESC", new JSONObject());
JSONArray data = new JSONArray(); JSONArray data = new JSONArray();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
String s = list.get(i); String s = list.get(i);
String name = ""; String name = "";
String title = ""; String title = "";
if (s.contains("name:\"")) { if (s.contains("name:\"")) {
s = s.substring(s.indexOf("name:\""), s.length()); s = s.substring(s.indexOf("name:\""));
name = s.substring(s.indexOf("name:\"") + 6, s.indexOf("\",")); name = s.substring(s.indexOf("name:\"") + 6, s.indexOf("\","));
} else { } else {
s = s.substring(s.indexOf("name:"), s.length()); s = s.substring(s.indexOf("name:"));
name = s.substring(s.indexOf("name:") + 5, s.indexOf("\",")); name = s.substring(s.indexOf("name:") + 5, s.indexOf("\","));
} }
if (s.contains("title:\"")) { if (s.contains("title:\"")) {
s = s.substring(s.indexOf("title:\""), s.length()); s = s.substring(s.indexOf("title:\""));
title = s.substring(s.indexOf("title:\"") + 7, s.indexOf("\",")); title = s.substring(s.indexOf("title:\"") + 7, s.indexOf("\","));
} else { } else {
s = s.substring(s.indexOf("title:"), s.length()); s = s.substring(s.indexOf("title:"));
title = s.substring(s.indexOf("title:") + 6, s.indexOf(",")); title = s.substring(s.indexOf("title:") + 6, s.indexOf(","));
} }
if ("Participant".equals(title) || "VerticalSeparatorBar".equals(title) || "verticalSeparatorBar".equals(name) || "horizontalSeparatorBar".equals(name)) { if ("Participant".equals(title) || "VerticalSeparatorBar".equals(title) || "verticalSeparatorBar".equals(name) || "horizontalSeparatorBar".equals(name)) {
@ -452,6 +454,12 @@ public class PalManageWeb extends ActionWeb {
obj.put("modelId", methodId); obj.put("modelId", methodId);
obj.put("type", type); obj.put("type", type);
obj.put("showShapeConfig", !name.equals("horizontalSeparator") && !name.equals("verticalSeparator")); obj.put("showShapeConfig", !name.equals("horizontalSeparator") && !name.equals("verticalSeparator"));
// 描述信息查询
String desc = "";
if (methodObjectDesc.containsKey(methodId) && methodObjectDesc.getJSONObject(methodId).containsKey(name) && methodObjectDesc.getJSONObject(methodId).getJSONObject(name).containsKey("desc")) {
desc = methodObjectDesc.getJSONObject(methodId).getJSONObject(name).getString("desc");
}
obj.put("desc", desc);
data.add(obj); data.add(obj);
} }
ro.put("data", data); ro.put("data", data);
@ -1410,4 +1418,25 @@ public class PalManageWeb extends ActionWeb {
return HtmlPageTemplate.merge(CoEConstant.APP_ID, template, map); return HtmlPageTemplate.merge(CoEConstant.APP_ID, template, map);
} }
/**
* 保存形状定义描述
* @param shapeName 形状name
* @param desc 形状定义描述
* @param methodId 建模方法
* @return
*/
public String saveMethodObjectDesc(String shapeName, String desc, String methodId) {
ResponseObject ro = ResponseObject.newOkResponse();
desc = desc == null ? "" : desc.trim();
JSONObject methodObjectDesc = SDK.getAppAPI().getPropertyJSONObjectValue(CoEConstant.APP_ID, "METHOD_OBJECT_DESC", new JSONObject());
if (!methodObjectDesc.containsKey(methodId)) {
methodObjectDesc.put(methodId, new JSONObject());
}
if (!methodObjectDesc.getJSONObject(methodId).containsKey(shapeName)) {
methodObjectDesc.getJSONObject(methodId).put(shapeName, new JSONObject());
}
methodObjectDesc.getJSONObject(methodId).getJSONObject(shapeName).put("desc", desc);
SDK.getAppAPI().setProperty(CoEConstant.APP_ID, "METHOD_OBJECT_DESC", methodObjectDesc.toString());
return ro.toString();
}
} }

View File

@ -5,6 +5,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -183,11 +184,11 @@ public class CoeDesignerWeb extends ActionWeb {
try { try {
int size = myArray.size(); int size = myArray.size();
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
uid = myArray.get(i).toString(); uid = myArray.get(i);
if (uid.trim().equals("")) if (uid.trim().equals(""))
continue; continue;
uid = SDK.getORGAPI().getUserId(uid); uid = SDK.getORGAPI().getUserId(uid);
UserModel model = (UserModel) UserCache.getModel(uid); UserModel model = UserCache.getModel(uid);
String name = uid; String name = uid;
if (model != null) { if (model != null) {
name = model.getUserName(); name = model.getUserName();
@ -461,7 +462,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (!plModel.isPublish() && !isView && !plModel.isStop() && !plModel.isApproval()) { if (!plModel.isPublish() && !isView && !plModel.isStop() && !plModel.isApproval()) {
CoeListenCacheManager manager = CoeListenCacheManager.getInstance(); CoeListenCacheManager manager = CoeListenCacheManager.getInstance();
Map<String, ListenClient> listenClients = manager.getCollaborationUsers(rUUID); Map<String, ListenClient> listenClients = manager.getCollaborationUsers(rUUID);
StringBuilder userPhoto = new StringBuilder(""); StringBuilder userPhoto = new StringBuilder();
int userNum = 1; int userNum = 1;
if (listenClients != null) { if (listenClients != null) {
for (ListenClient listenClient : listenClients.values()) { for (ListenClient listenClient : listenClients.values()) {
@ -502,11 +503,7 @@ public class CoeDesignerWeb extends ActionWeb {
UtilFile utilFile = new UtilFile(p + "/" + plModel.getId() + ".png"); UtilFile utilFile = new UtilFile(p + "/" + plModel.getId() + ".png");
if (utilFile.exists()) { if (utilFile.exists()) {
byte[] base64Bytes = Base64.encode(utilFile.readBytes()); byte[] base64Bytes = Base64.encode(utilFile.readBytes());
try { diagram = "data:image/png;base64," + new String(base64Bytes, StandardCharsets.UTF_8);
diagram = "data:image/png;base64," + new String(base64Bytes, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
} }
@ -604,6 +601,8 @@ public class CoeDesignerWeb extends ActionWeb {
} }
// 帮助工具栏扩展 // 帮助工具栏扩展
getHelptoolExtUrl(macroLibraries); getHelptoolExtUrl(macroLibraries);
// 图形描述
getMethodObjectDesc(macroLibraries);
// 操作行为日志记录 // 操作行为日志记录
if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) { if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_ACCESS, CoEOpLogConst.INFO_REPOSITORY_ACCESS); CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_ACCESS, CoEOpLogConst.INFO_REPOSITORY_ACCESS);
@ -624,6 +623,27 @@ public class CoeDesignerWeb extends ActionWeb {
} }
} }
/**
* 获取形状描述定义
* @param macroLibraries
*/
private void getMethodObjectDesc(Map<String, Object> macroLibraries) {
JSONObject result = new JSONObject();
JSONObject methodObjectDesc = SDK.getAppAPI().getPropertyJSONObjectValue(CoEConstant.APP_ID, "METHOD_OBJECT_DESC", new JSONObject());
for (String methodId : methodObjectDesc.keySet()) {
for (String shapeName : methodObjectDesc.getJSONObject(methodId).keySet()) {
JSONObject shapeObj = methodObjectDesc.getJSONObject(methodId).getJSONObject(shapeName);
if (shapeObj.containsKey("desc")) {
String desc = shapeObj.getString("desc");
if (desc != null && !"".equals(desc.trim())) {
result.put(methodId + '-' + shapeName, desc);
}
}
}
}
macroLibraries.put("methodObjectDesc", result);
}
/** /**
* 帮助工具栏扩展 * 帮助工具栏扩展
* @param macroLibraries * @param macroLibraries
@ -733,11 +753,7 @@ public class CoeDesignerWeb extends ActionWeb {
e.printStackTrace(); e.printStackTrace();
} }
byte[] base64Bytes = Base64.encode(utilFile.readBytes()); byte[] base64Bytes = Base64.encode(utilFile.readBytes());
try { diagram = "data:image/png;base64," + new String(base64Bytes, StandardCharsets.UTF_8);
diagram = "data:image/png;base64," + new String(base64Bytes, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
} }
@ -913,7 +929,7 @@ public class CoeDesignerWeb extends ActionWeb {
macroLibraries.put("checkouttime", UtilDate.getAliasDatetime(DesignerFileUtil.getCheckOutTime(appId, processDefId))); macroLibraries.put("checkouttime", UtilDate.getAliasDatetime(DesignerFileUtil.getCheckOutTime(appId, processDefId)));
macroLibraries.put("checkoutip", DesignerFileUtil.getCheckOutIP(appId, processDefId)); macroLibraries.put("checkoutip", DesignerFileUtil.getCheckOutIP(appId, processDefId));
macroLibraries.put("user", getContext().getUID()); macroLibraries.put("user", getContext().getUID());
UserModel model = (UserModel) UserCache.getModel(getContext().getUID()); UserModel model = UserCache.getModel(getContext().getUID());
macroLibraries.put("currentUserName", model.getUserName()); macroLibraries.put("currentUserName", model.getUserName());
} }
@ -1441,7 +1457,7 @@ public class CoeDesignerWeb extends ActionWeb {
public JSONArray getHistoryDataJson(String uuid) { public JSONArray getHistoryDataJson(String uuid) {
JSONArray historyJson = new JSONArray(); JSONArray historyJson = new JSONArray();
PALRepositoryModel plModel = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid); PALRepositoryModel plModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid);
if (!"".equals(plModel.getFilePath())) { if (!"".equals(plModel.getFilePath())) {
CoeFile jsonUtil = new CoeFile(); CoeFile jsonUtil = new CoeFile();
historyJson = jsonUtil.getHistoryJsonData(plModel.getFilePath()); historyJson = jsonUtil.getHistoryJsonData(plModel.getFilePath());
@ -1462,7 +1478,7 @@ public class CoeDesignerWeb extends ActionWeb {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
JSONArray versions = getHistoryDataJson(uuid); JSONArray versions = getHistoryDataJson(uuid);
JSONObject users = new JSONObject(); JSONObject users = new JSONObject();
UserModel model = (UserModel) UserCache.getModel(getContext().getUID()); UserModel model = UserCache.getModel(getContext().getUID());
users.put(getContext().getUID(), model.getUserName()); users.put(getContext().getUID(), model.getUserName());
json.put("users", users); json.put("users", users);
json.put("versions", versions); json.put("versions", versions);
@ -1561,7 +1577,7 @@ public class CoeDesignerWeb extends ActionWeb {
* @deprecated * @deprecated
*/ */
private Map<String, String> updateCPShapes(String olduuid, String uuId, String define) { private Map<String, String> updateCPShapes(String olduuid, String uuId, String define) {
PALRepositoryModel levelModel = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuId); PALRepositoryModel levelModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuId);
String filePath = levelModel.getFilePath(); String filePath = levelModel.getFilePath();
filePath = filePath + File.separator + levelModel.getId(); filePath = filePath + File.separator + levelModel.getId();
UtilFile utilFile = new UtilFile(filePath); UtilFile utilFile = new UtilFile(filePath);
@ -1582,11 +1598,7 @@ public class CoeDesignerWeb extends ActionWeb {
} }
} }
if (list.size() > 0 && updateShapes(list, uuId)) { if (list.size() > 0 && updateShapes(list, uuId)) {
try { utilFile.write(messageJson.getBytes(StandardCharsets.UTF_8));
utilFile.write(messageJson.getBytes("utf-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
DesignerRelationShapeCacheManager cache = DesignerRelationShapeCacheManager.getInstance(); DesignerRelationShapeCacheManager cache = DesignerRelationShapeCacheManager.getInstance();
Map<String, Set<JSONObject>> shapeMap = cache.getEventMap(); Map<String, Set<JSONObject>> shapeMap = cache.getEventMap();
@ -1691,7 +1703,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (uuid.indexOf("obj_") == 0) { if (uuid.indexOf("obj_") == 0) {
photo = "data:image/png;base64," + BPMNIO.getBPMNImage( ProcessDefCache.getInstance().getModel(uuid).getAppId(), uuid); photo = "data:image/png;base64," + BPMNIO.getBPMNImage( ProcessDefCache.getInstance().getModel(uuid).getAppId(), uuid);
} else { } else {
PALRepositoryModel cplm = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid); PALRepositoryModel cplm = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid);
if (cplm != null) { if (cplm != null) {
PALRepositoryQueryAPIManager.getInstance().checkImage(cplm.getId(), true, false);// 生成图片 PALRepositoryQueryAPIManager.getInstance().checkImage(cplm.getId(), true, false);// 生成图片
String path = cplm.getFilePath(); String path = cplm.getFilePath();
@ -1699,11 +1711,7 @@ public class CoeDesignerWeb extends ActionWeb {
UtilFile utilFile = new UtilFile(path + "/" + cplm.getId() + ".png"); UtilFile utilFile = new UtilFile(path + "/" + cplm.getId() + ".png");
if (utilFile.exists()) { if (utilFile.exists()) {
byte[] base64Bytes = Base64.encode(utilFile.readBytes()); byte[] base64Bytes = Base64.encode(utilFile.readBytes());
try { photo = "data:image/png;base64," + new String(base64Bytes, StandardCharsets.UTF_8);
photo = "data:image/png;base64," + new String(base64Bytes, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
} }
} }
} }
@ -1846,7 +1854,7 @@ public class CoeDesignerWeb extends ActionWeb {
FileOutputStream fos = null; FileOutputStream fos = null;
try { try {
fos = new FileOutputStream(exportFile); fos = new FileOutputStream(exportFile);
fos.write(buffer.toString().getBytes("UTF-8")); fos.write(buffer.toString().getBytes(StandardCharsets.UTF_8));
fos.flush(); fos.flush();
fos.close(); fos.close();
} catch (IOException e) { } catch (IOException e) {
@ -1913,7 +1921,7 @@ public class CoeDesignerWeb extends ActionWeb {
FileOutputStream fos = null; FileOutputStream fos = null;
try { try {
fos = new FileOutputStream(exportFile); fos = new FileOutputStream(exportFile);
fos.write(JSON.toJSONString(object).getBytes("UTF-8")); fos.write(JSON.toJSONString(object).getBytes(StandardCharsets.UTF_8));
fos.flush(); fos.flush();
fos.close(); fos.close();
} catch (IOException e) { } catch (IOException e) {
@ -1935,7 +1943,7 @@ public class CoeDesignerWeb extends ActionWeb {
e.printStackTrace(); e.printStackTrace();
} }
} else { } else {
PALRepositoryModel cplm = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid); PALRepositoryModel cplm = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid);
if (cplm == null) throw new AWSException("流程未找到 " + uuid); if (cplm == null) throw new AWSException("流程未找到 " + uuid);
PALRepositoryQueryAPIManager.getInstance().checkImage(cplm.getId(), true, true);// 生成图片 PALRepositoryQueryAPIManager.getInstance().checkImage(cplm.getId(), true, true);// 生成图片
String path = cplm.getFilePath(); String path = cplm.getFilePath();
@ -2052,7 +2060,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (!pdfDir.exists()) { if (!pdfDir.exists()) {
pdfDir.mkdirs(); pdfDir.mkdirs();
} }
String date = new SimpleDateFormat("yyyyMMdd").format(new Date()).toString(); String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
/*File [] pdfFiles = pdfDir.listFiles(new MyFilenameFilter(date)); /*File [] pdfFiles = pdfDir.listFiles(new MyFilenameFilter(date));
int maxNo = 0; int maxNo = 0;
if (pdfFiles != null && pdfFiles.length > 0) { if (pdfFiles != null && pdfFiles.length > 0) {
@ -2214,7 +2222,7 @@ public class CoeDesignerWeb extends ActionWeb {
if (isAdmin) { if (isAdmin) {
shapes.append(methodModel.getSchema()).append("\r\n"); shapes.append(methodModel.getSchema()).append("\r\n");
} else { } else {
shapes.append(schema.substring(0, schema.indexOf("Schema.addShape"))).append("\r\n"); shapes.append(schema, 0, schema.indexOf("Schema.addShape")).append("\r\n");
} }
if (methodModel.getCustomSchema() != null) { if (methodModel.getCustomSchema() != null) {
shapes.append(methodModel.getCustomSchema()).append("\r\n"); shapes.append(methodModel.getCustomSchema()).append("\r\n");
@ -2457,7 +2465,7 @@ public class CoeDesignerWeb extends ActionWeb {
newSchemas[i] = ""; newSchemas[i] = "";
} }
} }
oldSchema = new StringBuilder(""); oldSchema = new StringBuilder();
for (int i = 0; i < newSchemas.length; i++) { for (int i = 0; i < newSchemas.length; i++) {
if (!"".equals(newSchemas[i])) { if (!"".equals(newSchemas[i])) {
oldSchema.append("Schema.addShape").append(newSchemas[i]).append("\n\r"); oldSchema.append("Schema.addShape").append(newSchemas[i]).append("\n\r");
@ -2465,17 +2473,11 @@ public class CoeDesignerWeb extends ActionWeb {
} }
} }
try { // 写入新模板
// 写入新模板 schema = schema.replaceAll("\\\\t\\\\n", "\t\n").replaceAll("\\\\", "");
schema = schema.replaceAll("\\\\t\\\\n", "\t\n").replaceAll("\\\\", ""); schema = "Schema.addShape(" + schema + ");\n\r";
schema = "Schema.addShape(" + schema + ");\n\r"; oldSchema.append(schema);
oldSchema.append(schema); file.write(oldSchema.toString().getBytes(StandardCharsets.UTF_8));
file.write(oldSchema.toString().getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
ro = ResponseObject.newErrResponse();
return ro.toString();
}
// 更新缓存 // 更新缓存
PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelMap().get(methodId); PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelMap().get(methodId);
@ -2525,19 +2527,15 @@ public class CoeDesignerWeb extends ActionWeb {
newSchemas[i] = ""; newSchemas[i] = "";
} }
} }
StringBuilder oldSchema = new StringBuilder(""); StringBuilder oldSchema = new StringBuilder();
for (int i = 0; i < newSchemas.length; i++) { for (int i = 0; i < newSchemas.length; i++) {
if (!"".equals(newSchemas[i])) { if (!"".equals(newSchemas[i])) {
oldSchema.append("Schema.addShape").append(newSchemas[i]).append("\n\r"); oldSchema.append("Schema.addShape").append(newSchemas[i]).append("\n\r");
} }
} }
try { // 重新写入文件
// 重新写入文件 file.write(oldSchema.toString().getBytes(StandardCharsets.UTF_8));
file.write(oldSchema.toString().getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
// 重新加载缓存 // 重新加载缓存
PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelMap().get(methodId); PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelMap().get(methodId);
@ -3065,7 +3063,7 @@ public class CoeDesignerWeb extends ActionWeb {
Set<String> ids = new HashSet<>(); Set<String> ids = new HashSet<>();
sb.append(plModel.getName()); sb.append(plModel.getName());
ids.add(plModel.getId()); ids.add(plModel.getId());
getFilePath(sb, ids, (PALRepositoryModel)plModel); getFilePath(sb, ids, plModel);
macroLibraries.put("toolbarName", sb.toString()); macroLibraries.put("toolbarName", sb.toString());
List<String> shapeIds = new ArrayList<>();// 当前流程所有节点 List<String> shapeIds = new ArrayList<>();// 当前流程所有节点
@ -3309,7 +3307,7 @@ public class CoeDesignerWeb extends ActionWeb {
return null; return null;
} }
if (uuid != null && !"".equals(uuid)) { if (uuid != null && !"".equals(uuid)) {
PALRepositoryModel m = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid); PALRepositoryModel m = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(uuid);
PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelById(m.getMethodId()); PALMethodModel palMethodModel = PALMethodCache.getPALMethodModelById(m.getMethodId());
if (palMethodModel == null) { if (palMethodModel == null) {
return null; return null;
@ -3646,7 +3644,7 @@ public class CoeDesignerWeb extends ActionWeb {
*/ */
public String deletePalDesignerVersion(String wsId, String teamId, String id) { public String deletePalDesignerVersion(String wsId, String teamId, String id) {
ResponseObject ro; ResponseObject ro;
PALRepositoryModel plModel = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(id); PALRepositoryModel plModel = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(id);
List<PALRepositoryModel> list = new ArrayList<PALRepositoryModel>(); List<PALRepositoryModel> list = new ArrayList<PALRepositoryModel>();
list.add(plModel); list.add(plModel);
CoeProcessRecycleWeb recycleWeb = new CoeProcessRecycleWeb(_uc); CoeProcessRecycleWeb recycleWeb = new CoeProcessRecycleWeb(_uc);
@ -3678,7 +3676,7 @@ public class CoeDesignerWeb extends ActionWeb {
public String changePalDesignerVersionUse(String wsId, String teamId, String id) { public String changePalDesignerVersionUse(String wsId, String teamId, String id) {
int answer = 0; int answer = 0;
PALRepository repository = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); PALRepository repository = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
PALRepositoryModel lastPlModel = (PALRepositoryModel) repository.getInstance(id); PALRepositoryModel lastPlModel = repository.getInstance(id);
answer = repository.updateStateOfVersionUuid(lastPlModel.getVersionId());// 更新所有的为0 answer = repository.updateStateOfVersionUuid(lastPlModel.getVersionId());// 更新所有的为0
answer = repository.updateUseStateOfVersionUuid(lastPlModel.getId());// 更新当前版本为使用状态 answer = repository.updateUseStateOfVersionUuid(lastPlModel.getId());// 更新当前版本为使用状态
CoeProcessLevelNoCache.getInstance().reloadInBackground(lastPlModel.getWsId()); CoeProcessLevelNoCache.getInstance().reloadInBackground(lastPlModel.getWsId());

View File

@ -1,16 +1,16 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal/main/favicon.ico><title>CoE PAL流程资产库</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>; <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal/main/favicon.ico><title>CoE PAL流程资产库</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam =; <#settingParam>;
const axiosBaseUrl = "./"; const axiosBaseUrl = "./";
const production = true;</script><script>var isNoticeActive = <#isNoticeActive>; // const production = true;</script><script>var isNoticeActive =; <#isNoticeActive>; //
var notificationSoundTips = false; // 是否开启消息到达声音提醒 var notificationSoundTips = false; // 是否开启消息到达声音提醒
var notificationMsgLoadFrequency = 60; // 通知消息检查频率 var notificationMsgLoadFrequency = 60; // 通知消息检查频率
var isSecurityPwdChange = <#isSecurityPwdChange>; // 是否允许用户修改口令 var isSecurityPwdChange =; <#isSecurityPwdChange>; // 是否允许用户修改口令
var forceChangePwd = <#forceChangePwd>; // 默认口令验证,是否强制修改默认密码 var forceChangePwd =; <#forceChangePwd>; // 默认口令验证,是否强制修改默认密码
var isSecurityPwdComplexity = <#isSecurityPwdComplexity>; // 密码强度 var isSecurityPwdComplexity =; <#isSecurityPwdComplexity>; // 密码强度
var securityMinPwdLength = <#securityMinPwdLength>; // 允许账户口令最小长度0表示无限制 var securityMinPwdLength =; <#securityMinPwdLength>; // 允许账户口令最小长度0表示无限制
var securityMaxPwdLength = <#securityMaxPwdLength>; // 允许账户口令最大长度最多32位长度 var securityMaxPwdLength =; <#securityMaxPwdLength>; // 允许账户口令最大长度最多32位长度
var isSecAdminUser = <#isSecAdminUser>;// 是否安全保密员开启三员且该用户为安全保密员为true var isSecAdminUser =; <#isSecAdminUser>;// 是否安全保密员开启三员且该用户为安全保密员为true
var isManage = <#isManage>;// 是否资产库管理员 var isManage =; <#isManage>;// 是否资产库管理员
var mainType = "<#mainType>"; var mainType = "<#mainType>";
var uid = "<#uid>"; var uid = "<#uid>";
var wHref = "./w"; var wHref = "./w";
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-00fc6489.ef94bb38.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-055385ac.e55cad48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0ba0316e.d3570084.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4def56c4.ef0a5aa8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4e7e9573.38619268.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-5a76c238.283a9f57.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6f1c20e8.c5c7126f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-8cb92970.adde4cab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-dd13ef3a.66cd3c5f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-00fc6489.1d5ae77f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-055385ac.212b1e7f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0ba0316e.a3ac659b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.e3edaaa6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.9e10275b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.99234111.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.135c5954.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.7eee62fe.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4def56c4.66811286.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4e7e9573.db603cfd.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5a76c238.27830c12.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.1dd1e85a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6f1c20e8.c979e2d7.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-8cb92970.9380bd91.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-dd13ef3a.0bade222.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.f669c4d9.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.f669c4d9.js></script></body></html> var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-08487bf0.283a9f57.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1abee27b.c5c7126f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-2933a75e.38619268.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-504ddaa7.6be74f48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-591a3298.d3570084.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6fb6e04f.adde4cab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9c63e2da.ef0a5aa8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-cd54d348.e55cad48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-d1d726a6.32b22b48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-08487bf0.cef51ed5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1abee27b.ece13c73.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2933a75e.9a437059.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ff2fa9d6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.83ef78c0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d212b99.89ae9070.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.5867abf3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.95cfdb5d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.11f3f0f4.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.5207f0ae.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.aa0dfa28.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-504ddaa7.ec622084.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-591a3298.d84f68c8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6fb6e04f.27eed2c2.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9c63e2da.bf7cbc63.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-cd54d348.bcb4b27c.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-d1d726a6.02829f2f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.20eb2063.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.2eba5032.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.351b7061.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.20eb2063.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.351b7061.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.2eba5032.js></script></body></html>

View File

@ -102,17 +102,17 @@
var type = "<#type>"; var type = "<#type>";
var chartId = "<#charId>"; var chartId = "<#charId>";
var ruuid = "<#uuid>"; var ruuid = "<#uuid>";
var definition = <#define> ; var definition =; <#define> ;
var userId = "<#uid>"; var userId = "<#uid>";
var userName = "<#userName>"; var userName = "<#userName>";
var methodId = "<#methodId>"; var methodId = "<#methodId>";
var isPalManage = <#isPalManage>; var isPalManage =; <#isPalManage>;
var isExistCopy=<#isExistCopy>; var isExistCopy=;<#isExistCopy>;
var isAppearCopy=<#isAppearCopy>; var isAppearCopy=;<#isAppearCopy>;
var isAdmin = <#isAdmin>; var isAdmin =; <#isAdmin>;
var isCustomDefine = "<#isCustomDefine>"; var isCustomDefine = "<#isCustomDefine>";
var isLaneAttrConfig = <#isLaneAttrConfig>; var isLaneAttrConfig =; <#isLaneAttrConfig>;
var isLaneForceRefreshShapeAttr = <#isLaneForceRefreshShapeAttr>; var isLaneForceRefreshShapeAttr =; <#isLaneForceRefreshShapeAttr>;
//检查用户所需参数 //检查用户所需参数
var checkoutstate = "<#checkoutstate>"; var checkoutstate = "<#checkoutstate>";
var checkoutuser = "<#checkoutuser>"; var checkoutuser = "<#checkoutuser>";
@ -174,13 +174,13 @@
var schemeId = "<#schemeId>"; var schemeId = "<#schemeId>";
var frmFileName = "<#processName>"; //平台的流程名称 var frmFileName = "<#processName>"; //平台的流程名称
var BPMInstanceName = "<#BPMInstanceName>"; // 节点名称 var BPMInstanceName = "<#BPMInstanceName>"; // 节点名称
var isView = <#isView>; //是否只读模式打开 var isView =; <#isView>; //是否只读模式打开
var isPublish = <#isPublish>; //是否是已发布流程(已发布流程不允许修改) var isPublish =; <#isPublish>; //是否是已发布流程(已发布流程不允许修改)
var isStop = <#isStop>; //是否是已停用流程(已停用流程不允许修改) var isStop =; <#isStop>; //是否是已停用流程(已停用流程不允许修改)
var isApproval = <#isApproval>;// 是否是审核中流程(审核中流程不允许修改) var isApproval =; <#isApproval>;// 是否是审核中流程(审核中流程不允许修改)
var isAutoSave = "<#isAutoSave>"; //是否允许实时保存 var isAutoSave = "<#isAutoSave>"; //是否允许实时保存
var isMarked = <#isMarked>;// // PAL推送至BPMS但BPMS端未分配 var isMarked =; <#isMarked>;// // PAL推送至BPMS但BPMS端未分配
var isCorrelateBpms = <#isCorrelateBpms>;// 是否与BPM有关系的流程 var isCorrelateBpms =; <#isCorrelateBpms>;// 是否与BPM有关系的流程
var perms = "<#perms>"; //该流程权限 var perms = "<#perms>"; //该流程权限
var filePerms = "<#filePerms>"; //所有有权限的文件 var filePerms = "<#filePerms>"; //所有有权限的文件
//角色类型owner-编辑viewer-只读 //角色类型owner-编辑viewer-只读
@ -194,14 +194,16 @@
var ext4 = "<#ext4>"; var ext4 = "<#ext4>";
// 帮助工具栏扩展url // 帮助工具栏扩展url
var customHelpToolExtMenuUrl = <#customHelpToolExtMenuUrl>; var customHelpToolExtMenuUrl =; <#customHelpToolExtMenuUrl>;
// 图形定义
var methodObjectDesc =; <#methodObjectDesc>;
//是否需要保存提示 //是否需要保存提示
var isSave = true; var isSave = true;
var isNeedPutMessage = true; var isNeedPutMessage = true;
var isCollaboration = <#isCollaborationSwitch> ? ((isView == true || isPublish == true) ? false : true) : false; //是否进行协作 var isCollaboration =; <#isCollaborationSwitch> ? ((isView == true || isPublish == true) ? false : true) : false; //是否进行协作
var sameNameCheck = <#sameNameCheck>; var sameNameCheck =; <#sameNameCheck>;
var processOutput = <#processOutput>; var processOutput =; <#processOutput>;
var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言 var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言
var operateType = "<#operateType>"; var operateType = "<#operateType>";
@ -217,10 +219,10 @@
var processDefVersionId = "<#processDefVersionId>"; var processDefVersionId = "<#processDefVersionId>";
var processVersion = "<#processVersion>"; var processVersion = "<#processVersion>";
var selectedElementId="<#selectedElementId>" var selectedElementId="<#selectedElementId>"
<#schema> <#schema>;
//图形之间的关系定义json数组 //图形之间的关系定义json数组
var linkerRelationship = <#linkerRelationship> ; var linkerRelationship =; <#linkerRelationship> ;
var isParentShow = true; var isParentShow = true;
/* var relationObj = <#relationObj>; */ /* var relationObj = <#relationObj>; */
//visio 导入相关 //visio 导入相关
@ -234,12 +236,12 @@
var BPMNLevel0 = "<#BPMNLevel0>"; var BPMNLevel0 = "<#BPMNLevel0>";
var BPMNLevel1 = "<#BPMNLevel1>"; var BPMNLevel1 = "<#BPMNLevel1>";
var BPMNLevel2 = "<#BPMNLevel2>"; var BPMNLevel2 = "<#BPMNLevel2>";
var relationShapesObject = <#relationShapes>; var relationShapesObject =; <#relationShapes>;
var relationShapeModelObject = <#relationShapeModels>; var relationShapeModelObject =; <#relationShapeModels>;
var moreShapeButton = "<#btnShapeStyle>"; var moreShapeButton = "<#btnShapeStyle>";
var installBatch = <#installBatch>; var installBatch =; <#installBatch>;
var attrDefineObj = <#attrDefineObj>; var attrDefineObj =; <#attrDefineObj>;
</script> </script>
<!--工具js--> <!--工具js-->
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script> <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script>
@ -316,7 +318,7 @@
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ children[j].url +'\',{},\'_blank\')">' + children[j].name + '</li>'; liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ children[j].url +'\',{},\'_blank\')">' + children[j].name + '</li>';
} }
} }
liHtml += '</ul>' liHtml += '</ul>';
liHtml += '</li>'; liHtml += '</li>';
} else {// 只有第一层菜单 } else {// 只有第一层菜单
liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ firstLevelObj.url +'\',{},\'_blank\')">' + firstLevelObj.name + '</li>'; liHtml += '<li onclick="openUrl(\'helpToolExtUrl\',\''+ firstLevelObj.url +'\',{},\'_blank\')">' + firstLevelObj.name + '</li>';
@ -365,7 +367,7 @@
}); });
} }
//流程版本对比 //流程版本对比
var verArray = <#verArray>; var verArray =; <#verArray>;
var verHtml = ""; var verHtml = "";
for (var i = 0; i < verArray.length; i++) { for (var i = 0; i < verArray.length; i++) {
var tmp = verArray[i]; var tmp = verArray[i];
@ -875,7 +877,7 @@
</div> </div>
<div id="shape_thumb" class="menu"> <div id="shape_thumb" class="menu">
<canvas width="160px"></canvas> <canvas width="160px"></canvas>
<div></div> <div style="width: 180px;"></div>
</div> </div>
<div id="dock"> <div id="dock">
<div class="dock_header"></div> <div class="dock_header"></div>

View File

@ -102,16 +102,16 @@
var type = "<#type>"; var type = "<#type>";
var chartId = "<#charId>"; var chartId = "<#charId>";
var ruuid = "<#uuid>"; var ruuid = "<#uuid>";
var definition = <#define> ; var definition =; <#define> ;
var userId = "<#uid>"; var userId = "<#uid>";
var userName = "<#userName>"; var userName = "<#userName>";
var methodId = "<#methodId>"; var methodId = "<#methodId>";
var isExistCopy=<#isExistCopy>; var isExistCopy=;<#isExistCopy>;
var isAppearCopy=<#isAppearCopy>; var isAppearCopy=;<#isAppearCopy>;
var isAdmin = <#isAdmin>; var isAdmin =; <#isAdmin>;
var isCustomDefine = "<#isCustomDefine>"; var isCustomDefine = "<#isCustomDefine>";
var isLaneAttrConfig = <#isLaneAttrConfig>; var isLaneAttrConfig =; <#isLaneAttrConfig>;
var isLaneForceRefreshShapeAttr = <#isLaneForceRefreshShapeAttr>; var isLaneForceRefreshShapeAttr =; <#isLaneForceRefreshShapeAttr>;
//检查用户所需参数 //检查用户所需参数
var checkoutstate = "<#checkoutstate>"; var checkoutstate = "<#checkoutstate>";
var checkoutuser = "<#checkoutuser>"; var checkoutuser = "<#checkoutuser>";
@ -172,10 +172,10 @@
var BPMN_TYPE_HORIZONTAL_LANE = "<#BPMN_TYPE_HORIZONTAL_LANE>"; var BPMN_TYPE_HORIZONTAL_LANE = "<#BPMN_TYPE_HORIZONTAL_LANE>";
var BPMN_TYPE_VERTICAL_LANE = "<#BPMN_TYPE_VERTICAL_LANE>"; var BPMN_TYPE_VERTICAL_LANE = "<#BPMN_TYPE_VERTICAL_LANE>";
var isView = <#isView>; //是否只读模式打开 var isView =; <#isView>; //是否只读模式打开
var isPublish = <#isPublish>; //是否是已发布流程(已发布流程不允许修改) var isPublish =; <#isPublish>; //是否是已发布流程(已发布流程不允许修改)
var isStop = <#isStop>;// 是否是已停用流程(已停用流程不允许修改) var isStop =; <#isStop>;// 是否是已停用流程(已停用流程不允许修改)
var isApproval = <#isApproval>;// 是否是审核中流程(审核中流程不允许修改) var isApproval =; <#isApproval>;// 是否是审核中流程(审核中流程不允许修改)
var isAutoSave = "<#isAutoSave>"; //是否允许实时保存 var isAutoSave = "<#isAutoSave>"; //是否允许实时保存
var perms = "<#perms>"; //该流程权限 var perms = "<#perms>"; //该流程权限
var filePerms = "<#filePerms>"; //所有有权限的文件 var filePerms = "<#filePerms>"; //所有有权限的文件
@ -188,6 +188,11 @@
var ext2 = "<#ext2>"; var ext2 = "<#ext2>";
var ext3 = "<#ext3>"; var ext3 = "<#ext3>";
var ext4 = "<#ext4>"; var ext4 = "<#ext4>";
// 帮助工具栏扩展url
var customHelpToolExtMenuUrl =; <#customHelpToolExtMenuUrl>;
// 图形定义
var methodObjectDesc =; <#methodObjectDesc>;
//保存手动保存时对设计器的操作 //保存手动保存时对设计器的操作
var messageArrayForSave = []; var messageArrayForSave = [];
@ -197,7 +202,7 @@
var isCollaboration = (isView == true || isPublish == true) ? false : true; //是否进行协作 var isCollaboration = (isView == true || isPublish == true) ? false : true; //是否进行协作
var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言 var openAppType = "<#openAppType>"; //打开设计器的app类型, 暂时用于判断留言
var processOutput = <#processOutput>; //预览手册是否开放 var processOutput =; <#processOutput>; //预览手册是否开放
var operateType = "<#operateType>"; var operateType = "<#operateType>";
var process = { var process = {
@ -210,9 +215,9 @@
var categoryName = "<#categoryName>"; var categoryName = "<#categoryName>";
var processDefVersionId = "<#processDefVersionId>"; var processDefVersionId = "<#processDefVersionId>";
var processVersion = "<#processVersion>"; var processVersion = "<#processVersion>";
var selectedElementId="<#selectedElementId>" var selectedElementId="<#selectedElementId>";
//图形之间的关系定义json数组 //图形之间的关系定义json数组
var linkerRelationship = <#linkerRelationship> ; var linkerRelationship =; <#linkerRelationship> ;
var isParentShow = true; var isParentShow = true;
//var relationObj = <#relationObj>; //var relationObj = <#relationObj>;
//visio 导入相关 //visio 导入相关
@ -226,9 +231,9 @@
var messageArrayForSave = []; var messageArrayForSave = [];
var saveAttributesJson = []; var saveAttributesJson = [];
var removeAttributeJson = []; var removeAttributeJson = [];
var relationShapesObject = <#relationShapes>; var relationShapesObject =; <#relationShapes>;
var relationShapeModelObject = <#relationShapeModels>; var relationShapeModelObject =; <#relationShapeModels>;
var attrDefineObj = <#attrDefineObj>; var attrDefineObj =; <#attrDefineObj>;
</script> </script>
<!--工具js--> <!--工具js-->
<script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script> <script type='text/javascript' charset='UTF-8' src='../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/util/map.js'></script>

View File

@ -1722,5 +1722,9 @@
<param name="uuids"/> <param name="uuids"/>
<param name="isSub"/> <param name="isSub"/>
</cmd-bean> </cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal_pl_manage_method_object_desc_save">
<param name="shapeName"/>
<param name="desc"/>
<param name="methodId"/>
</cmd-bean>
</aws-actions> </aws-actions>

View File

@ -196,7 +196,19 @@ var Designer = {
return return
} }
var h = $("#shape_thumb"); var h = $("#shape_thumb");
h.children("div").text(b.title); var title = b.title;
var category = b.category;
if (b.category == "bpmn") {
category = 'process_bpmn2';
}
if (category == 'lane') {
category = methodId;
}
category = category.replace(/_/g,".");
if (methodObjectDesc[category + '-' + b.name]) {
title += ('' + methodObjectDesc[category + '-' + b.name]);
}
h.children("div").text(title);
var j = h.children("canvas")[0].getContext("2d"); var j = h.children("canvas")[0].getContext("2d");
var A = { var A = {
x: 0, x: 0,
@ -3268,7 +3280,20 @@ var Designer = {
continue; continue;
} }
if (r.attribute.visible) { if (r.attribute.visible) {
var u = $("<div class='panel_box' shapeName='" + y + "'><canvas title='" + r.title + "' title_pos='right' width='" + (Designer.config.panelItemWidth) + "' height='" + (Designer.config.panelItemHeight) + "'></canvas></div>").appendTo(s); var title = r.title;
var category = r.category;
if (r.category == "bpmn") {
category = 'process_bpmn2';
}
category = category.replace(/_/g,".");
if (category == 'lane') {
category = methodId;
}
if (methodObjectDesc[category + '-' + r.name]) {
title += ('' + methodObjectDesc[category + '-' + r.name]);
}
var u = $("<div class='panel_box' shapeName='" + y + "'><canvas title='" + title + "' title_pos='right' width='" + (Designer.config.panelItemWidth) + "' height='" + (Designer.config.panelItemHeight) + "'></canvas></div>").appendTo(s);
var x = u.children("canvas")[0]; var x = u.children("canvas")[0];
Designer.painter.drawPanelItem(x, r.name) Designer.painter.drawPanelItem(x, r.name)
} }
@ -6046,7 +6071,7 @@ var Utils = {
shape: am shape: am
}; };
at.push(al); at.push(al);
continue
} else { } else {
if (this.pointInRect(am.from.x.toScale(), am.from.y.toScale(), ae)) { if (this.pointInRect(am.from.x.toScale(), am.from.y.toScale(), ae)) {
var al = { var al = {
@ -6055,7 +6080,7 @@ var Utils = {
shape: am shape: am
}; };
at.push(al); at.push(al);
continue
} else { } else {
var aj = i.find(".text_canvas"); var aj = i.find(".text_canvas");
var ah = aj.position(); var ah = aj.position();
@ -6087,7 +6112,7 @@ var Utils = {
pointIndex: ag pointIndex: ag
}; };
at.push(al); at.push(al);
continue
} }
} }
} }
@ -6182,9 +6207,9 @@ var Utils = {
shape: am shape: am
}; };
at.push(al); at.push(al);
continue
} else { } else {
continue
} }
} else { } else {
var al = { var al = {
@ -6192,7 +6217,7 @@ var Utils = {
shape: am shape: am
}; };
at.push(al); at.push(al);
continue
} }
} else { } else {
if (!am.attribute || typeof am.attribute.linkable == "undefined" || am.attribute.linkable) { if (!am.attribute || typeof am.attribute.linkable == "undefined" || am.attribute.linkable) {
@ -6255,7 +6280,7 @@ var Utils = {
} }
if (al != null) { if (al != null) {
at.push(al); at.push(al);
continue
} }
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticStyle:{width:"100%",height:"100%"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},n=[],s={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=s,c=e("cba8"),p=Object(c["a"])(r,i,n,!1,null,"56fd105e",null);t["default"]=p.exports}}]);

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticStyle:{width:"100%",height:"100%"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:t.src}})])},i=[],s={name:"MappingManagement",data:function(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=s,c=e("2877"),p=Object(c["a"])(r,n,i,!1,null,"56fd105e",null);a["default"]=p.exports}}]);

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},s=[],r={name:"BPMOrg",data:function(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("2877"),c=Object(o["a"])(a,n,s,!1,null,"2280cc48",null);e["default"]=c.exports}}]);

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],a={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=a,o=i("cba8"),h=Object(o["a"])(r,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},a=[],o={name:"cooperationCreate",data:function(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},s=o,r=i("2877"),c=Object(r["a"])(s,n,a,!1,null,"6a826a48",null);e["default"]=c.exports}}]);

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=s,o=i("cba8"),c=Object(o["a"])(r,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);

View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("cba8"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);

View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},a=[],o={name:"CooperationUpdate",data:function(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight:function(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},s=o,r=i("2877"),p=Object(r["a"])(s,n,a,!1,null,"543345d8",null);e["default"]=p.exports}}]);

View File

@ -1 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e.$createElement,t=e._self._c||s;return t("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("cba8"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e.$createElement,t=e._self._c||s;return t("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],o=t("a18c"),d=t("0f08"),i=t("4360");d["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误"+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),o["a"].replace("/"))}));var c={data:function(){return{dwList:[]}},methods:{},mounted:function(){}},r=c,u=t("2877"),l=Object(u["a"])(r,n,a,!1,null,null,null);s["default"]=l.exports}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long