Merge remote-tracking branch 'origin/apps_dev' into apps_dev

This commit is contained in:
3120626891@qq.com 2022-07-15 11:07:25 +08:00
commit 9f0dbf3649
63 changed files with 788 additions and 452 deletions

View File

@ -1059,27 +1059,13 @@ public class CooperationWeb extends ActionWeb {
List<String> appPerm = new ArrayList<>();// 应用权限
List<String> actionPerm = new ArrayList<>();// 操作权限
// 获取应用权限选项范围
// aslp服务地址
String aslp = "aslp://com.actionsoft.apps.coe.pal.cooperation/listApps";
//列出已注册的流程团队扩展App
ResponseObject res = SDK.getAppAPI().callASLP(SDK.getAppAPI().getAppContext(CoEConstant.APP_ID), aslp, new HashMap<String, Object>());
if (res.isOk()) {
JSONArray appArr = (JSONArray)((Map)res.getData()).get("apps");
for (int i = 0; i < appArr.size(); i++) {
;
List<CooperationAppProfile> appList = CooperationAppManager.getList();
for (CooperationAppProfile profile : appList) {
JSONObject appObj = new JSONObject();
appObj.put("value", appArr.getJSONObject(i).getString("title"));
appObj.put("label", appArr.getJSONObject(i).getString("id"));
appObj.put("value", profile.getTitle());
appObj.put("label", profile.getId());
appPermOpts.add(appObj);
}
}
// List<CooperationAppProfile> appList = CooperationAppManager.getList();
// for (CooperationAppProfile profile : appList) {
// JSONObject appObj = new JSONObject();
// appObj.put("value", profile.getTitle());
// appObj.put("label", profile.getId());
// appPermOpts.add(appObj);
// }
//权限操作权限options
JSONObject actionObj1 = new JSONObject();
actionObj1.put("value", "新建流程");

View File

@ -2857,9 +2857,9 @@ public class CoEPALController {
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_processlevel_tree_data")
public String getPalProcesslevelTreeData(UserContext me, String wsId, String teamId, String pid) {
public String getPalProcesslevelTreeData(UserContext me, String wsId, String teamId, String pid,String createUsers,String orgIds,String methodIds) {
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.getPalProcesslevelTreeData(wsId, teamId, pid);
return web.getPalProcesslevelTreeData(wsId, teamId, pid,createUsers,orgIds,methodIds);
}
/**
@ -2966,9 +2966,9 @@ public class CoEPALController {
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel")
public String createDialogModel(UserContext me,String uuid,String methodId) {
public String createDialogModel(UserContext me,String uuid,String methodId,String wsId) {
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.createDialogModel(uuid,methodId);
return web.createDialogModel(uuid,methodId,wsId);
}
@ -3075,9 +3075,9 @@ public class CoEPALController {
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_processlevel_recent_and_favorite_data_query")
public String getRecentAndFavoriteRepository(UserContext me, String wsId, String teamId) {
public String getRecentAndFavoriteRepository(UserContext me, String wsId, String teamId,String createUsers,String orgIds,String methodIds) {
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.getRecentAndFavoriteRepository(me,wsId, teamId);
return web.getRecentAndFavoriteRepository(me,wsId, teamId,createUsers,orgIds,methodIds);
}
/**
@ -3117,9 +3117,9 @@ public class CoEPALController {
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_processlevel_repository_child_data_query")
public String getPalProcessLevelRepositoryChildData(UserContext me, String wsId, String teamId, String id) {
public String getPalProcessLevelRepositoryChildData(UserContext me, String wsId, String teamId, String id,String createUsers,String orgIds,String methodIds) {
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.getPalProcessLevelRepositoryChildData(wsId, teamId, id);
return web.getPalProcessLevelRepositoryChildData(wsId, teamId, id,createUsers,orgIds,methodIds);
}
/**
@ -3384,5 +3384,17 @@ public class CoEPALController {
return web.validRepositoryShapeAttr(uuid, define);
}
/**
* 架构筛选条件查询
* @param me
* @param wsId
* @param teamId
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_condition_data_query")
public String queryConditionData(UserContext me,String wsId,String teamId){
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.queryConditionData(wsId,teamId);
}
}

View File

@ -108,6 +108,21 @@ public class CoeCooperationAPIManager {
return model;
}
/**
* 根据资产库ID获取小组信息
* @param wsId
* @param isRun
* @return
*/
public List<CoeCooperationTeamModel> queryCooperationTeamByWsId(String wsId,boolean isRun) {
CoeCooperationTeamDao teamDao = new CoeCooperationTeamDao();
List<CoeCooperationTeamModel> teamModels = teamDao.getListByWsId(wsId);
if (teamModels != null && teamModels.size() > 0 && isRun) {
teamModels = teamModels.stream().filter(model -> CoeCooperationConst.TEAM_STATUS_RUN == model.getTeamStatus()).collect(Collectors.toList());
}
return teamModels;
}
/**
* 获取所有协作小组分类
* @return

View File

@ -145,4 +145,21 @@ public final class PALMethodModel {
public void setFolder(boolean folder) {
isFolder = folder;
}
public String getMethodName(){
String name = "其他";
switch (this.getId()) {
case "process.epc": name = "过程链图";break;
case "process.bpmn2": name = "BPMN图";break;
case "process.flowchart": name = "流程图";break;
case "process.evc": name = "价值链图";break;
case "data.form": name = "表单图";break;
case "org.normal": name = "组织图";break;
case "itsystem.normal": name = "IT系统图";break;
case "control.policy": name = "制度图";break;
case "control.risk": name = "风险控制图";break;
case "control.kpi": name = "流程KPI图";break;
}
return name;
}
}

View File

@ -3686,6 +3686,8 @@ public class PALRepositoryQueryAPIManager {
object.put("versionId", model.getVersionId());
object.put("orderIndex", model.getOrderIndex());
object.put("isBottomLevel", model.isBottomLevel());
object.put("createUser",model.getCreateUser());
object.put("modifyUser",model.getModifyUser());
if(object.getBoolean("folder")==false){

View File

@ -5,6 +5,8 @@ import com.actionsoft.apps.AppsConst;
import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager;
import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache;
import com.actionsoft.apps.coe.pal.cooperation.constant.CoeCooperationConst;
import com.actionsoft.apps.coe.pal.cooperation.model.CoeCooperationMemberModel;
import com.actionsoft.apps.coe.pal.cooperation.model.CoeCooperationTeamModel;
import com.actionsoft.apps.coe.pal.datamigration.aris.model.ObjDefModel;
import com.actionsoft.apps.coe.pal.datamigration.aris.model.ObjOccModel;
import com.actionsoft.apps.coe.pal.datamigration.constant.Constant;
@ -130,6 +132,7 @@ import java.text.Collator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
public class CoeProcessLevelWeb extends ActionWeb {
private UserContext _uc;
@ -7759,14 +7762,57 @@ public class CoeProcessLevelWeb extends ActionWeb {
* @param pid
* @return
*/
public String getPalProcesslevelTreeData(String wsId, String teamId, String pid) {
public String getPalProcesslevelTreeData(String wsId, String teamId, String pid,String createUsers,String orgIds,String methodIds) {
ResponseObject ro = ResponseObject.newOkResponse();
if (UtilString.isEmpty(pid)) {
// 返回根节点数据
ro.setData(PALRepositoryQueryAPIManager.getInstance().getPalRepositoryTreeRoot(_uc, wsId, null, teamId));
return ro.toString();
}
ro.setData(PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPidNew(_uc, wsId, teamId, pid));
JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray();
JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray();
JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray();
JSONArray result = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPidNew(_uc, wsId, teamId, pid);
// 根据文件类型过滤
if (methodIdList.size() > 0) {
result = result.stream()
.filter(item -> {
// 小组下 判断当前用户在当前文件夹是否有新建权限
boolean flag = true;
if (UtilString.isNotEmpty(teamId) && "default".equals(((JSONObject)item).getString("plMethodId"))) {
Set<String> userOperatePermission = CooperationCache.getUserOperatePermission(teamId, _uc.getUID());
flag = userOperatePermission.contains(CoeCooperationConst.ACTION_CREATE_PROCESS);
}
return flag;
})
.filter(item -> methodIdList.contains(((JSONObject)item).getString("plMethodId")) || "default".equals(((JSONObject)item).getString("plMethodId")))
.collect(Collectors.toCollection(JSONArray::new));
}
// 根据创建人过滤
if (createUserList.size() > 0) {
JSONArray tempArr = new JSONArray();
for (Object o : result) {
JSONObject tempObj = (JSONObject) o;
if (createUserList.contains(tempObj.getString("createUser"))){
tempArr.add(tempObj);
}
}
result = tempArr;
}
// 根据组织架构过滤
if (orgIdList.size() > 0) {
Set<String> userIds = new HashSet<>();
for (Object o : orgIdList) {
String orgId = (String) o;
List<UserModel> userModels = SDK.getORGAPI().getUsersByDepartment(orgId);
userModels.stream().forEach(user -> userIds.add(user.getUID()));
}
createUserList.stream().forEach(userId -> userIds.add((String) userId));
result = result.stream()
.filter(model -> userIds.contains(((JSONObject)model).getString("createUser")) || userIds.contains(((JSONObject)model).getString("modifyUser")))
.collect(Collectors.toCollection(JSONArray::new));
}
ro.setData(result);
return ro.toString();
}
@ -8274,7 +8320,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
* @return
* by zhaolei
*/
public String createDialogModel(String uuid,String methodId){
public String createDialogModel(String uuid,String methodId,String wsId){
ResponseObject ro = ResponseObject.newOkResponse();
try {
@ -8317,8 +8363,9 @@ public class CoeProcessLevelWeb extends ActionWeb {
String plRid = UUIDGener.getUUID();
String id = UUIDGener.getUUID();
Timestamp nowTime = new Timestamp(System.currentTimeMillis());
PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, plRid, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", plname + titleName,
PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, plRid, wsId, plname + titleName,
"", 1, parentId, category, true, 1,
id, false, methodId, "0", 1, null,
null, "admin", "admin", nowTime, null, uuid,
@ -8354,7 +8401,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
/************************************************数据属性*********************************************************/
//图形的数据属性配置
List<PALMethodAttributeModel> attributeModels = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels("6f4e292c-1b90-4dd2-8c20-7da159cb20a5", model.getMethodId());
List<PALMethodAttributeModel> attributeModels = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels(wsId, model.getMethodId());
for (PALMethodAttributeModel attributeModel : attributeModels) {
//todo根据importProperty的类型获取具体保存数据值
@ -8390,7 +8437,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
/************************************************文件属性*********************************************************/
//图形的数据属性配置
List<PALMethodAttributeModel> attrLists=PALRepositoryAPIManager.getInstance().getValidAndUseAttributeModels("6f4e292c-1b90-4dd2-8c20-7da159cb20a5", methodId);
List<PALMethodAttributeModel> attrLists=PALRepositoryAPIManager.getInstance().getValidAndUseAttributeModels(wsId, methodId);
@ -8833,13 +8880,59 @@ public String deleteReply(String replyid, String messageid) {
* @param teamId
* @return
*/
public String getRecentAndFavoriteRepository(UserContext me,String wsId, String teamId) {
public String getRecentAndFavoriteRepository(UserContext me,String wsId, String teamId,String createUsers,String orgIds,String methodIds) {
ResponseObject ro = ResponseObject.newOkResponse();
CoeCooperationAPIManager.getInstance().queryCooperationMemberActionPerm(teamId, _uc.getUID(), ro);
// 找出上一次的查询条件 如果有则覆盖 没有就直接保存
String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition");
JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray();
JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray();
JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray();
JSONObject condtions = null;
if (UtilString.isNotEmpty(queryCondition)) { // 覆盖上一次查询条件
condtions = JSONObject.parseObject(queryCondition);
if (condtions.containsKey(_uc.getUID())) {
JSONObject condtion = condtions.getJSONObject(_uc.getUID());
condtion.put("createUsers",createUserList);
condtion.put("orgIds",orgIdList);
condtion.put("methodIds",methodIdList);
}else {
JSONObject condtion = new JSONObject();
condtion.put("createUsers",createUserList);
condtion.put("orgIds",orgIdList);
condtion.put("methodIds",methodIdList);
condtions.put(_uc.getUID(),condtion);
}
}else { // 初始
condtions = new JSONObject();
JSONObject condtion = new JSONObject();
condtion.put("createUsers",createUserList);
condtion.put("orgIds",orgIdList);
condtion.put("methodIds",methodIdList);
condtions.put(_uc.getUID(),condtion);
}
SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString());
// 获取文件模型的图标icon
JSONObject methodIcons = new JSONObject();
// 获取最近编辑的文件
List<PALRepositoryModel> recentList = CoeProcessLevelUtil.getRecentUpdateRepositoryList(wsId, teamId, _uc.getUID(), null, null, 30);
// 伊利需求--所选用户创建作为创建人的流程当前用户所拥有流程权限的交集
if (methodIdList.size() > 0) {
recentList = recentList.stream().filter(model -> methodIdList.contains(model.getMethodId())).collect(Collectors.toList());
}
if (createUserList.size() > 0) {
recentList = recentList.stream().filter(model -> createUserList.contains(model.getCreateUser())).collect(Collectors.toList());
}
if (orgIdList.size() > 0) {
Set<String> userIds = new HashSet<>();
for (Object o : orgIdList) {
String orgId = (String) o;
List<UserModel> userModels = SDK.getORGAPI().getUsersByDepartment(orgId);
userModels.stream().forEach(user -> userIds.add(user.getUID()));
}
createUserList.stream().forEach(userId -> userIds.add((String) userId));
recentList = recentList.stream().filter(model -> userIds.contains(model.getCreateUser()) || userIds.contains(model.getModifyUser())).collect(Collectors.toList());
}
JSONArray recentData = new JSONArray();
for (PALRepositoryModel model: recentList) {
JSONObject object = new JSONObject();
@ -8908,6 +9001,22 @@ public String deleteReply(String replyid, String messageid) {
}
// 获取收藏的文件
List<PALRepositoryModel> commonList = CoeProcessLevelUtil.getCommonRepositoryList(_uc, wsId, teamId, _uc.getUID());
// 伊利需求--所选用户创建作为创建人的流程当前用户所拥有流程权限的交集
if (methodIdList.size() > 0) {
commonList = commonList.stream().filter(model -> methodIdList.contains(model.getMethodId())).collect(Collectors.toList());
}
if (createUserList.size() > 0) {
commonList = commonList.stream().filter(model -> createUserList.contains(model.getCreateUser())).collect(Collectors.toList());
}
if (orgIdList.size() > 0) {
Set<String> userIds = new HashSet<>();
for (Object o : orgIdList) {
String orgId = (String) o;
List<UserModel> userModels = SDK.getORGAPI().getUsersByDepartment(orgId);
userModels.stream().forEach(user -> userIds.add(user.getUID()));
}
commonList = commonList.stream().filter(model -> userIds.contains(model.getCreateUser()) || userIds.contains(model.getModifyUser())).collect(Collectors.toList());
}
JSONArray commonData = new JSONArray();
for (PALRepositoryModel model: commonList) {
JSONObject object = new JSONObject();
@ -9045,7 +9154,7 @@ public String deleteReply(String replyid, String messageid) {
* @param id
* @return
*/
public String getPalProcessLevelRepositoryChildData(String wsId, String teamId, String id) {
public String getPalProcessLevelRepositoryChildData(String wsId, String teamId, String id,String createUsers,String orgIds,String methodIds) {
ResponseObject ro = ResponseObject.newOkResponse();
// 获取当前文件信息
PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
@ -9177,9 +9286,53 @@ public String deleteReply(String replyid, String messageid) {
}
}
subObj.put("versionStatus",versionStatus);
subObj.put("createUser", subModel.getCreateUser());
subObj.put("modifyUser", subModel.getModifyUser());
tableData.add(subObj);
}
}
JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray();
JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray();
JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray();
// 根据文件类型过滤
if (methodIdList.size() > 0) {
tableData = tableData.stream()
.filter(item -> {
// 小组下 判断当前用户在当前文件夹是否有新建权限
boolean flag = true;
if (UtilString.isNotEmpty(teamId) && "default".equals(((JSONObject)item).getString("methodId"))) {
Set<String> userOperatePermission = CooperationCache.getUserOperatePermission(teamId, _uc.getUID());
flag = userOperatePermission.contains(CoeCooperationConst.ACTION_CREATE_PROCESS);
}
return flag;
})
.filter(item -> methodIdList.contains(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId")))
.collect(Collectors.toCollection(JSONArray::new));
}
// 根据创建人过滤
if (createUserList.size() > 0) {
JSONArray tempArr = new JSONArray();
for (Object o : tableData) {
JSONObject tempObj = (JSONObject) o;
if (createUserList.contains(tempObj.getString("createUser"))){
tempArr.add(tempObj);
}
}
tableData = tempArr;
}
// 根据组织架构过滤
if (orgIdList.size() > 0) {
Set<String> userIds = new HashSet<>();
for (Object o : orgIdList) {
String orgId = (String) o;
List<UserModel> userModels = SDK.getORGAPI().getUsersByDepartment(orgId);
userModels.stream().forEach(user -> userIds.add(user.getUID()));
}
createUserList.stream().forEach(userId -> userIds.add((String) userId));
tableData = tableData.stream()
.filter(item -> userIds.contains(((JSONObject)item).getString("createUser")) || userIds.contains(((JSONObject)item).getString("modifyUser")))
.collect(Collectors.toCollection(JSONArray::new));
}
// 串联分析应用是否安装
if(SDK.getAppAPI().isInstalled(CoEConstant.APP_PROCESSLINK_ID) && SDK.getAppAPI().isActive(CoEConstant.APP_PROCESSLINK_ID)) {
ro.put("processLinkInstall", true);
@ -10828,4 +10981,145 @@ public String deleteReply(String replyid, String messageid) {
private String assembleShapeName(String text) {
return "" + text + "";
}
/**
* 架构筛选条件查询
* @param me
* @param wsId
* @param teamId
* @return
*/
public String queryConditionData(String wsId,String teamId) {
ResponseObject ro = ResponseObject.newOkResponse();
if (UtilString.isEmpty(wsId)) {
return ResponseObject.newErrResponse("参数【资产库】信息异常").toString();
}
// 创建人信息
JSONArray createUsers = new JSONArray();
if (UtilString.isNotEmpty(teamId)) {
List<CoeCooperationMemberModel> memberModelList = CoeCooperationAPIManager.getInstance().queryCooperationTeamMemberList(teamId);
for (CoeCooperationMemberModel memberModel : memberModelList) {
if (_uc.getUID().equals(memberModel.getUserId())) continue;
JSONObject user = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(memberModel.getUserId());
user.put("userId",userModel.getUID());
user.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(memberModel.getUserId());
user.put("deptId",department.getId());
user.put("deptName",department.getNameI18N());
createUsers.add(user);
}
}else {
Set<String> userIds = new HashSet<>();
List<CoeCooperationTeamModel> teamModelList = CoeCooperationAPIManager.getInstance().queryCooperationTeamByWsId(wsId, true);
for (CoeCooperationTeamModel teamModel : teamModelList) {
List<CoeCooperationMemberModel> memberModelList = CoeCooperationAPIManager.getInstance().queryCooperationTeamMemberList(teamModel.getId());
for (CoeCooperationMemberModel memberModel : memberModelList) {
if (_uc.getUID().equals(memberModel.getUserId())) continue;
userIds.add(memberModel.getUserId());
}
}
for (String userId : userIds) {
JSONObject user = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(userId);
user.put("userId",userModel.getUID());
user.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(userId);
user.put("deptId",department.getId());
user.put("deptName",department.getNameI18N());
createUsers.add(user);
}
}
JSONObject currentUser = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(_uc.getUID());
currentUser.put("userId",userModel.getUID());
currentUser.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(_uc.getUID());
currentUser.put("deptId",department.getId());
currentUser.put("deptName",department.getNameI18N());
ro.put("createUsers",createUsers);
ro.put("currentUser",currentUser);
// 文件类型
JSONArray methodIds = new JSONArray();
List<PALMethodModel> process = PALMethodCache.getPALMethodModelListByMethod("process");
for (PALMethodModel methodModel : process) {
if ("process.epc".equals(methodModel.getId()) || "process.bpmn2".equals(methodModel.getId())
|| "process.flowchart".equals(methodModel.getId()) || "process.evc".equals(methodModel.getId())) {
JSONObject methodId = new JSONObject();
methodId.put("methodId",methodModel.getId());
methodId.put("name",methodModel.getMethodName());
methodIds.add(methodId);
}
}
List<PALMethodModel> data = PALMethodCache.getPALMethodModelListByMethod("data");
for (PALMethodModel methodModel : data) {
if ("data.form".equals(methodModel.getId())) {
JSONObject methodId = new JSONObject();
methodId.put("methodId",methodModel.getId());
methodId.put("name",methodModel.getMethodName());
methodIds.add(methodId);
}
}
List<PALMethodModel> org = PALMethodCache.getPALMethodModelListByMethod("org");
for (PALMethodModel methodModel : org) {
if ("org.normal".equals(methodModel.getId())) {
JSONObject methodId = new JSONObject();
methodId.put("methodId",methodModel.getId());
methodId.put("name",methodModel.getMethodName());
methodIds.add(methodId);
}
}
List<PALMethodModel> itsystem = PALMethodCache.getPALMethodModelListByMethod("itsystem");
for (PALMethodModel methodModel : itsystem) {
if ("itsystem.normal".equals(methodModel.getId())) {
JSONObject methodId = new JSONObject();
methodId.put("methodId",methodModel.getId());
methodId.put("name",methodModel.getMethodName());
methodIds.add(methodId);
}
}
List<PALMethodModel> control = PALMethodCache.getPALMethodModelListByMethod("control");
for (PALMethodModel methodModel : control) {
if ("control.policy".equals(methodModel.getId()) || "control.risk".equals(methodModel.getId()) || "control.kpi".equals(methodModel.getId())) {
JSONObject methodId = new JSONObject();
methodId.put("methodId",methodModel.getId());
methodId.put("name",methodModel.getMethodName());
methodIds.add(methodId);
}
}
ro.put("methodIds",methodIds);
// 组织机构
// 上一次的筛选条件
JSONObject historyCondition = null;
String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition");
if (UtilString.isNotEmpty(queryCondition)){
JSONObject condition = JSONObject.parseObject(queryCondition);
if (condition.containsKey(_uc.getUID())) {
JSONObject currentCondition = condition.getJSONObject(_uc.getUID());
historyCondition = currentCondition;
}
}else { // 初始默认选中当前人 当前人所在部门
historyCondition = new JSONObject();
historyCondition.put("createUsers",new JSONArray());
historyCondition.getJSONArray("createUsers").add(_uc.getUID());
historyCondition.put("orgIds",new JSONArray());
historyCondition.getJSONArray("orgIds").add(_uc.getDepartmentModel().getId());
historyCondition.put("methodIds",new JSONArray());
for (Object o : methodIds) {
JSONObject methodObj = (JSONObject) o;
historyCondition.getJSONArray("methodIds").add(methodObj.getString("methodId"));
}
JSONObject condtions = new JSONObject();
JSONObject condtion = new JSONObject();
condtion.put("createUsers",historyCondition.getJSONArray("createUsers"));
condtion.put("orgIds",historyCondition.getJSONArray("orgIds"));
condtion.put("methodIds",historyCondition.getJSONArray("methodIds"));
condtions.put(_uc.getUID(),condtion);
SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString());
}
ro.put("historyCondition",historyCondition);
return ro.toString();
}
}

View File

@ -1,4 +1,4 @@
<!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 production = true;</script><script>var isNoticeActive = <#isNoticeActive>; //
var notificationSoundTips = false; // 是否开启消息到达声音提醒
@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
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-1466d7bd.67f44708.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-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-c6d2c314.db1c131a.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/js/chunk-08487bf0.cef51ed5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1466d7bd.573af532.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-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-c6d2c314.36b1c929.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/css/app.20eb2063.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.7544c496.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.7544c496.js></script></body></html>
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-03c6285a.7d5e2b5a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0df035f6.e83dbaa2.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-21453108.a3fd01d3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-23a660f0.0ecc4095.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-67c663e5.274ba931.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-79148172.dc3e7967.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7f2e89b2.e0cd2ccf.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-b158b92a.fe2f3f84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-03c6285a.529dedd5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0df035f6.52f9d178.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.61269ead.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.1efa21de.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.fd29d082.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.f290866f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d212b99.1061dc70.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.9f4d92b1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.c12b6728.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.9b69a5bc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.97e80de1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-67c663e5.9d49feaa.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.25989b20.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.e179f783.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.02ee2c83.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.8fc67a6c.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.0228e1c0.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.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.335bcbdd.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.0228e1c0.js></script></body></html>

View File

@ -1539,6 +1539,9 @@
<param name="wsId"/>
<param name="teamId"/>
<param name="pid"/>
<param name="createUsers"/>
<param name="orgIds"/>
<param name="methodIds"/>
</cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal_processlevel_create_method_list">
<param name="category"/>
@ -1565,6 +1568,9 @@
<cmd-bean name="com.actionsoft.apps.coe.pal_processlevel_recent_and_favorite_data_query">
<param name="wsId"/>
<param name="teamId"/>
<param name="createUsers"/>
<param name="orgIds"/>
<param name="methodIds"/>
</cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal_processlevel_favorite_save">
<param name="wsId"/>
@ -1580,6 +1586,9 @@
<param name="wsId"/>
<param name="teamId"/>
<param name="id"/>
<param name="createUsers"/>
<param name="orgIds"/>
<param name="methodIds"/>
</cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal_processlevel_repository_order_index_update">
<param name="wsId"/>
@ -1735,4 +1744,8 @@
<param name="uuid"/>
<param name="define"/>
</cmd-bean>
<cmd-bean name="com.actionsoft.apps.coe.pal_condition_data_query">
<param name="wsId"/>
<param name="teamId"/>
</cmd-bean>
</aws-actions>

View File

@ -967,7 +967,7 @@ function removeTr(obj) {
//打开对象关联Dialog
function openRelationDialog(obj, callback) {
debugger;
;
var title = obj.closest('tr').find('td:first').text();
if (title == undefined || title == '') {
title = '选择模型对象';
@ -1020,7 +1020,8 @@ function openRelationDialog(obj, callback) {
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel",
data : {
uuid:uuid,
methodId:method
methodId:method,
wsId:$("#wsid").val()
},
success : function(msg) {
if (msg.result == "ok") {

View File

@ -3544,7 +3544,8 @@ function openRelationDig(obj,value) {
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel",
data : {
uuid:ruuid,
methodId:methodId
methodId:methodId,
wsId:wsId
},
success : function(msg) {
if (msg.result == "ok") {

View File

@ -294,39 +294,39 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
var obj = attributesJsonArray[index];
if (obj != null && obj != undefined && obj.value != undefined) {
var constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td colspan="2" class="tableContent">' + obj.value + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>';
if ((!obj.readonly && obj.type == "string")
|| (!obj.readonly && obj.type == "list")) {
// 目前支持到文本的输入 ,需求定下了再改
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>';
} else if(!obj.readonly && obj.type == "link") {
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
// constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "number") {
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "boolean") {
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent"></td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">'+ obj.name +':'+'</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "textarea") {
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
if (obj.value == undefined) {
obj.value = '';
}
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value.replace(/\n/g,'<br>') + '</td>';
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + obj.name +':'+ obj.value.replace(/\n/g,'<br>') + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "relation") {
var relationValue = "";
@ -334,13 +334,13 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + relationValue + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.type == "select" || obj.type == "select_m") {
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>';
selectFlag = true;
@ -356,8 +356,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + relationValue + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "deptAddress") {
deptAddress = true;
@ -368,8 +368,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + relationValue + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "awsorg") {
var relationValue = "";
@ -377,8 +377,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + relationValue + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "hidden") {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
@ -393,8 +393,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
tableInput = '请查看'
}
constr = '<tr>';
constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + '<span id="'+ obj.id +' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g,"'") +')"> ' + tableInput + '</span>' + '</td>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ '<span id="'+ obj.id +' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g,"'") +')"> ' + tableInput + '</span>' + '</td>';
constr += '</tr>';
}
$('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr);
@ -1105,7 +1105,7 @@ Designer.events.addEventListener("linkerCreated", function(linker) {
// attributeShowTabContent(null);
// showRelevanceShapesContent();
// shapeCopyAndPasteCount(null);
});
});
/**
* 图形创建后重写
@ -1140,7 +1140,7 @@ Designer.events.addEventListener("created", function(shape) {
}
attributeShowTabContent(shape);
// shapeCopyAndPasteCount(shape);
});
});
// 设置编号属性默认值
function initPrivateAttribute(newShape, type) {
@ -1445,36 +1445,37 @@ function isObjectRelationshipModel(linker, isAlert) {
// 文件属性的处理
function initProcessDesc() {
console.log(processDesc)
var length = Object.keys(processDesc).length;
var t = '';
for(var i = 1; i <= length; i++) {
var obj = processDesc[i];
t += '<tr>';
t += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';
t += '<tr><td>';
t += '<div class="tableContent">' + obj.name + '</div>';
var value = obj.value;
if (value == undefined) {
value = '';
t += '<td colspan="2" class="tableContent">' + value + '</td>';
t += '</tr>';
t += '<div class="tableContent">'+ value + '</div>';
t += '</td></tr>';
} else if(obj.type == 'table') {
if(value == '') {
t += '<td colspan="2" class="tableContent">' + value + '</td>';
t += '</tr>';
t += '<div class="tableContent">' + value + '</div>';
t += '</td></tr>';
} else {
let tableValue = JSON.parse(value.replace(/&quot;/g,'\"'))
let tableFlag = '请输入'
if (tableValue.table.length > 1) {
tableFlag = '请查看'
}
t += '<td colspan="2" class="tableContent" onclick="openDialog(' + JSON.stringify(tableValue).replace(/\"/g,"'") +')">' + tableFlag + '</td>';
t += '</tr>';
t += '<div class="tableContent" onclick="openDialog(' + JSON.stringify(tableValue).replace(/\"/g,"'") +')">' + tableFlag + '</div>';
t += '</td></tr>';
}
}
else {
value = value.replace(/\n/g,'<br>')
t += '<td colspan="2" class="tableContent">' + value + '</td>';
t += '</tr>';
t += '<div class="tableContent">' + value + '</div>';
t += '</td></tr>';
}
// t += '<td colspan="2" class="tableContent">' + value + '</td>';
// t += '</tr>';
@ -1494,7 +1495,7 @@ function autoClickAttr() {
}
$('#tab').find('div').removeClass('selected');
$('#' + name).addClass('selected');
$('.portalAttr').hide();
$('.newadd_portalAttr').hide();
if(name == "processDesc") {
dockShowView('portalDescShow');
}
@ -1564,25 +1565,20 @@ function initUpfileData(obj) {
var processFile = upfileData['file'];
if(processFile.length > 0) {
t += '<table name="file" class="awsui-table">';
t += '<tr>';
t += '<td class="tableHeader">流程相关</td>';
t += '</tr>';
t += '<tr><td>';
t += '<div class="filetableHeader">相关文件:</div>';
for(var i = 0; i < processFile.length; i++) {
var obj = processFile[i];
t += '<tr>';
t += '<td class="tableContent" style="padding-left:20px;"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></td>';
t += '</tr>';
t += '<div class="tableContent"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></div>';
}
t += '</table>';
t += '</td></tr></table>';
}
//流程手册附件展示
t += '<table class="awsui-table">';
t += '<tr>';
t += '<td class="tableHeader">流程手册</td>';
t += '</tr>';
t += '<tr>';
t += '<td class="tableContent" style="padding-left:20px;"><a href="javascript:void(0);" onclick="openOutputFile(\''+ ruuid +'\')">'+ fileName +'</a></td>';
t += '</tr>';
t += '<tr><td>';
t += '<div class="filetableHeader">流程手册:</div>';
t += '<div class="tableContent"><a href="javascript:void(0);" onclick="openOutputFile(\''+ ruuid +'\')">'+ fileName +'</a></div>';
t += '</td></tr>';
t += '</table>';
var elements = Model.define.elements;
@ -1594,14 +1590,12 @@ function initUpfileData(obj) {
var processShape = upfileData[ele.id];
if(processShape != null && processShape.length > 0) {
t += '<table name="' + ele.id + '" class="awsui-table">';
t += '<tr>';
t += '<td class="tableHeader">' + ele.text + '</td>';
t += '</tr>';
t += '<tr><td>';
t += '<div class="filetableHeader">' + ele.text + '</div>';
for(var i = 0; i < processShape.length; i++) {
var obj = processShape[i];
t += '<tr>';
t += '<td class="tableContent" style="padding-left:20px;"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></td>';
t += '</tr>';
t += '<div class="tableContent"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></div>';
t += '</td></tr>';
}
t += '</table>';
}
@ -1752,23 +1746,21 @@ function initShapeAttribute(obj) {
}
}
var t = '';
t += '<table>';
t += '<tr>';
t += '<button type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm" onclick="searchChange(\''+shape.id+'\')">';
t += '<div class="task-box">'
/*t += '<button type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm" onclick="searchChange(\''+shape.id+'\')">';
t +='<i class="awsui-iconfont" id="searchChange'+shape.id+'">&#xe718;</i>';
t += '</button>';
t += '</tr>';
t += '</table>';
t += '</button>';*/
t +='<i class="awsui-iconfont newadd_up" id="searchChange'+shape.id+'" onclick="searchChange(\''+shape.id+'\')">&#xe718;</i>';
t +='<input type="hidden" name="searchChangeFlg" id="searchChangeFlg'+shape.id+'" value="0" />';
t += '<table class="awsui-table awsui-table-bordered" name="' + shape.id + '" id="' +shape.id+ 'change" >';
t += '<tr name="trHeader">';
t += '<td class="tableHeader" colspan="3">' + shape.text + '</td>';
t += '<td class="tableHeader" >' + shape.text + '</td>';
t += '</tr>';
t += '<tr>';
t += '<td style="padding-left:20px;" class="tableContent">类型</td>';
t += '<td id="' + shape.id + 'type" colspan="2" class="tableContent"></td>';
/*t += '<td style="padding-left:20px;" class="tableContent"></td>';*/
t += '<td id="' + shape.id + 'type" class="tableContent"></td>';
t += '</tr>';
t += '</table>';
t += '</table></div>';
$('#portalAttrDock').append(t);
if (shape && attributesJsonArrayT) {
// {}函数,改为图形创建时增加私有属性

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

View File

@ -0,0 +1 @@
(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._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={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=n,c=e("2877"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);

View File

@ -1 +0,0 @@
(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

@ -1 +0,0 @@
(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

@ -0,0 +1 @@
(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._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={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"}}},a=r,o=i("2877"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
(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

@ -0,0 +1 @@
(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._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("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"}}},o=s,r=i("2877"),c=Object(r["a"])(o,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 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

@ -0,0 +1 @@
(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._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("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("2877"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);

View File

@ -1 +0,0 @@
(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}}]);

View File

@ -0,0 +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._self._c;return s("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("2877"),l=Object(u["a"])(c,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