Browse Source

基础框架发布: 8.2.35

前端核心发布: 8.2.129
 1) 工作台增加是否自动提示处理下一条任务
 2) 首页增加是否自动提示处理下一条任务
main
wangshaoping 3 weeks ago
parent
commit
ee71a8d48c
  1. 2
      cips.frontend/package.json
  2. 2
      erm.frontend/package.json
  3. 2
      gradle.properties
  4. 2
      io.sc.engine.mv.frontend/package.json
  5. 2
      io.sc.engine.rule.frontend/package.json
  6. 2
      io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java
  7. 2
      io.sc.engine.st.frontend/package.json
  8. 2
      io.sc.platform.ai.frontend/package.json
  9. 2
      io.sc.platform.core.frontend/package.json
  10. 1
      io.sc.platform.core.frontend/src/platform/i18n/messages.json
  11. 1
      io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json
  12. 1
      io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json
  13. 1
      io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts
  14. 24
      io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue
  15. 4
      io.sc.platform.core.frontend/template-project/package.json
  16. 2
      io.sc.platform.developer.doc/package.json
  17. 2
      io.sc.platform.developer.frontend/package.json
  18. 1
      io.sc.platform.developer.frontend/src/i18n/messages.json
  19. 2
      io.sc.platform.lcdp.frontend/package.json
  20. 9
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java
  21. 9
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java
  22. 2
      io.sc.platform.license.keygen.frontend/package.json
  23. 2
      io.sc.platform.mvc.frontend/package.json
  24. 11
      io.sc.platform.mvc/src/main/resources/META-INF/platform/plugins/parameters.json
  25. 2
      io.sc.platform.scheduler.manager.frontend/package.json
  26. 2
      io.sc.platform.system.frontend/package.json
  27. 1
      io.sc.platform.system.frontend/src/i18n/messages.json
  28. 1
      io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json
  29. 1
      io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json
  30. 24
      io.sc.platform.system.frontend/src/views/workbench/MyTask.vue
  31. 3
      io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter.properties
  32. 1
      io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter_tw_CN.properties
  33. 3
      io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter_zh_CN.properties
  34. 2
      io.sc.standard.frontend/package.json
  35. 2
      io.sc.website/package.json
  36. 2
      wra.report.frontend/package.json

2
cips.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
erm.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
gradle.properties

@ -39,7 +39,7 @@ application_version=1.0.0
platform_group=io.sc platform_group=io.sc
platform_version=8.2.35 platform_version=8.2.35
platform_plugin_version=8.2.10 platform_plugin_version=8.2.10
platform_core_frontend_version=8.2.128 platform_core_frontend_version=8.2.129
########################################################### ###########################################################
# dependencies version # dependencies version

2
io.sc.engine.mv.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.engine.rule.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/common/initializer/RuleEngineWorkFlowInitializer.java

