diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 4dd6eeb8..0079deb8 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 1d84e840..893a9c76 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index b5f28e0b..7485de7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.35 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.128 +platform_core_frontend_version=8.2.129 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 47602526..5d2de897 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index d0cb74a8..d3bf677d 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", 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 71641c27..e6e67a39 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 @@ -61,7 +61,7 @@ public class RuleEngineWorkFlowInitializer implements ApplicationInitializer{ entity.setBusinessDescriptionSql( "select\n" + " CONCAT(CODE_,':',VERSION_) BUSINESS_KEY,\n" + - " NULL BUSINESS_TYPE,\n" + + " '模型发布审批' BUSINESS_TYPE,\n" + " NAME_ CUST_NO,\n" + " CONCAT('V',VERSION_) CUST_NAME,\n" + " NULL PROCESS_STATUS\n" + diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index c9f46fec..1aab4c4f 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index a7501a17..c65dd261 100644 --- a/io.sc.platform.ai.frontend/package.json +++ b/io.sc.platform.ai.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.128", + "platform-core": "8.2.129", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index e3570ba3..5eea254d 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.128", + "version": "8.2.129", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", 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 bdf40f14..cf506454 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages.json @@ -339,6 +339,7 @@ "home.card.myTask.title": "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.action.list": "all my done tasks", 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 d56f7db8..f9104fb4 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 @@ -339,6 +339,7 @@ "home.card.myTask.title": "待辦任務", "home.card.myTask.action.list": "顯示所有", + "home.card.myTask.action.process.tip.nextTask": "您確定是否要繼續進行下一筆{businessType}操作?", "home.card.myDoneTask.title": "辦理中任務", "home.card.myDoneTask.action.list": "顯示所有", 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 819695ee..c122c9c6 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 @@ -340,6 +340,7 @@ "home.card.myTask.title": "待办任务", "home.card.myTask.action.list": "显示所有", + "home.card.myTask.action.process.tip.nextTask": "您确定是否要继续进行下一笔{businessType}操作?", "home.card.myDoneTask.title": "办理中任务", "home.card.myDoneTask.action.list": "显示所有", diff --git a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts index 43996e82..406e2838 100644 --- a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts +++ b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts @@ -68,6 +68,7 @@ export type ConfigureType = { isMultiCorporationMode: boolean; //是否多法人模式 isPrimaryCorporation: boolean; //是否是主法人(主法人可以管理其他法人) authenticationMode: string; //认证模式 + workbenchAutoHandleNextTask: boolean; //工作台中是否自动处理下一个任务 }; // --------------------------------------------- diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue index 45ec0a5c..07cc1217 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue @@ -62,7 +62,7 @@