Merge remote-tracking branch 'origin/master'

frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue

@@ -194,7 +194,7 @@
         this.$emit('batchEditCase');
       },
       deleteCase(index, row) {
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
+        this.$alert(this.$t('api_test.definition.request.delete_case_confirm') + ' ' + row.name + " ？", '', {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
@@ -305,10 +305,6 @@
           row.id = data.id;
           row.createTime = data.createTime;
           row.updateTime = data.updateTime;
-          if (!row.message) {
-            this.$success(this.$t('commons.save_success'));
-            this.$emit('refresh');
-          }
         });
       },
       saveTestCase(row) {
@@ -317,7 +313,6 @@
         } else {
           this.saveCase(row);
         }
-
       },
       showInput(row) {
         // row.type = "create";

frontend/src/business/components/track/home/components/CaseCountCard.vue

@@ -94,8 +94,8 @@
                     <span class="default-property">
                       未通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('Pass')" target="_blank" style="color: #000000">
-                        {{trackCountData.passCount}}
+                      <el-link type="info" @click="redirectPage('UnPass')" target="_blank" style="color: #000000">
+                        {{trackCountData.unPassCount}}
                       </el-link>
                     </span>
                   </el-col>
@@ -103,8 +103,8 @@
                     <span class="main-property">
                       已通过
                       {{"\xa0\xa0"}}
-                      <el-link type="info" @click="redirectPage('UnPass')" target="_blank" style="color: #000000">
-                        {{trackCountData.unPassCount}}
+                      <el-link type="info" @click="redirectPage('Pass')" target="_blank" style="color: #000000">
+                        {{trackCountData.passCount}}
                       </el-link>
                     </span>
                   </el-col>

frontend/src/i18n/en-US.js

@@ -624,6 +624,7 @@ export default {
         res_param: "Response content",
         batch_delete: "Batch deletion",
         delete_confirm: "Confirm deletion",
+        delete_case_confirm: "Confirm case deletion",
         delete_confirm_step: "Confirm deletion step",
         assertions_rule: "Assertion rule",
         response_header: "Response header",

frontend/src/i18n/zh-CN.js

@@ -625,6 +625,7 @@ export default {
         res_param: "响应内容",
         batch_delete: "批量删除",
         delete_confirm: "确认删除接口",
+        delete_case_confirm: "确认删除用例",
         delete_confirm_step: "确认删除步骤",
         assertions_rule: "断言规则",
         response_header: "响应头",

frontend/src/i18n/zh-TW.js

@@ -624,6 +624,7 @@ export default {
         res_param: "響應內容",
         batch_delete: "批量刪除",
         delete_confirm: "確認刪除接口",
+        delete_case_confirm: "確認刪除用例",
         delete_confirm_step: "確認刪除步驟",
         assertions_rule: "斷言規則",
         response_header: "響應頭",