@ -61,7 +61,7 @@ public class RuleEngineWorkFlowInitializer implements ApplicationInitializer{
entity.setBusinessDescriptionSql( entity.setBusinessDescriptionSql(
"select\n" + "select\n" +
" CONCAT(CODE_,':',VERSION_) BUSINESS_KEY,\n" + " CONCAT(CODE_,':',VERSION_) BUSINESS_KEY,\n" +
" NULL BUSINESS_TYPE,\n" + " '模型发布审批' BUSINESS_TYPE,\n" +
" NAME_ CUST_NO,\n" + " NAME_ CUST_NO,\n" +
" CONCAT('V',VERSION_) CUST_NAME,\n" + " CONCAT('V',VERSION_) CUST_NAME,\n" +
" NULL PROCESS_STATUS\n" + " NULL PROCESS_STATUS\n" +

2
io.sc.engine.st.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.ai.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.core.frontend/package.json

@ -1,6 +1,6 @@
{ {
"name": "platform-core", "name": "platform-core",
"version": "8.2.128", "version": "8.2.129",
"description": "前端核心包,用于快速构建前端的脚手架", "description": "前端核心包,用于快速构建前端的脚手架",
"//main": "库的主文件", "//main": "库的主文件",
"main": "dist/platform-core.js", "main": "dist/platform-core.js",

1
io.sc.platform.core.frontend/src/platform/i18n/messages.json

@ -339,6 +339,7 @@
"home.card.myTask.title": "My Tasks", "home.card.myTask.title": "My Tasks",
"home.card.myTask.action.list": "all my tasks", "home.card.myTask.action.list": "all my tasks",
"home.card.myTask.action.process.tip.nextTask": "Are you sure to handle next {businessType} task available?",
"home.card.myDoneTask.title": "My Tasks Done", "home.card.myDoneTask.title": "My Tasks Done",
"home.card.myDoneTask.action.list": "all my done tasks", "home.card.myDoneTask.action.list": "all my done tasks",

1
io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json

@ -339,6 +339,7 @@
"home.card.myTask.title": "待辦任務", "home.card.myTask.title": "待辦任務",
"home.card.myTask.action.list": "顯示所有", "home.card.myTask.action.list": "顯示所有",
"home.card.myTask.action.process.tip.nextTask": "您確定是否要繼續進行下一筆{businessType}操作?",
"home.card.myDoneTask.title": "辦理中任務", "home.card.myDoneTask.title": "辦理中任務",
"home.card.myDoneTask.action.list": "顯示所有", "home.card.myDoneTask.action.list": "顯示所有",

1
io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json

@ -340,6 +340,7 @@
"home.card.myTask.title": "待办任务", "home.card.myTask.title": "待办任务",
"home.card.myTask.action.list": "显示所有", "home.card.myTask.action.list": "显示所有",
"home.card.myTask.action.process.tip.nextTask": "您确定是否要继续进行下一笔{businessType}操作?",
"home.card.myDoneTask.title": "办理中任务", "home.card.myDoneTask.title": "办理中任务",
"home.card.myDoneTask.action.list": "显示所有", "home.card.myDoneTask.action.list": "显示所有",

1
io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts

@ -68,6 +68,7 @@ export type ConfigureType = {
isMultiCorporationMode: boolean; //是否多法人模式 isMultiCorporationMode: boolean; //是否多法人模式
isPrimaryCorporation: boolean; //是否是主法人(主法人可以管理其他法人) isPrimaryCorporation: boolean; //是否是主法人(主法人可以管理其他法人)
authenticationMode: string; //认证模式 authenticationMode: string; //认证模式
workbenchAutoHandleNextTask: boolean; //工作台中是否自动处理下一个任务
}; };
// --------------------------------------------- // ---------------------------------------------

24
io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue

@ -62,7 +62,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { h, ref, defineAsyncComponent, nextTick } from 'vue'; import { h, ref, defineAsyncComponent, nextTick } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { $t, axios, Environment, ComponentManager, Tools, NotifyManager, QuasarTools } from '@/platform'; import { $t, axios, Environment, ComponentManager, Tools, NotifyManager, DialogManager, QuasarTools } from '@/platform';
import { onMounted } from 'vue'; import { onMounted } from 'vue';
const props = defineProps({ taskId: { type: String, default: null } }); const props = defineProps({ taskId: { type: String, default: null } });
@ -101,6 +101,25 @@ const refresh = () => {
emit('afterRefresh'); emit('afterRefresh');
}; };
const afterTaskClosed = () => {
refresh();
};
const afterTaskCompleted = () => {
refresh();
if (Environment.getConfigure().setting.workbenchAutoHandleNextTask) {
axios.get(Environment.apiContextPath('/api/flowable/process/query/myTask?page=1&size=10&pageable=true&sortBy=-startTime')).then((response) => {
const content = response?.data?.content;
if (Tools.isArray(content) && content.length > 0) {
const nextTask = content[0];
DialogManager.confirm($t('home.card.myTask.action.process.tip.nextTask', { businessType: nextTask.businessType }), () => {
handle(nextTask);
});
}
});
}
};
const handle = async (item: any) => { const handle = async (item: any) => {
if (item.taskHandFrontendModelName && item.taskHandFrontendComponentName) { if (item.taskHandFrontendModelName && item.taskHandFrontendComponentName) {
// //
@ -117,7 +136,8 @@ const handle = async (item: any) => {
action: 'process', action: 'process',
task: item, task: item,
properties: Tools.json2Object(item.taskHandFrontendComponentProperties), properties: Tools.json2Object(item.taskHandFrontendComponentProperties),
onClose: refresh, onClose: afterTaskClosed,
onAfterTaskCompleted: afterTaskCompleted,
}); });
}); });
} else if (item.taskHandFrontendRouteName) { } else if (item.taskHandFrontendRouteName) {

4
io.sc.platform.core.frontend/template-project/package.json

@ -1,6 +1,6 @@
{ {
"name": "platform-core", "name": "platform-core",
"version": "8.2.128", "version": "8.2.129",
"description": "前端核心包,用于快速构建前端的脚手架", "description": "前端核心包,用于快速构建前端的脚手架",
"private": false, "private": false,
"keywords": [], "keywords": [],
@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.developer.doc/package.json

@ -28,7 +28,7 @@
"vuepress": "2.0.0-rc.15" "vuepress": "2.0.0-rc.15"
}, },
"dependencies": { "dependencies": {
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"vue": "3.5.13", "vue": "3.5.13",
"vue-i18n": "11.0.1" "vue-i18n": "11.0.1"

2
io.sc.platform.developer.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

1
io.sc.platform.developer.frontend/src/i18n/messages.json

@ -52,6 +52,7 @@
"developer.backend.export.liquibase.export.tip": "Are you sure to export?", "developer.backend.export.liquibase.export.tip": "Are you sure to export?",
"developer.backend.sql.datasource": "Datasource", "developer.backend.sql.datasource": "Datasource",
"developer.backend.sql.catalog": "Catalog",
"developer.backend.sql.schema": "Schema", "developer.backend.sql.schema": "Schema",
"developer.backend.sql.action.execute": "Execute", "developer.backend.sql.action.execute": "Execute",
"developer.backend.sql.action.executeAll": "Execute All", "developer.backend.sql.action.executeAll": "Execute All",

2
io.sc.platform.lcdp.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

9
io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java

@ -12,6 +12,7 @@ public class Setting {
private boolean enableChangeRole =false; // 是否允许切换角色(当一个用户拥有多个角色时) private boolean enableChangeRole =false; // 是否允许切换角色(当一个用户拥有多个角色时)
private boolean isMultiCorporationMode =false; // 是否是多法人模式 private boolean isMultiCorporationMode =false; // 是否是多法人模式
private AuthenticationMode authenticationMode =AuthenticationMode.OAUTH2; // 认证模式 private AuthenticationMode authenticationMode =AuthenticationMode.OAUTH2; // 认证模式
private boolean workbenchAutoHandleNextTask =false;//工作台中是否自动处理下一个任务
public long getSessionTimeout() { public long getSessionTimeout() {
return sessionTimeout; return sessionTimeout;
@ -84,4 +85,12 @@ public class Setting {
public void setAuthenticationMode(AuthenticationMode authenticationMode) { public void setAuthenticationMode(AuthenticationMode authenticationMode) {
this.authenticationMode = authenticationMode; this.authenticationMode = authenticationMode;
} }
public boolean getWorkbenchAutoHandleNextTask() {
return workbenchAutoHandleNextTask;
}
public void setWorkbenchAutoHandleNextTask(boolean workbenchAutoHandleNextTask) {
this.workbenchAutoHandleNextTask = workbenchAutoHandleNextTask;
}
} }

9
io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java

@ -85,7 +85,8 @@ public class ConfigureServiceImpl extends DaoServiceImpl<ConfigureEntity, String
Map<String,String> parameters =systemParameterService.getParameters(new String[]{ Map<String,String> parameters =systemParameterService.getParameters(new String[]{
"parameter.system.homePage", "parameter.system.homePage",
"parameter.system.notifierTaskNavigateFrontendRoutePath", "parameter.system.notifierTaskNavigateFrontendRoutePath",
"parameter.system.login.encodePassword" "parameter.system.login.encodePassword",
"parameter.system.workbenchAutoHandleNextTask"
}); });
String homePage =parameters.get("parameter.system.homePage"); String homePage =parameters.get("parameter.system.homePage");
if(StringUtils.hasText(homePage)) { if(StringUtils.hasText(homePage)) {
@ -117,6 +118,12 @@ public class ConfigureServiceImpl extends DaoServiceImpl<ConfigureEntity, String
configure.getSetting().setEnableChangeRole(enableChangeRole); configure.getSetting().setEnableChangeRole(enableChangeRole);
configure.getSetting().setIsMultiCorporationMode(io.sc.platform.core.Environment.getInstance().isMultiCorportationMode()); configure.getSetting().setIsMultiCorporationMode(io.sc.platform.core.Environment.getInstance().isMultiCorportationMode());
String workbenchAutoHandleNextTask =parameters.get("parameter.system.workbenchAutoHandleNextTask");
if(StringUtils.hasText(workbenchAutoHandleNextTask)) {
configure.getSetting().setWorkbenchAutoHandleNextTask(Boolean.valueOf(workbenchAutoHandleNextTask));
}
return configure; return configure;
} }

2
io.sc.platform.license.keygen.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.mvc.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

11
io.sc.platform.mvc/src/main/resources/META-INF/platform/plugins/parameters.json

@ -8,5 +8,16 @@
"code": "parameter.system.homePage", "code": "parameter.system.homePage",
"defaultValue": "/home", "defaultValue": "/home",
"order": 100 "order": 100
},
{
"id": "parameter.system.workbenchAutoHandleNextTask",
"parentId": "parameter.system",
"code": "parameter.system.workbenchAutoHandleNextTask",
"defaultValue": "false",
"order": 150,
"options" : {
"true" : "yes",
"false" : "no"
}
} }
] ]

2
io.sc.platform.scheduler.manager.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.system.frontend/package.json

@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

1
io.sc.platform.system.frontend/src/i18n/messages.json

@ -238,6 +238,7 @@
"workbench.myTask.grid.title": "My Tasks", "workbench.myTask.grid.title": "My Tasks",
"workbench.myTask.grid.action.process": "Process", "workbench.myTask.grid.action.process": "Process",
"workbench.myTask.grid.action.process.tip.nextTask": "Are you sure to handle next {businessType} task available?",
"workbench.myDoneTask.grid.title": "My Done Tasks", "workbench.myDoneTask.grid.title": "My Done Tasks",
"workbench.myDoneTask.grid.action.view": "View", "workbench.myDoneTask.grid.action.view": "View",

1
io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json

@ -238,6 +238,7 @@
"workbench.myTask.grid.title": "待辦任務", "workbench.myTask.grid.title": "待辦任務",
"workbench.myTask.grid.action.process": "辦理", "workbench.myTask.grid.action.process": "辦理",
"workbench.myTask.grid.action.process.tip.nextTask": "您確定是否要繼續進行下一筆{businessType}操作?",
"workbench.myDoneTask.grid.title": "辦理中任務", "workbench.myDoneTask.grid.title": "辦理中任務",
"workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.action.view": "查看",

1
io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json

@ -246,6 +246,7 @@
"workbench.myTask.grid.title": "待办任务", "workbench.myTask.grid.title": "待办任务",
"workbench.myTask.grid.action.process": "办理", "workbench.myTask.grid.action.process": "办理",
"workbench.myTask.grid.action.process.tip.nextTask": "您确定是否要继续进行下一笔{businessType}操作?",
"workbench.myDoneTask.grid.title": "办理中任务", "workbench.myDoneTask.grid.title": "办理中任务",
"workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.action.view": "查看",

24
io.sc.platform.system.frontend/src/views/workbench/MyTask.vue

@ -96,7 +96,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { h, ref, defineAsyncComponent, nextTick } from 'vue'; import { h, ref, defineAsyncComponent, nextTick } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { $t, axios, Environment, ComponentManager, Tools, NotifyManager, FormValidators } from 'platform-core'; import { $t, axios, Environment, ComponentManager, Tools, NotifyManager, DialogManager, FormValidators } from 'platform-core';
const router = useRouter(); const router = useRouter();
const gridRef = ref(); const gridRef = ref();
@ -116,7 +116,8 @@ const handle = async (item: any) => {
action: 'process', action: 'process',
task: item, task: item,
properties: Tools.json2Object(item.taskHandFrontendComponentProperties), properties: Tools.json2Object(item.taskHandFrontendComponentProperties),
onClose: refresh, onClose: afterTaskClosed,
onAfterTaskCompleted: afterTaskCompleted,
}); });
}); });
} else if (item.taskHandFrontendRouteName) { } else if (item.taskHandFrontendRouteName) {
@ -130,6 +131,25 @@ const refresh = () => {
gridRef.value.refresh(); gridRef.value.refresh();
}; };
const afterTaskClosed = () => {
gridRef.value.refresh();
};
const afterTaskCompleted = () => {
gridRef.value.refresh();
if (Environment.getConfigure().setting.workbenchAutoHandleNextTask) {
axios.get(Environment.apiContextPath('/api/flowable/process/query/myTask?page=1&size=10&pageable=true&sortBy=-startTime')).then((response) => {
const content = response?.data?.content;
if (Tools.isArray(content) && content.length > 0) {
const nextTask = content[0];
DialogManager.confirm($t('workbench.myTask.grid.action.process.tip.nextTask', { businessType: nextTask.businessType }), () => {
handle(nextTask);
});
}
});
}
};
const response = await axios.get( const response = await axios.get(
Environment.apiContextPath('/api/parameter/list?codes=parameter.system.workbench.processDefines&codes=parameter.system.workbench.processStatus'), Environment.apiContextPath('/api/parameter/list?codes=parameter.system.workbench.processDefines&codes=parameter.system.workbench.processStatus'),
); );

