Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
This commit is contained in:
commit
77e3d2a6e7
@ -5,10 +5,7 @@ import com.actionsoft.apps.coe.pal.constant.CoEConstant;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.aslp.ListApps;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.cache.model.TeamInfo;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.cache.model.UserInfo;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.dao.CoeCooperationMemberDao;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.dao.CoeCooperationRoleDao;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.dao.CoeCooperationRolePermDao;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.dao.CoeCooperationTeamDao;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.dao.*;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.extend.CooperationAppManager;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.extend.CooperationAppProfile;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.model.CoeCooperationMemberModel;
|
||||
@ -153,6 +150,10 @@ public class CooperationQueryAPIManager {
|
||||
teamInfo.setTeamId(teamModel.getId());
|
||||
List<UserInfo> userInfos = this.getUserInfoByTeamId(teamModel.getId());
|
||||
teamInfo.setUsers(userInfos);
|
||||
|
||||
List<String> permVerIds = new CoeCooperationTeamPermDao().getCooperationTeamPermVerIds(teamModel.getId());
|
||||
teamInfo.getVersionIds().addAll(permVerIds);
|
||||
|
||||
list.add(teamInfo);
|
||||
}
|
||||
return list;
|
||||
@ -161,41 +162,104 @@ public class CooperationQueryAPIManager {
|
||||
public List<UserInfo> getUserInfoByTeamId(String teamId){
|
||||
List<UserInfo> list = new ArrayList<>();
|
||||
|
||||
Map<String,UserInfo> userMap = new HashMap<>();
|
||||
List<CoeCooperationMemberModel> memberModels = new CoeCooperationMemberDao().queryUserListByTeam(teamId);
|
||||
for (CoeCooperationMemberModel memberModel : memberModels) {
|
||||
UserInfo userInfo = new UserInfo();
|
||||
userInfo.setUserid(memberModel.getUserId());
|
||||
userInfo.getRoleIds().add(memberModel.getRoleId());
|
||||
|
||||
//获取角色信息,设置全局权限
|
||||
CoeCooperationRoleModel roleModel = new CoeCooperationRoleDao().queryById(memberModel.getRoleId());
|
||||
userInfo.setAppPermission( roleModel.getAppPerm());
|
||||
List<String> actionPermList = Arrays.stream(roleModel.getActionPerm().split(",")).collect(Collectors.toList());
|
||||
userInfo.getOperatePermission().addAll(actionPermList);
|
||||
//设置全部数据权限
|
||||
userInfo.setIsAllDataPermission(roleModel.getDataPerm().equals("all"));
|
||||
|
||||
if (!userInfo.getIsAllDataPermission()){
|
||||
//获取角色下数据权限,设置数据权限
|
||||
List<CoeCooperationRolePermModel> rolePerms = new CoeCooperationRolePermDao().getRolePermByTeamIdAndRoleId(teamId, memberModel.getRoleId());
|
||||
for (CoeCooperationRolePermModel rolePerm : rolePerms) {
|
||||
Set<String> dataPerm = userInfo.getDataPermission().get(rolePerm.getPalVersionId());
|
||||
if (null == dataPerm){
|
||||
dataPerm = new HashSet<>();
|
||||
}
|
||||
if (StringUtils.isNotEmpty(rolePerm.getActionPerm())){
|
||||
dataPerm.addAll(Arrays.asList(rolePerm.getActionPerm().split(",").clone()));
|
||||
}
|
||||
userInfo.getDataPermission().put(rolePerm.getPalVersionId(), dataPerm);
|
||||
}
|
||||
UserInfo userInfo = userMap.get(memberModel.getUserId());
|
||||
if (null == userInfo){
|
||||
userInfo = new UserInfo();
|
||||
userInfo.setUserid(memberModel.getUserId());
|
||||
userInfo.getRoleIds().add(memberModel.getRoleId());
|
||||
}else {
|
||||
userInfo.getRoleIds().add(memberModel.getRoleId());
|
||||
}
|
||||
|
||||
list.add(userInfo);
|
||||
userMap.put(memberModel.getUserId(),userInfo);
|
||||
}
|
||||
|
||||
for (UserInfo userInfo : userMap.values()) {
|
||||
List<String> roleIds = userInfo.getRoleIds();
|
||||
Set<String> appPerm = this.getAppPerm(roleIds);
|
||||
userInfo.setAppPermission(appPerm);
|
||||
|
||||
Set<String> actionPerm = this.getActionPerm(roleIds);
|
||||
userInfo.setOperatePermission(actionPerm);
|
||||
|
||||
boolean allDataPerm = this.isAllDataPerm(roleIds);
|
||||
userInfo.setIsAllDataPermission(allDataPerm);
|
||||
|
||||
if (!allDataPerm){
|
||||
Map<String, Set<String>> dataPerm = this.getDataPerm(teamId, roleIds);
|
||||
userInfo.setDataPermission(dataPerm);
|
||||
}
|
||||
}
|
||||
|
||||
list.addAll(userMap.values());
|
||||
return list;
|
||||
}
|
||||
|
||||
private Set<String> getAppPerm(List<String> roleIds){
|
||||
Set<String> set = new HashSet<>();
|
||||
for (String roleId : roleIds) {
|
||||
CoeCooperationRoleModel roleModel = new CoeCooperationRoleDao().queryById(roleId);
|
||||
if (null == roleModel){
|
||||
continue;
|
||||
}
|
||||
//设置全局app权限
|
||||
List<String> appPerm = Arrays.stream(roleModel.getAppPerm().split(",")).collect(Collectors.toList());
|
||||
set.addAll(appPerm);
|
||||
}
|
||||
return set;
|
||||
}
|
||||
|
||||
private Set<String> getActionPerm(List<String> roleIds){
|
||||
Set<String> set = new HashSet<>();
|
||||
for (String roleId : roleIds) {
|
||||
CoeCooperationRoleModel roleModel = new CoeCooperationRoleDao().queryById(roleId);
|
||||
if (null == roleModel){
|
||||
continue;
|
||||
}
|
||||
//设置全局操作权限
|
||||
List<String> actionPermList = Arrays.stream(roleModel.getActionPerm().split(",")).collect(Collectors.toList());
|
||||
set.addAll(actionPermList);
|
||||
}
|
||||
return set;
|
||||
}
|
||||
|
||||
private boolean isAllDataPerm(List<String> roleIds){
|
||||
for (String roleId : roleIds) {
|
||||
CoeCooperationRoleModel roleModel = new CoeCooperationRoleDao().queryById(roleId);
|
||||
if (null == roleModel){
|
||||
continue;
|
||||
}
|
||||
if (roleModel.getDataPerm().equals("all")){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Map<String,Set<String>> getDataPerm(String teamId,List<String> roleIds){
|
||||
Map<String,Set<String>> map = new HashMap<>();
|
||||
for (String roleId : roleIds) {
|
||||
CoeCooperationRoleModel roleModel = new CoeCooperationRoleDao().queryById(roleId);
|
||||
if (null == roleModel) {
|
||||
continue;
|
||||
}
|
||||
//获取角色下数据权限,设置数据权限
|
||||
List<CoeCooperationRolePermModel> rolePerms = new CoeCooperationRolePermDao().getRolePermByTeamIdAndRoleId(teamId, roleId);
|
||||
for (CoeCooperationRolePermModel rolePerm : rolePerms) {
|
||||
Set<String> dataPerm = map.get(rolePerm.getPalVersionId());
|
||||
if (null == dataPerm){
|
||||
dataPerm = new HashSet<>();
|
||||
}
|
||||
if (StringUtils.isNotEmpty(rolePerm.getActionPerm())){
|
||||
dataPerm.addAll(Arrays.asList(rolePerm.getActionPerm().split(",").clone()));
|
||||
}
|
||||
map.put(rolePerm.getPalVersionId(), dataPerm);
|
||||
}
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据父节点获取权限范围内的子流程(小组权限范围内)
|
||||
|
||||
@ -3,6 +3,7 @@ package com.actionsoft.apps.coe.pal.cooperation.cache;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.CooperationQueryAPIManager;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.cache.model.TeamInfo;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.cache.model.UserInfo;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.constant.CoeCooperationConst;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.constant.Constant;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.extend.CooperationAppManager;
|
||||
import com.actionsoft.apps.coe.pal.cooperation.extend.CooperationAppProfile;
|
||||
@ -120,8 +121,8 @@ public class CooperationCache extends Cache<String, TeamInfo> {
|
||||
if (null == userInfo){
|
||||
return new HashSet<>();
|
||||
}
|
||||
String appPerm = userInfo.getAppPermission();
|
||||
if ("all".equals(appPerm)){
|
||||
Set<String> appPermission = userInfo.getAppPermission();
|
||||
if (appPermission.contains("all")){
|
||||
Set<String> set = new HashSet<>();
|
||||
List<CooperationAppProfile> appProfiles = CooperationAppManager.getList();
|
||||
for (CooperationAppProfile profile : appProfiles) {
|
||||
@ -129,7 +130,7 @@ public class CooperationCache extends Cache<String, TeamInfo> {
|
||||
}
|
||||
return set;
|
||||
}
|
||||
return Arrays.stream(appPerm.split(",")).collect(Collectors.toSet());
|
||||
return appPermission;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -143,6 +144,10 @@ public class CooperationCache extends Cache<String, TeamInfo> {
|
||||
if (null == userInfo){
|
||||
return new HashSet<>();
|
||||
}
|
||||
if (userInfo.getIsAllDataPermission()){
|
||||
TeamInfo teamInfo = CooperationCache.getTeamInfo(teamId);
|
||||
return teamInfo.getVersionIds();
|
||||
}
|
||||
return userInfo.getDataPermission().keySet();
|
||||
}
|
||||
|
||||
@ -158,6 +163,9 @@ public class CooperationCache extends Cache<String, TeamInfo> {
|
||||
if (null == userInfo){
|
||||
return new HashSet<>();
|
||||
}
|
||||
if (userInfo.getIsAllDataPermission()){
|
||||
return Arrays.stream(new String [] {CoeCooperationConst.ACTION_WRITE,CoeCooperationConst.ACTION_DELETE,CoeCooperationConst.ACTION_VERSION}).collect(Collectors.toSet());
|
||||
}
|
||||
return userInfo.getDataPermission().get(versionId);
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
package com.actionsoft.apps.coe.pal.cooperation.cache.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class TeamInfo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -10,6 +12,8 @@ public class TeamInfo implements Serializable {
|
||||
|
||||
private List<UserInfo> users;
|
||||
|
||||
private Set<String> versionIds = new HashSet<>();
|
||||
|
||||
public TeamInfo() {}
|
||||
|
||||
public String getTeamId() {
|
||||
@ -27,4 +31,12 @@ public class TeamInfo implements Serializable {
|
||||
public void setUsers(List<UserInfo> users) {
|
||||
this.users = users;
|
||||
}
|
||||
|
||||
public Set<String> getVersionIds() {
|
||||
return versionIds;
|
||||
}
|
||||
|
||||
public void setVersionIds(Set<String> versionIds) {
|
||||
this.versionIds = versionIds;
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ public class UserInfo implements Serializable {
|
||||
private String userid;
|
||||
private List<String> roleIds = new ArrayList<>();
|
||||
private Set<String> operatePermission = new HashSet<>();
|
||||
private String appPermission ;
|
||||
private Set<String> appPermission = new HashSet<>();
|
||||
private Map<String,Set<String>> dataPermission = new HashMap<>();
|
||||
private boolean isAllDataPermission;
|
||||
|
||||
@ -40,11 +40,11 @@ public class UserInfo implements Serializable {
|
||||
this.operatePermission = operatePermission;
|
||||
}
|
||||
|
||||
public String getAppPermission() {
|
||||
public Set<String> getAppPermission() {
|
||||
return appPermission;
|
||||
}
|
||||
|
||||
public void setAppPermission(String appPermission) {
|
||||
public void setAppPermission(Set<String> appPermission) {
|
||||
this.appPermission = appPermission;
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ public class UserInfo implements Serializable {
|
||||
return dataPermission;
|
||||
}
|
||||
|
||||
public void setIsDataPermission(Map<String, Set<String>> dataPermission) {
|
||||
public void setDataPermission(Map<String, Set<String>> dataPermission) {
|
||||
this.dataPermission = dataPermission;
|
||||
}
|
||||
|
||||
|
||||
@ -61,4 +61,14 @@ public class CoeCooperationConst {
|
||||
*/
|
||||
public static final String ACTION_VERSION = "v";
|
||||
|
||||
/**
|
||||
* 新版角色操作权限:新建流程
|
||||
*/
|
||||
public static final String ACTION_CREATE_PROCESS = "createProcess";
|
||||
|
||||
/**
|
||||
* 新版角色操作权限:新建流程
|
||||
*/
|
||||
public static final String ACTION_BATCH = "batch";
|
||||
|
||||
}
|
||||
|
||||
@ -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-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.befc1891.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.35374fe1.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.35374fe1.js></script></body></html>
|
||||
var jdHref = "./jd";</script><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-1cf2c888.32b22b48.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-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-1cf2c888.9466d4da.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.bd455f7f.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.bd455f7f.js></script></body></html>
|
||||
@ -347,6 +347,9 @@
|
||||
$(document).ready(function(){
|
||||
// 自定义帮助扩展
|
||||
initCustomHelpToolExtMenuUrl();
|
||||
if (methodId !== 'process.epc') {
|
||||
$('#bar_sort').css('display','none')
|
||||
}
|
||||
|
||||
if (!installBatch) {// 未安装批处理应用,删除功能入口
|
||||
$('li[ac=batchreplace]').remove();
|
||||
@ -618,6 +621,9 @@
|
||||
<div id="bar_redo" class="toolbar_button" awsui-qtip='恢复 (Ctrl+Y)'>
|
||||
<div class="ico redo"></div>
|
||||
</div>
|
||||
<div id="bar_sort" class="toolbar_button" awsui-qtip='编号刷'>
|
||||
<div class="ico sort"></div>
|
||||
</div>
|
||||
<div id="bar_brush" class="toolbar_button" awsui-qtip='格式刷 (Ctrl+Shift+B)'>
|
||||
<div class="ico brush"></div>
|
||||
</div>
|
||||
@ -925,6 +931,9 @@
|
||||
<div id="dock_btn_link" class="toolbar_button" onclick="Dock.showView('link');setCookie('<#uuid>', 'page,true');" awsui-qtip="链接">
|
||||
<div class="ico ico_link"></div>
|
||||
</div>
|
||||
<div id="dock_btn_diff" class="toolbar_button" onclick="Dock.showView('diff');setCookie('<#uuid>', 'page,true');" awsui-qtip="版本差异">
|
||||
<div class="ico ico_dock_diff"></div>
|
||||
</div>
|
||||
<#processlink_ete_analysis>
|
||||
</div>
|
||||
</div>
|
||||
@ -1283,6 +1292,18 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dock_view dock_view_diff" style="width: 300px;">
|
||||
<div class="dock_view_header">
|
||||
版本差异
|
||||
<span id="validate_count"></span>
|
||||
<div class="ico ico_dock_collapse"></div>
|
||||
</div>
|
||||
<div id="sideDiffDiv" class="dock_content" style="padding: 0px; max-height: 400px; overflow-y: auto;">
|
||||
<table style="border-collapse:collapse;background-color: white;margin: 10px">
|
||||
<tbody class="diffTableTbody" id="diffTable"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--
|
||||
|
||||
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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -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.$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}}]);
|
||||
@ -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}}]);
|
||||
File diff suppressed because one or more lines are too long
@ -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}}]);
|
||||
@ -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.$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
@ -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}}]);
|
||||
@ -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.$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}}]);
|
||||
@ -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.$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}}]);
|
||||
@ -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}}]);
|
||||
@ -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=[],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}}]);
|
||||
(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}}]);
|
||||
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
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
Loading…
Reference in New Issue
Block a user