From b995ac378a58827f12fbccc8cbfcf3efd88cb8b0 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 26 Sep 2024 17:20:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=90=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E8=BF=9B=E8=A1=8C=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=BB=A7=E7=BB=AD=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 4 ++-- src/i18n/locales/zh-CN.ts | 4 ++-- src/views/ne/neVersion/index.vue | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 3a4d3601..85f56c4d 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -739,11 +739,11 @@ export default { upgrade: "Upgrade To New Version", upgradeTip: "Confirmed to upgrade to the new version?", upgradeTipEmpty: "There are currently no new versions available", - upgradeTipEqual: "Current version is the same as the new version", + upgradeTipEqual: "The current version is the same as the new version, confirmed to update?", rollback: 'Switch to previous version', rollbackTip: "Confirm switching to the previous version?", rollbackTipEmpty: "There is currently no previous version available", - rollbackTipEqual: 'The current version is the same as the previous version', + rollbackTipEqual: 'The current version is the same as the previous version, are you sure you want to make the switch?', version: "Current Version", preVersion: "Previous Version", newVersion: "New Version", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index ac006a9e..9280e038 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -739,11 +739,11 @@ export default { upgrade: "升级到新版本", upgradeTip: "确认要升级到新版本吗?", upgradeTipEmpty: "当前没有可用的新版本", - upgradeTipEqual: "当前版本与新版本相同", + upgradeTipEqual: "当前版本与新版本相同,确认要进行更新吗?", rollback: '切换到上一个版本', rollbackTip: "确认切换到上一个版本吗?", rollbackTipEmpty: "目前没有可用的上一个版本", - rollbackTipEqual: '当前版本与之前版本相同', + rollbackTipEqual: '当前版本与之前版本相同,确认要进行切换吗?', version: "当前版本", preVersion: "上一个版本", newVersion: "新版本", diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index 50add735..4bebcd6c 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -294,8 +294,7 @@ function fnRecordVersion( return; } if (row.newVersion === row.version) { - message.warning(t('views.ne.neVersion.upgradeTipEqual'), 3); - return; + contentTip = t('views.ne.neVersion.upgradeTipEqual'); } } if (action === 'rollback') { @@ -305,8 +304,7 @@ function fnRecordVersion( return; } if (row.preVersion === row.version) { - message.warning(t('views.ne.neVersion.rollbackTipEqual'), 3); - return; + contentTip = t('views.ne.neVersion.rollbackTipEqual'); } }