From 3bd08645160f43e61c21c01a2f421ea25e35c3cf Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 27 Oct 2026 14:13:45 +0800 Subject: [PATCH] feat(approval-flow): localize approval flow UI and routes --- apps/vben5/apps/app-antd/src/locales/index.ts | 25 +- .../src/locales/langs/en-US/page.json | 11 + .../src/locales/langs/zh-CN/page.json | 11 + .../src/components/antflow/AddNode.vue | 30 +- .../components/antflow/ApprovalNodeDrawer.vue | 133 +++-- .../src/components/antflow/ApprovalWizard.vue | 99 ++-- .../src/components/antflow/BasicSetting.vue | 57 +- .../src/components/antflow/ButtonPerm.vue | 26 +- .../antflow/ConditionNodeDrawer.vue | 109 ++-- .../src/components/antflow/FlowDesign.vue | 22 +- .../src/components/antflow/NodeWarp.vue | 87 ++-- .../src/components/antflow/model.ts | 76 +-- .../src/components/antflow/types.ts | 32 +- .../src/components/designer/AddNode.vue | 6 +- .../designer/ApprovalFlowDesigner.vue | 114 ++-- .../designer/ApprovalFlowWizard.vue | 138 +++-- .../designer/BranchConditionDrawer.vue | 65 ++- .../designer/BranchConditionModal.vue | 57 +- .../src/components/designer/BranchFlow.vue | 44 +- .../src/components/designer/FormDesigner.vue | 192 +++++-- .../components/designer/FormPreviewModal.vue | 6 +- .../components/designer/NodeConfigDrawer.vue | 181 ++++--- .../src/components/designer/formula.ts | 26 +- .../src/components/designer/model.ts | 100 ++-- .../form-definitions/FormDefinitionTable.vue | 246 ++++++--- .../instances/ApprovalFlowViewer.vue | 5 +- .../instances/ApprovalInstanceDetailModal.vue | 163 ++++-- .../instances/CarbonCopyApprovalTable.vue | 38 +- .../instances/DoneApprovalTable.vue | 44 +- .../instances/InitiatedApprovalTable.vue | 72 ++- .../instances/PendingApprovalTable.vue | 30 +- .../src/components/instances/StatusFlow.vue | 22 +- .../instances/approval-table-utils.ts | 20 +- .../templates/ApprovalTemplateTable.vue | 62 ++- .../templates/ApprovalTemplateViewModal.vue | 118 ++++- .../templates/StartApprovalModal.vue | 41 +- .../packages/@abp/approval-flow/src/index.ts | 1 + .../@abp/approval-flow/src/locales/index.ts | 20 + .../src/locales/langs/en-US/antflow.json | 488 ++++++++++++++++++ .../src/locales/langs/zh-CN/antflow.json | 488 ++++++++++++++++++ .../ApprovalFlow/Localization/Domain/en.json | 207 +++++++- .../Localization/Domain/zh-Hans.json | 207 +++++++- ...eVbenAdmin5NavigationDefinitionProvider.cs | 18 +- 43 files changed, 3135 insertions(+), 802 deletions(-) create mode 100644 apps/vben5/packages/@abp/approval-flow/src/locales/index.ts create mode 100644 apps/vben5/packages/@abp/approval-flow/src/locales/langs/en-US/antflow.json create mode 100644 apps/vben5/packages/@abp/approval-flow/src/locales/langs/zh-CN/antflow.json 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" > -
+
+
diff --git a/apps/vben5/packages/@abp/approval-flow/src/components/antflow/ApprovalNodeDrawer.vue b/apps/vben5/packages/@abp/approval-flow/src/components/antflow/ApprovalNodeDrawer.vue index 01da7d637..7f72e2354 100644 --- a/apps/vben5/packages/@abp/approval-flow/src/components/antflow/ApprovalNodeDrawer.vue +++ b/apps/vben5/packages/@abp/approval-flow/src/components/antflow/ApprovalNodeDrawer.vue @@ -4,6 +4,8 @@ import type { AntFlowNode } from './types'; import { computed, reactive, ref, watch } from 'vue'; +import { $t } from '@vben/locales'; + import { Alert, Button, @@ -75,19 +77,25 @@ const pickerOpen = ref(false); const pickerSelected = ref([]); const signTypeOptions = [ - { label: '或签(只需一名审批人同意或拒绝即可)', value: 1 }, - { label: '会签(需所有审批人同意,不限顺序)', value: 2 }, - { label: '顺序会签(需要所有审批人同意,根据前端传入的顺序)', value: 3 }, + { label: $t('antflow.approvalNode.orSign'), value: 1 }, + { label: $t('antflow.approvalNode.countersign'), value: 2 }, + { label: $t('antflow.approvalNode.sequentialCountersign'), value: 3 }, ]; const noHeaderActionOptions = [ - { label: '不允许发起', value: 0 }, - { label: '跳过', value: 1 }, - { label: '转交给审核管理员', value: 2 }, + { label: $t('antflow.approvalNode.noHeaderActionNone'), value: 0 }, + { label: $t('antflow.approvalNode.noHeaderActionSkip'), value: 1 }, + { label: $t('antflow.approvalNode.noHeaderActionAdmin'), value: 2 }, ]; const directorLevelOptions = Array.from({ length: 5 }, (_, index) => ({ - label: index === 0 ? '直接主管' : `第${index + 1}级主管`, + label: + index === 0 + ? $t('antflow.approvalNode.directSupervisor') + : $t('antflow.approvalNode.levelSupervisor').replace( + '{0}', + String(index + 1), + ), value: index + 1, })); @@ -111,29 +119,29 @@ const isApprove = computed( const isCopy = computed(() => draft.nodeType === NodeType.CopyNode); const drawerTitle = computed(() => { if (isCopy.value) { - return '抄送人'; + return $t('antflow.approvalNode.ccPerson'); } if (draft.nodeType === NodeType.ParallelApproveNode) { - return '并行审批人'; + return $t('antflow.approvalNode.parallelApprover'); } - return '审批人'; + return $t('antflow.approvalNode.approver'); }); const assigneeTypeOptions = computed(() => { if (isCopy.value) { return [ - { label: '指定成员', value: 1 }, - { label: '指定角色', value: 2 }, + { label: $t('antflow.approvalNode.assigneeMember'), value: 1 }, + { label: $t('antflow.approvalNode.assigneeRole'), value: 2 }, ]; } return [ - { label: '指定成员', value: 1 }, - { label: '指定角色', value: 2 }, - { label: '直属领导', value: 3 }, - { label: '发起人自己', value: 5 }, - { label: '指定层级', value: 6 }, - { label: '层层审批', value: 7 }, - { label: '发起人自选审批人', value: 8 }, + { label: $t('antflow.approvalNode.assigneeMember'), value: 1 }, + { label: $t('antflow.approvalNode.assigneeRole'), value: 2 }, + { label: $t('antflow.approvalNode.assigneeLeader'), value: 3 }, + { label: $t('antflow.approvalNode.assigneeInitiator'), value: 5 }, + { label: $t('antflow.approvalNode.assigneeLevel'), value: 6 }, + { label: $t('antflow.approvalNode.assigneeChain'), value: 7 }, + { label: $t('antflow.approvalNode.assigneeSelfSelect'), value: 8 }, ]; }); @@ -158,15 +166,25 @@ const pickerOptions = computed(() => { }); const personLabel = computed(() => - draft.assigneeType === 2 ? '添加/修改角色' : '添加/修改人员', + draft.assigneeType === 2 + ? $t('antflow.approvalNode.addRole') + : $t('antflow.approvalNode.addPerson'), ); const tabs = computed(() => { const items = [ - { key: 'approver', label: isCopy.value ? '抄送人设置' : '审批人设置' }, + { + key: 'approver', + label: isCopy.value + ? $t('antflow.approvalNode.ccSetting') + : $t('antflow.approvalNode.approverSetting'), + }, ]; if (isApprove.value) { - items.push({ key: 'button', label: '按钮权限设置' }); + items.push({ + key: 'button', + label: $t('antflow.approvalNode.buttonPermission'), + }); } return items; }); @@ -273,15 +291,22 @@ function generateDisplayName(): string { if ([1, 2].includes(draft.assigneeType) && names.length > 0) { if (draft.signType === 2) { - return `${names.length}人(${names.join(',')})会签`; + return $t('antflow.approvalNode.signSummary') + .replace('{0}', String(names.length)) + .replace('{1}', names.join(',')); } if (draft.signType === 3) { - return `${names.length}人(${names.join(',')})顺序会签`; + return $t('antflow.approvalNode.sequentialSignSummary') + .replace('{0}', String(names.length)) + .replace('{1}', names.join(',')); } return names.join(','); } if (draft.assigneeType === 6) { - return `第 ${draft.directorLevel} 级主管`; + return $t('antflow.approvalNode.levelSummary').replace( + '{0}', + String(draft.directorLevel), + ); } return ( assigneeTypeOptions.value.find((item) => item.value === draft.assigneeType) @@ -291,12 +316,14 @@ function generateDisplayName(): string { function validate(): boolean { if (!draft.nodeName.trim()) { - message.warning('请输入节点名称'); + message.warning($t('antflow.approvalNode.nodeNameRequired')); return false; } if ([1, 2].includes(draft.assigneeType) && draft.assigneeList.length === 0) { message.warning( - draft.assigneeType === 2 ? '请选择角色' : '请选择审批人/抄送人', + draft.assigneeType === 2 + ? $t('antflow.approvalNode.selectRole') + : $t('antflow.approvalNode.selectApprover'), ); return false; } @@ -365,12 +392,14 @@ function confirm() {
- +
@@ -411,46 +440,46 @@ function confirm() {
- 发起人的: + {{ $t('antflow.approvalNode.initiatorPrefix') }} - 已绑定表单 - 未保存 + + {{ $t('antflow.wizard.boundForm') }} + + + {{ $t('antflow.wizard.unsaved') }} +