diff --git a/apps/vben5/apps/app-antd/src/locales/index.ts b/apps/vben5/apps/app-antd/src/locales/index.ts index 434984cfd..89d947711 100644 --- a/apps/vben5/apps/app-antd/src/locales/index.ts +++ b/apps/vben5/apps/app-antd/src/locales/index.ts @@ -13,6 +13,7 @@ import { } from '@vben/locales'; import { preferences } from '@vben/preferences'; +import { loadApprovalFlowMessages } from '@abp/approval-flow'; import { loadComponentMessages } from '@abp/components/locales'; import { useAbpStore } from '@abp/core'; import { useLocalizationsApi } from '@abp/localization'; @@ -36,16 +37,24 @@ const localesMap = loadLocalesMapFromDir( * @param lang */ async function loadMessages(lang: SupportedLanguagesType) { - const [appLocaleMessages, compLocales, platformLocales, _, abpLocales] = - await Promise.all([ - localesMap[lang]?.(), - loadComponentMessages(lang), - loadPaltformMessages(lang), - loadThirdPartyMessage(lang), - loadAbpLocale(lang), - ]); + const [ + appLocaleMessages, + approvalFlowLocales, + compLocales, + platformLocales, + _, + abpLocales, + ] = await Promise.all([ + localesMap[lang]?.(), + loadApprovalFlowMessages(lang), + loadComponentMessages(lang), + loadPaltformMessages(lang), + loadThirdPartyMessage(lang), + loadAbpLocale(lang), + ]); return { ...appLocaleMessages?.default, + ...approvalFlowLocales?.default, ...compLocales?.default, ...platformLocales?.default, ...abpLocales, diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/page.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/page.json index 03b44db1f..f6b256d9b 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/page.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/page.json @@ -13,5 +13,16 @@ "title": "Dashboard", "analytics": "Analytics", "workspace": "Workspace" + }, + "approvalFlow": { + "title": "Approval flow", + "templates": "Approval templates", + "myApprovals": "My approvals", + "pending": "Pending", + "initiated": "Initiated by me", + "done": "Handled", + "carbonCopy": "CC to me", + "formDefinitions": "Form design", + "designer": "Flow designer" } } diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/page.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/page.json index 2b3f24782..231c972f0 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/page.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/page.json @@ -13,5 +13,16 @@ "title": "概览", "analytics": "分析页", "workspace": "工作台" + }, + "approvalFlow": { + "title": "审批流程", + "templates": "审批模板", + "myApprovals": "我的审批", + "pending": "待办", + "initiated": "我发起的", + "done": "已办", + "carbonCopy": "抄送我的", + "formDefinitions": "表单设计", + "designer": "流程设计器" } } diff --git a/apps/vben5/packages/@abp/approval-flow/src/components/antflow/AddNode.vue b/apps/vben5/packages/@abp/approval-flow/src/components/antflow/AddNode.vue index 80e8a14ab..8fe05afab 100644 --- a/apps/vben5/packages/@abp/approval-flow/src/components/antflow/AddNode.vue +++ b/apps/vben5/packages/@abp/approval-flow/src/components/antflow/AddNode.vue @@ -3,6 +3,8 @@ import type { AntFlowAddKind } from './types'; import { ref } from 'vue'; +import { $t } from '@vben/locales'; + interface AddAction { color?: string; icon?: string; @@ -17,9 +19,24 @@ const props = withDefaults( }>(), { actions: () => [ - { key: 'approval', label: '审批人', icon: '审', color: '#f2994a' }, - { key: 'cc', label: '抄送人', icon: '抄', color: '#2f80ed' }, - { key: 'condition', label: '条件网关', icon: '条', color: '#27ae60' }, + { + key: 'approval', + label: $t('antflow.addNode.approval'), + icon: '✓', + color: '#f2994a', + }, + { + key: 'cc', + label: $t('antflow.addNode.cc'), + icon: 'CC', + color: '#2f80ed', + }, + { + key: 'condition', + label: $t('antflow.addNode.condition'), + icon: '◇', + color: '#27ae60', + }, ], readonly: false, }, @@ -48,7 +65,12 @@ function handleAdd(kind: AntFlowAddKind) { @mouseenter="menuOpen = true" @mouseleave="menuOpen = false" > -
找不到主管时,由直属领导代审批
+{{ $t('antflow.approvalNode.directorTip') }}
{{
- detail.instance.formDataJson || '暂无表单内容'
+ detail.instance.formDataJson ||
+ $t('ElsaNextApprovalFlow.ApprovalFlow:Instance:NoFormContent')
}}