From 3993b98f577f45078c2a487f645c303612d80a56 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Wed, 15 Jan 2025 11:31:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=BE=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E3=80=82=201.?= =?UTF-8?q?=E5=88=86=E4=B8=BA=E5=A2=9E=E9=87=8F=E5=92=8C=E8=A6=86=E7=9B=96?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=A4=E7=A7=8D=EF=BC=8C=E4=BC=9A=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=E7=9A=84id=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=AF=BC=E5=85=A5=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E7=9A=84=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E9=87=8F=E6=98=AF=E4=BF=9D=E7=95=99=E5=8E=9F?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=90=8C=E5=90=8D=E5=90=8Ccode=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E6=B5=81=E7=A8=8B=EF=BC=88=E6=88=96=E8=80=85=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E6=B2=A1=E6=9C=89=E7=9A=84=E6=96=B0=E5=A2=9E=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=EF=BC=89=E3=80=82=E4=B8=A4=E7=A7=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=83=BD=E5=8F=AF=E4=BB=A5=E5=AF=B9=E6=96=B0=E5=A2=9E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=BF=9B=E8=A1=8C=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/ImportFlow.vue | 9 +++++++-- src/views/workflow/design/index.vue | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/workflow/design/ImportFlow.vue b/src/views/workflow/design/ImportFlow.vue index aed656a..f1b9ce3 100644 --- a/src/views/workflow/design/ImportFlow.vue +++ b/src/views/workflow/design/ImportFlow.vue @@ -49,10 +49,15 @@ action: '', headers: { Authorization: '' }, }); + const props = defineProps({ + coverType: { + type: Boolean + }, + }); async function open() { data.visible = true; - data.action = getAppEnvConfig().VITE_GLOB_API_URL + '/workflow/schema/import'; + data.action = getAppEnvConfig().VITE_GLOB_API_URL + '/workflow/schema/import?cover='+props.coverType; data.headers.Authorization = `Bearer ${getToken()}`; } function close() { @@ -68,7 +73,7 @@ message.success(t(`{name}导入成功！`, { name: info.file.name })); close(); } else { - message.error(t('导入流程失败！')); + message.error(t('导入流程失败！'+ info.file.response.msg)); } } else if (info.file.status === 'error') { message.error(t(`{name}上传失败.`, { name: info.file.name })); diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue index 9e86b0f..4a42bef 100644 --- a/src/views/workflow/design/index.vue +++ b/src/views/workflow/design/index.vue @@ -27,8 +27,11 @@ {{ t('历史记录') }} - {{ t('导入流程') }}{{ t('增量导入流程') }} + {{ t('覆盖导入流程') }} {{ t('导出流程') From b1cef39a1e8f907297b8d0cb7ff2a76a6372eb79 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Thu, 16 Jan 2025 09:46:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E=E6=96=87?= =?UTF-8?q?tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/index.vue | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue index 4a42bef..6b38694 100644 --- a/src/views/workflow/design/index.vue +++ b/src/views/workflow/design/index.vue @@ -27,12 +27,22 @@ {{ t('历史记录') }} - {{ t('增量导入流程') }} - {{ t('覆盖导入流程') }} + + + + {{ t('增量导入流程') }} + + + + + + {{ t('覆盖导入流程') }} + + {{ t('导出流程') }} From 8c739ec49dea734f46b502fb526c51f41abccff6 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Thu, 16 Jan 2025 10:39:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E4=B8=8D=E7=94=A8t=E7=9A=84useI18n?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=96=87=E6=9C=AC=E6=9B=BF=E6=8D=A2=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E3=80=82action=E9=85=8D=E7=BD=AEprefix=E7=9A=84url?= =?UTF-8?q?=E4=B8=AD=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/ImportFlow.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/workflow/design/ImportFlow.vue b/src/views/workflow/design/ImportFlow.vue index f1b9ce3..a69ce9d 100644 --- a/src/views/workflow/design/ImportFlow.vue +++ b/src/views/workflow/design/ImportFlow.vue @@ -57,7 +57,7 @@ async function open() { data.visible = true; - data.action = getAppEnvConfig().VITE_GLOB_API_URL + '/workflow/schema/import?cover='+props.coverType; + data.action = getAppEnvConfig().VITE_GLOB_API_URL + (getAppEnvConfig().VITE_GLOB_API_URL_PREFIX|| '') + '/workflow/schema/import?cover='+props.coverType; data.headers.Authorization = `Bearer ${getToken()}`; } function close() { @@ -70,13 +70,13 @@ } if (info.file.status === 'done') { if (info.file && info.file.response && info.file.response.code == 0) { - message.success(t(`{name}导入成功！`, { name: info.file.name })); + message.success(`${info.file.name}导入成功！`); close(); } else { - message.error(t('导入流程失败！'+ info.file.response.msg)); + message.error('导入流程失败！'+ info.file.response.msg); } } else if (info.file.status === 'error') { - message.error(t(`{name}上传失败.`, { name: info.file.name })); + message.error(`${info.file.name}上传失败.`); } } From 1441596a3643cdf1b94029b0649ad1e31dcba2a1 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Fri, 7 Feb 2025 11:33:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E5=A2=9E=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=20=E6=94=B9=E5=90=8D=E6=88=90=20=E6=96=B0=E5=A2=9E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue index 6b38694..0b981ef 100644 --- a/src/views/workflow/design/index.vue +++ b/src/views/workflow/design/index.vue @@ -32,7 +32,7 @@ - {{ t('增量导入流程') }} + {{ t('新增导入流程') }} From 00d446246b508de2c4e22aead13d2c99bcd07075 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Fri, 7 Feb 2025 11:35:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E5=A2=9E=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=20=E6=94=B9=E5=90=8D=E6=88=90=20=E6=96=B0=E5=A2=9E=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue index 0b981ef..3ed3c49 100644 --- a/src/views/workflow/design/index.vue +++ b/src/views/workflow/design/index.vue @@ -30,7 +30,7 @@ {{ t('新增导入流程') }}