diff --git a/io.sc.engine.rule.frontend/src/remote-components/remote-components.json b/io.sc.engine.rule.frontend/src/remote-components/remote-components.json index 8e2b7eeb..6fd1a2b9 100644 --- a/io.sc.engine.rule.frontend/src/remote-components/remote-components.json +++ b/io.sc.engine.rule.frontend/src/remote-components/remote-components.json @@ -5,4 +5,8 @@ "componentPath": "组件 .vue 文件路径" } */ + { + "component": "io.sc.engine.rule.frontend.workflow.ApprovalComponent", + "componentPath": "@/views/workflow/WorkflowApprovalComponent.vue" + } ] diff --git a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java index de9551f2..348cd365 100644 --- a/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java +++ b/io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java @@ -58,6 +58,15 @@ public class RuleEngineWorkFlowInitializer implements ApplicationInitializer{ entity.setVersion(1); entity.setCanClaimTask(false); entity.setXml(getRuleEngineWorkflowXmlContent()); + entity.setBusinessDescriptionSql("" + + "select \n" + + " CONCAT(CODE_,':',VERSION_) BUSSINESS_KEY,\n" + + " CONCAT(NAME_,'_V',VERSION_) BUSSINESS_DESCRIPTION\n" + + "from RE_RESOURCE\n" + + "where CONCAT(CODE_,':',VERSION_) in (${bussinessKeys})" + ); + entity.setTaskHandFrontendModelName("io.sc.engine.rule.frontend"); + entity.setTaskHandFrontendComponentName("io.sc.engine.rule.frontend.workflow.ApprovalComponent"); entity = processEntityService.add(entity); processEntityService.deploy(entity.getId()); }catch (Exception e){ diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages.json b/io.sc.platform.core.frontend/src/platform/i18n/messages.json index 6b5ac4c4..9a0cab7b 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages.json @@ -331,17 +331,22 @@ "home.card.task.title": "My Tasks", "home.card.task.action.list": "all my tasks...", + "home.card.task.action.process": "Process", "home.card.doneTask.title": "My Tasks Done", "home.card.doneTask.action.list": "all my done tasks...", + "home.card.doneTask.action.view": "View", "home.card.finishTask.title": "My Tasks Finished", "home.card.finishTask.action.list": "all my finished tasks...", + "home.card.finishTask.action.view": "View", "home.card.message.title": "My Messages", "home.card.message.action.list": "all my messages...", + "home.card.message.action.reply": "Reply", "home.card.message.chatDialog.title": "Chat with {sender}", "home.card.announcement.title": "Announcements", - "home.card.announcement.action.list": "all announcements..." + "home.card.announcement.action.list": "all announcements...", + "home.card.announcement.action.view": "View" } diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json index 5a6b58fa..5f678364 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json @@ -331,17 +331,22 @@ "home.card.task.title": "我的代辦", "home.card.task.action.list": "顯示所有...", + "home.card.task.action.process": "辦理", "home.card.doneTask.title": "我的已辦", "home.card.doneTask.action.list": "顯示所有...", + "home.card.doneTask.action.view": "查看", "home.card.finishTask.title": "我的辦結", "home.card.finishTask.action.list": "顯示所有...", + "home.card.finishTask.action.view": "查看", "home.card.message.title": "我的消息", "home.card.message.action.list": "顯示所有...", + "home.card.message.action.reply": "回復", "home.card.message.chatDialog.title": "與 {sender} 的對話", "home.card.announcement.title": "系統公告", - "home.card.announcement.action.list": "顯示所有..." + "home.card.announcement.action.list": "顯示所有...", + "home.card.announcement.action.view": "查看" } diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json index d7e38a7e..22c21898 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json @@ -332,17 +332,22 @@ "home.card.task.title": "我的代办", "home.card.task.action.list": "显示所有...", + "home.card.task.action.process": "办理", "home.card.doneTask.title": "我的已办", "home.card.doneTask.action.list": "显示所有...", + "home.card.doneTask.action.view": "查看", "home.card.finishTask.title": "我的办结", "home.card.finishTask.action.list": "显示所有...", + "home.card.finishTask.action.view": "查看", "home.card.message.title": "我的消息", "home.card.message.action.list": "显示所有...", + "home.card.message.action.reply": "回复", "home.card.message.chatDialog.title": "与 {sender} 的对话", "home.card.announcement.title": "系统公告", - "home.card.announcement.action.list": "显示所有..." + "home.card.announcement.action.list": "显示所有...", + "home.card.announcement.action.view": "查看" } diff --git a/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue b/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue index 61aaeb15..be5b3328 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue @@ -5,7 +5,8 @@ {{ $t('home.card.announcement.title') }} - + + @@ -16,7 +17,9 @@
{{ item.title }}
{{ item.lastModifyDateAndNowDiff }}{{ $t(item.lastModifyDateAndNowDiffUnit) }}{{ $t('before') }} - + + + @@ -26,23 +29,29 @@ diff --git a/io.sc.platform.core.frontend/src/platform/views/home/DoneTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/DoneTask.vue index 39174dbb..2546b840 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/DoneTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/DoneTask.vue @@ -5,18 +5,19 @@ {{ $t('home.card.doneTask.title') }} - + +
- +
{{ item.businessDescription }}
{{ item.previousAssignee }}, {{ item.createTimeAndNowDiff }}{{ $t(item.createTimeAndNowDiffUnit) }}{{ $t('before') }} - +
@@ -24,18 +25,36 @@ diff --git a/io.sc.platform.core.frontend/src/platform/views/home/FinishedTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/FinishedTask.vue index 30aad235..b0faaf2c 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/FinishedTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/FinishedTask.vue @@ -2,21 +2,22 @@
- + {{ $t('home.card.finishTask.title') }} - + +
- +
{{ item.businessDescription }}
{{ item.previousAssignee }}, {{ item.createTimeAndNowDiff }}{{ $t(item.createTimeAndNowDiffUnit) }}{{ $t('before') }} - +
@@ -24,18 +25,36 @@
diff --git a/io.sc.platform.core.frontend/src/platform/views/home/Message.vue b/io.sc.platform.core.frontend/src/platform/views/home/Message.vue index 7b5c763d..e4e54357 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/Message.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/Message.vue @@ -5,18 +5,21 @@ {{ $t('home.card.message.title') }} - + +
- +
{{ item.content }}
{{ item.sender + ', ' + item.sendDateAndNowDiff + $t(item.sendDateAndNowDiffUnit) + $t('before') }} - + + +
@@ -26,23 +29,29 @@ diff --git a/io.sc.platform.core.frontend/src/platform/views/home/Task.vue b/io.sc.platform.core.frontend/src/platform/views/home/Task.vue index 596ad0c9..40a93004 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/Task.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/Task.vue @@ -5,18 +5,19 @@ {{ $t('home.card.task.title') }} - + +
- + -
{{ item.businessDescription + item.businessDescription }}
+
{{ item.processDefinitionName + ' [' + item.name + '] : ' + item.businessDescription }}
{{ item.previousAssignee + ', ' + item.createTimeAndNowDiff + $t(item.createTimeAndNowDiffUnit) + $t('before') }} - +
@@ -25,19 +26,24 @@ diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java index 88fbee54..8356d873 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/impl/ProcessQueryServiceImpl.java @@ -268,6 +268,8 @@ public class ProcessQueryServiceImpl implements ProcessQueryService { query.orderByTaskName().asc(); } } + }else{ + query.orderByTaskCreateTime().desc(); } Pageable pageable =queryParameter.getJpaPageable(); long total =query.count(); @@ -375,7 +377,6 @@ public class ProcessQueryServiceImpl implements ProcessQueryService { for(String processInstanceId : processInstanceAndBusinessMap.keySet()){ BusinessKeyAndDescription businessKeyAndDescription =processInstanceAndBusinessMap.get(processInstanceId); if(businessKeyAndDescription.getBusinessKey().equals(bussinessKey)){ - bussinessDescription =businessKeyAndDescription.getBusinessDescription() + " : " + bussinessDescription; businessKeyAndDescription.setBusinessDescription(bussinessDescription); break; }