From 7901950a0dcede209e67484864bf88c5ab532e79 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 3 Feb 2023 19:47:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E8=AF=AD=E5=A2=83=E4=B8=8B=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=AF=BC=E5=85=A5=E7=94=A8=E4=BE=8B=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/listener/TestCaseNoModelDataListener.java    | 10 ++++++++--
 .../comonents/functional/FunctionalTestCaseList.vue    |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
index f760190f96..2384c63815 100644
--- a/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
+++ b/test-track/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
@@ -402,6 +402,12 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
             if (TestCaseImportFiled.MAINTAINER.getFiledLangMap().containsValue(fieldName.replace("(ID)", StringUtils.EMPTY))) {
                 fieldName = TestCaseImportFiled.MAINTAINER.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE); // 兼容旧模板的 责任人(ID)
             }
+            if (TestCaseImportFiled.PRIORITY.getFiledLangMap().containsValue(fieldName)) {
+                fieldName = TestCaseImportFiled.PRIORITY.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE);
+            }
+            if (TestCaseImportFiled.STATUS.getFiledLangMap().containsValue(fieldName)) {
+                fieldName = TestCaseImportFiled.STATUS.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE);
+            }
             CustomFieldDao customField = customFieldsMap.get(fieldName);
             if (customField == null) {
                 continue;
@@ -420,9 +426,9 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
                 stringBuilder.append(e.getMessage().concat(ERROR_MSG_SEPARATOR));
             }
             if (StringUtils.equals(fieldName, TestCaseImportFiled.STATUS.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE))) {
-                data.setStatus(customData.get(fieldName).toString());
+                data.setStatus(customData.get(originFieldName).toString());
             } else if (StringUtils.equals(fieldName, TestCaseImportFiled.PRIORITY.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE))) {
-                data.setPriority(customData.get(fieldName).toString());
+                data.setPriority(customData.get(originFieldName).toString());
             } else if (StringUtils.equals(fieldName, TestCaseImportFiled.MAINTAINER.getFiledLangMap().get(Locale.SIMPLIFIED_CHINESE))) {
                 data.setMaintainer(customData.get(originFieldName).toString());
             }
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 02f2e8c1dc..d5baac2197 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -314,7 +314,7 @@ import TestPlanCaseIssueItem from "@/business/plan/view/comonents/functional/Tes
 import {
   getProjectMemberOption,
   getProjectVersions,
-  getAdvSearchCustomField
+  getAdvSearchCustomField, parseTag
 } from "@/business/utils/sdk-utils";
 import {
   testPlanTestCaseBatchDelete,
@@ -628,13 +628,14 @@ export default {
             this.total = r.data.itemCount;
             this.pageCount = Math.ceil(this.total / this.pageSize);
             this.tableData = r.data.listObject;
+            parseTag(this.tableData);
             parseCustomFilesForList(this.tableData);
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i]) {
                 if (this.tableData[i].customFields) {
                   this.tableData[i].customFields = JSON.parse(this.tableData[i].customFields);
                 }
-                this.$set(this.tableData[i], "showTags", JSON.parse(this.tableData[i].tags));
+                this.$set(this.tableData[i], "showTags", this.tableData[i].tags);
                 this.$set(this.tableData[i], "issuesSize", this.tableData[i].issuesCount);
                 this.$set(this.tableData[i], "hasLoadIssue", false);
                 this.$set(this.tableData[i], "issuesContent", []);