From 1569f44806e0e1c240c9dc0949fe906904c8ad42 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 29 Dec 2021 15:19:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=97=B6=E6=8F=90=E7=A4=BA=E6=98=AF=E5=90=A6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtProjectVersionMapper.java   |  2 ++
 .../mapper/ext/ExtProjectVersionMapper.xml    | 21 +++++++++++++++++++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/i18n/en-US.js                    |  3 +++
 frontend/src/i18n/zh-CN.js                    |  3 +++
 frontend/src/i18n/zh-TW.js                    |  3 +++
 7 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.java
index 90d3ef87a9..a44bdac114 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.java
@@ -16,4 +16,6 @@ public interface ExtProjectVersionMapper {
     boolean isVersionEnable(@Param("projectId") String projectId);
 
     void changeVersionEnable(@Param("projectId") String projectId, @Param("status") boolean status);
+
+    boolean checkForDelete(String id);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.xml
index 7e7077795f..25fb5b0881 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectVersionMapper.xml
@@ -65,4 +65,25 @@
     <update id="changeVersionEnable">
         update project set version_enable = #{status} where id = #{projectId}
     </update>
+
+    <select id="checkForDelete" resultType="boolean">
+        SELECT COUNT(1) > 0
+        FROM (
+             SELECT 1
+             FROM api_definition
+             WHERE version_id = #{id}
+             UNION
+             SELECT 1
+             FROM api_scenario
+             WHERE version_id = #{id}
+             UNION
+             SELECT 1
+             FROM api_test_case
+             WHERE version_id = #{id}
+             UNION
+             SELECT 1
+             FROM load_test
+             WHERE version_id = #{id}
+        ) AS tmp
+    </select>
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index eba0a4c13d..2bc5749967 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit eba0a4c13d6c7c32c31d497e1a8631fa5f007f72
+Subproject commit 2bc5749967e4eb931ac69eba712a345e714b7f60
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 3e5f85f773..144af6b704 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 3e5f85f773dc5ea4d0fc36e51594e107230af2ef
+Subproject commit 144af6b704f315f19d3fe52fbd258d3bbe19079e
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a30e176a17..c0084b6ba0 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -766,6 +766,9 @@ export default {
       please_input_version: 'Please input version',
       tips: 'Note: The closed version will not appear in the system field <strong>Version</strong> drop-down box option',
       enable: 'Enable version management',
+      latest: 'Latest',
+      set_latest: 'Latest',
+      delete_tip: 'This version has been associated with system resources. Deleting it will cause the version information lost',
     }
   },
   member: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 6ba0b74eaf..9818a25536 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -770,6 +770,9 @@ export default {
       please_input_version: '请输入版本',
       tips: '注意: 已关闭的版本不会出现在系统字段<strong>版本</strong>下拉框选项中',
       enable: '启用版本管理',
+      latest: '最新版',
+      set_latest: '设置为最新版本',
+      delete_tip: '此版本已经关联系统资源，删除会导致无法查询到版本信息',
     }
   },
   member: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6868c63f5f..dac570b02e 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -770,6 +770,9 @@ export default {
       please_input_version: '請輸入版本',
       tips: '注意: 已關閉的版本不會出現在系統字段<strong>版本</strong>下拉框選項中',
       enable: '啟用版本管理',
+      latest: '最新版',
+      set_latest: '設置為最新版本',
+      delete_tip: '此版本已經關聯繫統資源，刪除會導致無法查詢到版本信息',
     }
   },
   member: {