3
io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter.properties

@ -3,4 +3,5 @@ home.default=Home Page (System Default)
parameter.system=System parameter.system=System
parameter.system.homePage=Home Page parameter.system.homePage=Home Page
parameter.system.notifierTaskNavigateFrontendRoutePath=The Route Path of Task Navigator in Notifier parameter.system.notifierTaskNavigateFrontendRoutePath=The Route Path of Task Navigator in Notifier
parameter.login.encodePassword=\u767B\u9304\u9801\u9762\u5BC6\u78BC\u52A0\u5BC6 parameter.system.workbenchAutoHandleNextTask=Workbench Auto Handle Next Task
parameter.login.encodePassword=Encode The Login Page's Password

1
io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter_tw_CN.properties

@ -3,4 +3,5 @@ home.default=\u9996\u9801 (\u7CFB\u7D71\u9ED8\u8A8D)
parameter.system=\u7CFB\u7D71 parameter.system=\u7CFB\u7D71
parameter.system.homePage=\u9996\u9801 parameter.system.homePage=\u9996\u9801
parameter.system.notifierTaskNavigateFrontendRoutePath=\u901A\u77E5\u6B04\u4EFB\u52D9\u5C0E\u822A\u524D\u7AEF\u8DEF\u7531\u8DEF\u5F91 parameter.system.notifierTaskNavigateFrontendRoutePath=\u901A\u77E5\u6B04\u4EFB\u52D9\u5C0E\u822A\u524D\u7AEF\u8DEF\u7531\u8DEF\u5F91
parameter.system.workbenchAutoHandleNextTask=\u5DE5\u4F5C\u53F0\u662F\u5426\u81EA\u52D5\u8655\u7406\u4E0B\u4E00\u500B\u4EFB\u52D9
parameter.login.encodePassword=\u767B\u9304\u9801\u9762\u5BC6\u78BC\u52A0\u5BC6 parameter.login.encodePassword=\u767B\u9304\u9801\u9762\u5BC6\u78BC\u52A0\u5BC6

