Merge remote-tracking branch 'origin/master' into master

backend/src/main/java/io/metersphere/commons/utils/JsonPathUtils.java

@@ -48,10 +48,6 @@ public class JsonPathUtils {
             String o_json_path = "$" + jsonPath.next().replaceAll("/", ".");
             String value = JSONPath.eval(jsonObject, o_json_path).toString();
 
-            if(o_json_path.toLowerCase().contains("id")) {
-                continue;
-            }
-
             if(value.equals("") || value.equals("[]") || o_json_path.equals("")) {
                 continue;
             }

backend/src/main/java/io/metersphere/track/issue/ZentaoUtils.java

@@ -1,26 +0,0 @@
-package io.metersphere.track.issue;
-
-import io.metersphere.commons.utils.EncryptUtils;
-
-public class ZentaoUtils {
-
-    /**
-     * @param code Zentao 应用代号
-     * @param key Zentao 密钥
-     * @return token
-     */
-    public static String getToken(String code, String key, String time) {
-        return (String) EncryptUtils.md5Encrypt(code + key + time);
-    }
-
-    /**
-     * @param url Zentao url
-     * @param code Zentao 应用代号
-     * @param key Zentao 密钥
-     * @return url
-     */
-    public static String getUrl(String url, String code, String key) {
-        String time = String.valueOf(System.currentTimeMillis());;
-        return url + "api.php?" + "code=" + code + "&time=" + time + "&token=" + getToken(code, key, time);
-    }
-}

frontend/src/business/components/common/components/MsDeleteConfirm.vue

@@ -11,6 +11,11 @@
         <br/>
       </el-col>
     </el-row>
+    <el-row class="tip" v-if="withTip">
+      <span>
+       <slot class="tip"></slot>
+      </span>
+    </el-row>
     <el-row>
       <el-col :span="15">
         <el-input v-model="value" :placeholder="$t('commons.input_content')"/>
@@ -41,6 +46,12 @@
           default() {
             return this.$t('commons.title')
           }
+        },
+        withTip: {
+          type: Boolean,
+          default() {
+            return false
+          }
         }
       },
       methods: {
@@ -80,5 +91,9 @@
     font-weight: bold;
   }
 
+  .tip {
+    margin-bottom: 20px;
+    color: red;
+  }
 
 </style>

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -137,7 +137,9 @@
 
     <test-report-template-list @openReport="openReport" ref="testReportTemplateList"/>
     <test-case-report-view @refresh="initTableData" ref="testCaseReportView"/>
-    <ms-delete-confirm :title="$t('test_track.plan.plan_delete')" @delete="_handleDelete" ref="deleteConfirm"/>
+    <ms-delete-confirm :title="$t('test_track.plan.plan_delete')" @delete="_handleDelete" ref="deleteConfirm" :with-tip="enableDeleteTip">
+      {{$t('test_track.plan.plan_delete_tip')}}
+    </ms-delete-confirm>
 
   </el-card>
 </template>
@@ -171,6 +173,7 @@ export default {
   data() {
     return {
       result: {},
+      enableDeleteTip: false,
       queryPath: "/test/plan/list",
       deletePath: "/test/plan/delete",
       condition: {
@@ -249,6 +252,7 @@ export default {
       });
     },
     handleDelete(testPlan) {
+      this.enableDeleteTip = testPlan.status === 'Underway' ? true : false;
       this.$refs.deleteConfirm.open(testPlan);
     },
     _handleDelete(testPlan) {

frontend/src/i18n/en-US.js

@@ -837,6 +837,7 @@ export default {
       actual_start_time: "Actual Start Time",
       actual_end_time: "Actual End Time",
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
+      plan_delete_tip: "The test plan is under way, please confirm and delete it!",
       plan_delete: "Delete test plan",
     },
     review: {

frontend/src/i18n/zh-CN.js

@@ -470,7 +470,7 @@ export default {
       title: "jar包管理",
       jar_file: "jar包",
       delete_tip: "删除需重启服务后生效",
-      file_exist: "该项目下已存在改jar包",
+      file_exist: "该项目下已存在该jar包",
       upload_limit_size: "上传文件大小不能超过 30MB!",
     },
     environment: {
@@ -839,6 +839,7 @@ export default {
       actual_start_time: "实际开始",
       actual_end_time: "实际结束",
       plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
+      plan_delete_tip: "该测试计划正在进行中，请确认再删除！",
       plan_delete: "删除计划",
     },
     review: {

frontend/src/i18n/zh-TW.js

@@ -472,7 +472,7 @@ export default {
       title: "jar包管理",
       jar_file: "jar包",
       delete_tip: "刪除需重啟服務後生效",
-      file_exist: "該項目下已存在改jar包",
+      file_exist: "該項目下已存在該jar包",
       upload_limit_size: "上傳文件大小不能超過 30MB!",
     },
     environment: {
@@ -840,6 +840,7 @@ export default {
       actual_start_time: "實際開始",
       actual_end_time: "實際結束",
       plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
+      plan_delete_tip: "該測試計劃正在進行中，請確認再刪除！",
       plan_delete: "刪除計劃",
     },
     review: {