From cef9219504e00728369c7a9aae00bcab98fdaf83 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 22 Oct 2021 18:46:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0-=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.没有button 已补
2.我创建 filter 过滤
3.仪表盘字段对应
4.状态刷新不变
5.测试计划加项目的显示
---
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml    | 3 ++-
 .../src/business/components/common/head/HeaderTopMenus.vue  | 2 +-
 frontend/src/common/js/constants.js                         | 6 ++++++
 frontend/src/common/js/default-table-header.js              | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 07b26b05ee..5d76be7f82 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -176,10 +176,11 @@
             test_case.other_test_name, test_case.review_status, test_case.tags,
             test_case.demand_id, test_case.demand_name, test_case.`status`,
             test_case.custom_num, test_case.step_model, test_case.create_user,u.name as createName,
-            test_case.custom_fields
+            test_case.custom_fields, project.name as projectName
         </if>
         from test_case left join user u on test_case.create_user=u.id
         left join user deleteUser on test_case.delete_user_id=deleteUser.id
+        left join project project on test_case.project_id = project.id
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index c0f51f98ca..d68a1dfc9d 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -8,7 +8,7 @@
            @select="handleSelect"
            :key="menuKey"
            router>
-    <el-menu-item index="/workstation" v-xpack onselectstart="return false"
+    <el-menu-item index="/workstation"  onselectstart="return false"
                   v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']">
       {{ $t('commons.my_workstation') }}
     </el-menu-item>
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index 84f6324feb..c641a4eb90 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -186,3 +186,9 @@ export const CONFIG_TYPE = {
   NORMAL: "NORMAL",
   ABNORMAL: "ABNORMAL"
 }
+
+export const WORKSTATION={
+  UPCOMING:"upcoming",
+  FOCUS:"focus",
+}
+
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 129b91d3fc..6b0637e1a9 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -78,6 +78,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'lastResult', key: 'a', label: 'api_test.automation.last_result'},
     {id: 'passRate', key: 'b', label: 'api_test.automation.passing_rate'},
     {id: 'createTime', key: 'c', label: 'commons.create_time'},
+    {id: 'projectName', key: 'd', label: 'commons.project'},
   ],
   //用例评审
   TEST_CASE_REVIEW: [
@@ -172,6 +173,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'updateTime', key: '6', label: 'api_test.automation.update_time'},
     {id: 'createTime', key: 'b', label: 'commons.create_time'},
     {id: 'lastResult', key: 'c', label: 'api_test.automation.last_result'},
+    {id: 'projectName', key: 'd', label: 'commons.project'},
   ],
   //测试用例
   TRACK_TEST_CASE: [
@@ -185,6 +187,8 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'createTime', key: '8', label: 'commons.create_time'},
     {id: 'desc', key: '9', label: 'test_track.case.case_desc'},
     {id: 'status', key: '10', label: 'api_test.definition.api_case_status'},
+    {id: 'projectName', key: 'c', label: 'commons.project'},
+    {id: 'caseStatus', key: 'd', label: 'commons.status'},
   ],
   //缺陷列表
   ISSUE_LIST: [