3
io.sc.platform.system/src/main/resources/io/sc/platform/system/i18n/parameter_zh_CN.properties

@ -3,4 +3,5 @@ home.default=\u9996\u9875 (\u7CFB\u7EDF\u9ED8\u8BA4)
parameter.system=\u7CFB\u7EDF parameter.system=\u7CFB\u7EDF
parameter.system.homePage=\u9996\u9875 parameter.system.homePage=\u9996\u9875
parameter.system.notifierTaskNavigateFrontendRoutePath=\u901A\u77E5\u680F\u4EFB\u52A1\u5BFC\u822A\u524D\u7AEF\u8DEF\u7531\u8DEF\u5F84 parameter.system.notifierTaskNavigateFrontendRoutePath=\u901A\u77E5\u680F\u4EFB\u52A1\u5BFC\u822A\u524D\u7AEF\u8DEF\u7531\u8DEF\u5F84
parameter.login.encodePassword=\u767B\u9304\u9801\u9762\u5BC6\u78BC\u52A0\u5BC6 parameter.system.workbenchAutoHandleNextTask=\u5DE5\u4F5C\u53F0\u662F\u5426\u81EA\u52A8\u5904\u7406\u4E0B\u4E00\u4E2A\u4EFB\u52A1
parameter.login.encodePassword=\u767B\u5F55\u9875\u9762\u5BC6\u7801\u52A0\u5BC6

2
io.sc.standard.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.website/package.json

@ -28,6 +28,6 @@
}, },
"dependencies": { "dependencies": {
"vue": "3.5.13", "vue": "3.5.13",
"platform-core": "8.2.128" "platform-core": "8.2.129"
} }
} }

2
wra.report.frontend/package.json

@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.128", "platform-core": "8.2.129",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

Loading…
Cancel
Save