yuandq/yili-apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chengli 2022-07-11 11:08:24 +08:00
commit 9b975719e7
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -3535,6 +3535,7 @@ public class CoeDesignerWeb extends ActionWeb {
} }
ResponseObject ro = ResponseObject.newOkResponse(); ResponseObject ro = ResponseObject.newOkResponse();
CoeCooperationAPIManager.getInstance().queryCooperationMemberActionPerm(teamId, _uc.getUID(), ro); CoeCooperationAPIManager.getInstance().queryCooperationMemberActionPerm(teamId, _uc.getUID(), ro);
CoeCooperationAPIManager.getInstance().queryCooperationFileActionPerm(teamId, _uc.getUID(),PALRepositoryCache.getCache().get(id).getVersionId(), ro);
ro.put("isCorrelatebpms", false); ro.put("isCorrelatebpms", false);
ro.put("processDefId", ""); ro.put("processDefId", "");
boolean isCorrelateBpms = PALRepositoryQueryAPIManager.getInstance().isCorrelateBpms(id, true); boolean isCorrelateBpms = PALRepositoryQueryAPIManager.getInstance().isCorrelateBpms(id, true);

8
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -4,6 +4,7 @@ import com.actionsoft.apps.AppPlatformConfig;
import com.actionsoft.apps.AppsConst; import com.actionsoft.apps.AppsConst;
import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager; import com.actionsoft.apps.coe.pal.cooperation.CoeCooperationAPIManager;
import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache; import com.actionsoft.apps.coe.pal.cooperation.cache.CooperationCache;
import com.actionsoft.apps.coe.pal.cooperation.constant.CoeCooperationConst;
import com.actionsoft.apps.coe.pal.datamigration.aris.model.ObjDefModel; 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.aris.model.ObjOccModel;
import com.actionsoft.apps.coe.pal.datamigration.constant.Constant; import com.actionsoft.apps.coe.pal.datamigration.constant.Constant;
@ -9081,7 +9082,12 @@ public String deleteReply(String replyid, String messageid) {
if (UtilString.isEmpty(teamId)) { if (UtilString.isEmpty(teamId)) {
batchAppVisible = true; batchAppVisible = true;
} else { } else {
batchAppVisible = CoeCooperationAPIManager.getInstance().havingWritePerm(teamId, _uc.getUID()); if (SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true)){
batchAppVisible = CoeCooperationAPIManager.getInstance().havingWritePerm(teamId, _uc.getUID());
}else {
batchAppVisible = CooperationCache.getUserOperatePermission(teamId, _uc.getUID()).contains(CoeCooperationConst.ACTION_BATCH);
}
} }
batchDlg = HtmlPageTemplate.merge(CoEConstant.APP_BATCH_ID, "batch.dialog.htm", null); batchDlg = HtmlPageTemplate.merge(CoEConstant.APP_BATCH_ID, "batch.dialog.htm", null);
} }

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/diagraming/ui.css
View File

@ -151,7 +151,7 @@ html{
background-position: 1px -637px; background-position: 1px -637px;
} }
.ico.resize{ .ico.resize{
background-position: -20px -600px; background-position: -20px -637px;
} }
.ico.brush{ .ico.brush{
background-position: -20px -20px; background-position: -20px -20px;

BIN
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/themes/default/images/diagraming/sprite.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB