From 93447e39b8eb545b3247c7ebcb64f173146d5c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Wed, 4 Feb 2026 18:32:39 +0800 Subject: [PATCH] =?UTF-8?q?--=E5=8E=BB=E6=8E=89=E9=85=8D=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=8B=92=E7=BB=9D=E5=92=8C=E7=BB=93=E6=9D=9F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=20=E5=90=8C=E6=84=8F=E3=80=81=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E3=80=81=E8=BD=AC=E5=8A=9E=E3=80=81=E6=92=A4=E5=9B=9E=E3=80=81?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .../design/bpmn/config/propertyConfig.ts | 34 +++++++++---------- .../design/bpmn/config/sequenceConfig.ts | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.env.development b/.env.development index a06aa67..c7c1206 100644 --- a/.env.development +++ b/.env.development @@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = / # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题 # 可以有多个，注意多个不能换行，否则代理将会失效 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api","http://10.10.2.102:9500"]] +VITE_PROXY=[["/api/magic-api/", "http://127.0.0.1:8097","/magic-api/"], ["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]] diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index b663a8b..8d07535 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -197,14 +197,14 @@ const UserProperties = { index: 2 }, // 现在没有拒绝选项 - { - buttonType: ButtonType.DEFAULT, //按钮类型 - buttonName: t('拒绝'), //按钮名称 - buttonCode: ApproveCode.DISAGREE, //按钮编码 - approveType: ApproveType.DISAGREE, // - checked: true, //选中 - index: 3 - }, + // { + // buttonType: ButtonType.DEFAULT, //按钮类型 + // buttonName: t('拒绝'), //按钮名称 + // buttonCode: ApproveCode.DISAGREE, //按钮编码 + // approveType: ApproveType.DISAGREE, // + // checked: true, //选中 + // index: 3 + // }, { buttonType: ButtonType.DEFAULT, //按钮类型 buttonName: t('驳回'), //按钮名称 @@ -240,15 +240,15 @@ const UserProperties = { buttonGroup: '', index: 6 }, - { - buttonType: ButtonType.DEFAULT, //按钮类型 - buttonName: t('结束'), //按钮名称 - buttonCode: ApproveCode.FINISH, //按钮编码 - approveType: ApproveType.FINISH, // - checked: true, //选中 - buttonGroup: '更多', - index: 7 - }, + // { + // buttonType: ButtonType.DEFAULT, //按钮类型 + // buttonName: t('结束'), //按钮名称 + // buttonCode: ApproveCode.FINISH, //按钮编码 + // approveType: ApproveType.FINISH, // + // checked: true, //选中 + // buttonGroup: '更多', + // index: 7 + // }, { buttonType: ButtonType.DEFAULT, //按钮类型 buttonName: t('查看流程图'), //按钮名称 diff --git a/src/views/workflow/design/bpmn/config/sequenceConfig.ts b/src/views/workflow/design/bpmn/config/sequenceConfig.ts index 7611ac7..61ec526 100644 --- a/src/views/workflow/design/bpmn/config/sequenceConfig.ts +++ b/src/views/workflow/design/bpmn/config/sequenceConfig.ts @@ -66,7 +66,7 @@ export const buttons = [ }, { key: ApproveCode.REJECT, - title: t('拒绝'), + title: t('驳回'), }, ]; // 与或非