From a0247c823fd09732e23ed0a3a22beccc4f529e42 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Thu, 24 Jul 2025 11:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 前端核心发布: 8.2.90 1) 更新前端首页 --- .../resources/StartDeployWorkflowDialog.vue | 6 +++++- .../src/platform/i18n/messages.json | 20 +++++++++++++++---- .../src/platform/i18n/messages_tw_CN.json | 14 ++++++++++++- .../src/platform/i18n/messages_zh_CN.json | 14 ++++++++++++- .../src/platform/plugin/axios.ts | 8 ++++---- .../src/platform/plugin/environment/index.ts | 1 + .../src/platform/views/home/Announcement.vue | 11 +++++++--- .../src/platform/views/home/DoneTask.vue | 11 +++++++--- .../src/platform/views/home/FinishedTask.vue | 11 +++++++--- .../src/platform/views/home/Message.vue | 11 +++++++--- .../src/platform/views/home/ShortcutMenu.vue | 10 +++++++--- .../src/platform/views/home/Task.vue | 11 +++++++--- 12 files changed, 99 insertions(+), 29 deletions(-) diff --git a/io.sc.engine.rule.frontend/src/views/resources/StartDeployWorkflowDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/StartDeployWorkflowDialog.vue index b91c8c46..0071df0c 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/StartDeployWorkflowDialog.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/StartDeployWorkflowDialog.vue @@ -46,7 +46,11 @@ const resourceCodeRef = ref(''); const resourceVersionRef = ref(''); const resourceTargetStatusRef = ref(''); -const submit = (assignee) => { +const submit = async (assignee) => { + const validated = await formRef.value.validate(); + if (!validated) { + return; + } const data = formRef.value.getData(); const variables = { targetStatus: resourceTargetStatusRef.value }; const transientVariables = { task_treatment: data.treatment }; 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 d3ee2b56..6b5ac4c4 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages.json @@ -328,8 +328,20 @@ "home.card.shortcutmenu.title": "My Commonly used Actions", "home.card.shortcutmenu.action.config": "Configure ...", - "home.card.task.title": "My Task", - "home.card.doneTask.title": "My Task Have been Done", - "home.card.finishTask.title": "My Task Have been Finished", - "home.card.message.chatDialog.title": "Chat with {sender}" + + "home.card.task.title": "My Tasks", + "home.card.task.action.list": "all my tasks...", + + "home.card.doneTask.title": "My Tasks Done", + "home.card.doneTask.action.list": "all my done tasks...", + + "home.card.finishTask.title": "My Tasks Finished", + "home.card.finishTask.action.list": "all my finished tasks...", + + "home.card.message.title": "My Messages", + "home.card.message.action.list": "all my messages...", + "home.card.message.chatDialog.title": "Chat with {sender}", + + "home.card.announcement.title": "Announcements", + "home.card.announcement.action.list": "all announcements..." } 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 a33829a4..5a6b58fa 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 @@ -328,8 +328,20 @@ "home.card.shortcutmenu.title": "我的常用功能", "home.card.shortcutmenu.action.config": "配置 ...", + "home.card.task.title": "我的代辦", + "home.card.task.action.list": "顯示所有...", + "home.card.doneTask.title": "我的已辦", + "home.card.doneTask.action.list": "顯示所有...", + "home.card.finishTask.title": "我的辦結", - "home.card.message.chatDialog.title": "與 {sender} 的對話" + "home.card.finishTask.action.list": "顯示所有...", + + "home.card.message.title": "我的消息", + "home.card.message.action.list": "顯示所有...", + "home.card.message.chatDialog.title": "與 {sender} 的對話", + + "home.card.announcement.title": "系統公告", + "home.card.announcement.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 60c9936b..d7e38a7e 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 @@ -329,8 +329,20 @@ "home.card.shortcutmenu.title": "我的常用功能", "home.card.shortcutmenu.action.config": "配置 ...", + "home.card.task.title": "我的代办", + "home.card.task.action.list": "显示所有...", + "home.card.doneTask.title": "我的已办", + "home.card.doneTask.action.list": "显示所有...", + "home.card.finishTask.title": "我的办结", - "home.card.message.chatDialog.title": "与 {sender} 的对话" + "home.card.finishTask.action.list": "显示所有...", + + "home.card.message.title": "我的消息", + "home.card.message.action.list": "显示所有...", + "home.card.message.chatDialog.title": "与 {sender} 的对话", + + "home.card.announcement.title": "系统公告", + "home.card.announcement.action.list": "显示所有..." } diff --git a/io.sc.platform.core.frontend/src/platform/plugin/axios.ts b/io.sc.platform.core.frontend/src/platform/plugin/axios.ts index 69390bb7..837d04a0 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/axios.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/axios.ts @@ -32,10 +32,10 @@ const requestInterceptor = (config: any) => { if (AuthenticationManager.getLocalAccessToken()) { result.headers.Authorization = 'Bearer ' + AuthenticationManager.getLocalAccessToken(); } - } - - if (gc.axios?.basicAuth?.username && gc.axios?.basicAuth?.password) { - result.headers.Authorization = 'Basic ' + window.btoa(gc.axios.basicAuth.username + ':' + gc.axios.basicAuth.password); + } else { + if (gc.axios?.basicAuth?.username && gc.axios?.basicAuth?.password) { + result.headers.Authorization = 'Basic ' + window.btoa(gc.axios.basicAuth.username + ':' + gc.axios.basicAuth.password); + } } // 如果请求时传入 { loading: true } 属性, 则自动显示 "正在处理..., 请等待" 模态对话框 diff --git a/io.sc.platform.core.frontend/src/platform/plugin/environment/index.ts b/io.sc.platform.core.frontend/src/platform/plugin/environment/index.ts index 46c9c092..849bb7e5 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/environment/index.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/environment/index.ts @@ -207,6 +207,7 @@ class Environment { * @param args 执行参数 */ public static executeAction(name: string, args?: any): void { + console.log(Environment.getActions()); const fun = Environment.getActions()[name]; if (fun) { fun(args); 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 f6d32dd5..61aaeb15 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 @@ -1,10 +1,15 @@