Merge branch 'feature/REQ-3045' into dev
This commit is contained in:
commit
5fd6ebb33d
@ -79,7 +79,7 @@ public class WorkflowButtonSyncClientController implements WorkflowButtonSyncCli
|
||||
update.setId(button.getId());
|
||||
if (button.getCategory() == RouterCategoryEnum.JUMP) {
|
||||
UrlConfig urlConfig = new UrlConfig();
|
||||
urlConfig.applyUrlAsDefaults(workflowButton.getUrl());
|
||||
urlConfig.setDefaultUrl(workflowButton.getUrl());
|
||||
update.setUrlConfig(urlConfig);
|
||||
} else {
|
||||
update.setApiUrl(workflowButton.getUrl());
|
||||
|
||||
@ -204,6 +204,10 @@ public class MigrateMessageTemplateV3Job {
|
||||
if (CollectionUtils.isEmpty(routeButtons)) return Collections.emptyList();
|
||||
ArrayList<MessageTemplateButtonV3> buttons = new ArrayList<>();
|
||||
for (MessageRouteButtonDTO routeButton : routeButtons) {
|
||||
if (routeButton.getBtnCode().equals("BPMN_COPY")) {
|
||||
// 跳过流程的抄送按钮,他们的链接没有配置,保存的时候校验通不过
|
||||
continue;
|
||||
}
|
||||
MessageTemplateButtonV3 button = new MessageTemplateButtonV3();
|
||||
button.setName(routeButton.getName());
|
||||
button.setCode(routeButton.getBtnCode());
|
||||
|
||||
@ -115,6 +115,10 @@ public class UrlConfig {
|
||||
appManager = null;
|
||||
}
|
||||
|
||||
public void setDefaultUrl(String url) {
|
||||
applyUrlAsDefaults(url);
|
||||
}
|
||||
|
||||
public void applyUrlAsDefaults(String url) {
|
||||
getOrCreatePcOms().setOpenStrategy(WebPageOpenStrategy.CURRENT_PAGE);
|
||||
getOrCreatePcOms().setUrl(url);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user