diff --git a/cips.frontend/package.json b/cips.frontend/package.json index f64ab990..63946314 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.101", + "platform-core": "8.2.102", "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 5aa237a3..49d9466c 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.101", + "platform-core": "8.2.102", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 6c262c2b..8b3e3008 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.28 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.101 +platform_core_frontend_version=8.2.102 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 4c6076a0..031522b0 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.101", + "platform-core": "8.2.102", "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 5a55a21d..1621ce90 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.101", + "platform-core": "8.2.102", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index a5c46a74..a37352ec 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.101", + "platform-core": "8.2.102", "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 a075a85c..7dcd3077 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.101", + "platform-core": "8.2.102", "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 d4f5bbf3..9123b7ad 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.101", + "version": "8.2.102", "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 a6d4c143..7fd884dc 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages.json @@ -329,9 +329,11 @@ "home.card.myShortcutmenu.title": "My Commonly used Actions", "home.card.myShortcutmenu.action.config": "Configure ...", + "home.card.task.tip.routeOrComponentNotSetting": "Action Operator NOT Setting!", + "home.card.task.tip.remoteComponentLoadError": "Action Component Loading Failed!", + "home.card.myTask.title": "My Tasks", "home.card.myTask.action.list": "all my tasks", - "home.card.myTask.action.notSetting.tip": "Action not set, can NOT hand it!", "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 889bc8fd..aeeb9411 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 @@ -329,9 +329,11 @@ "home.card.myShortcutmenu.title": "我的常用功能", "home.card.myShortcutmenu.action.config": "配置 ...", + "home.card.task.tip.routeOrComponentNotSetting": "任務辦理動作未設置, 無法執行!", + "home.card.task.tip.remoteComponentLoadError": "任務辦理組件加載失敗, 無法執行!", + "home.card.myTask.title": "我的代辦", "home.card.myTask.action.list": "顯示所有", - "home.card.myTask.action.notSetting.tip": "任務處理未設置, 无法直接处理!", "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 cf6f9439..fae6a5ef 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 @@ -330,9 +330,11 @@ "home.card.myShortcutmenu.title": "我的常用功能", "home.card.myShortcutmenu.action.config": "配置 ...", + "home.card.task.tip.routeOrComponentNotSetting": "任务办理动作未设置, 无法执行!", + "home.card.task.tip.remoteComponentLoadError": "任务办理组件加载失败, 无法执行!", + "home.card.myTask.title": "我的代办", "home.card.myTask.action.list": "显示所有", - "home.card.myTask.action.notSetting.tip": "任务处理未设置, 无法直接处理!", "home.card.myDoneTask.title": "我的已办", "home.card.myDoneTask.action.list": "显示所有", diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue index 2bdc9692..c8dc28c8 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue @@ -86,7 +86,7 @@ const changeFirstColMaxWidth = () => { const refresh = () => { loadingRef.value = true; axios - .get(Environment.apiContextPath('/api/flowable/process/query/myDoneTask')) + .get(Environment.apiContextPath('/api/flowable/process/query/myDoneTask?page=1&size=10&pageable=true')) .then((response: any) => { itemsRef.value = response.data.content || []; loadingRef.value = false; @@ -102,7 +102,12 @@ const handle = async (item: any) => { componentRef.value = null; //重新加载组件 nextTick(() => { - const component = defineAsyncComponent(ComponentManager.getRemoteComponent(item.taskHandFrontendModelName, item.taskHandFrontendComponentName)); + const component = defineAsyncComponent({ + loader: ComponentManager.getRemoteComponent(item.taskHandFrontendModelName, item.taskHandFrontendComponentName), + onError: (error, retry, fail, attempts) => { + NotifyManager.error($t('home.card.task.tip.remoteComponentLoadError')); + }, + }); componentRef.value = h(component, { action: 'view', task: item, @@ -113,7 +118,7 @@ const handle = async (item: any) => { } else if (item.taskHandFrontendRouteName) { router.push({ name: item.taskHandFrontendRouteName }); } else { - NotifyManager.warn($t('home.card.task.action.notSetting.tip')); + NotifyManager.warn($t('home.card.task.tip.routeOrComponentNotSetting')); } }; diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue index c03a7550..9166f18a 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue @@ -86,7 +86,7 @@ const changeFirstColMaxWidth = () => { const refresh = () => { loadingRef.value = true; axios - .get(Environment.apiContextPath('/api/flowable/process/query/myFinishedTask')) + .get(Environment.apiContextPath('/api/flowable/process/query/myFinishedTask?page=1&size=10&pageable=true')) .then((response: any) => { itemsRef.value = response.data.content || []; loadingRef.value = false; @@ -102,7 +102,12 @@ const handle = async (item: any) => { componentRef.value = null; //重新加载组件 nextTick(() => { - const component = defineAsyncComponent(ComponentManager.getRemoteComponent(item.taskHandFrontendModelName, item.taskHandFrontendComponentName)); + const component = defineAsyncComponent({ + loader: ComponentManager.getRemoteComponent(item.taskHandFrontendModelName, item.taskHandFrontendComponentName), + onError: (error, retry, fail, attempts) => { + NotifyManager.error($t('home.card.task.tip.remoteComponentLoadError')); + }, + }); componentRef.value = h(component, { action: 'view', task: item, @@ -113,7 +118,7 @@ const handle = async (item: any) => { } else if (item.taskHandFrontendRouteName) { router.push({ name: item.taskHandFrontendRouteName }); } else { - NotifyManager.warn($t('home.card.task.action.notSetting.tip')); + NotifyManager.warn($t('home.card.task.tip.routeOrComponentNotSetting')); } }; 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 44ee86c6..89e8c8b1 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 @@