From 9a3654a4308c4f6bc6b3039d652dc724ece256a3 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 27 Oct 2021 19:23:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E9=80=89=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=AB=99=E7=94=A8=E4=BE=8B=E7=94=9F=E6=88=90=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtApiDefinitionMapper.xml     |  5 +++
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |  5 +++
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  4 ++
 .../controller/request/BaseQueryRequest.java  |  5 +++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../components/common/chart/MsChart.vue       | 41 +++++++++++++++----
 .../track/case/components/TestCaseList.vue    | 16 ++++----
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/common/js/chart.js               |  3 +-
 .../src/common/js/default-table-header.js     |  2 +-
 10 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index b183529c9f..d23450d08b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -624,6 +624,11 @@
             <if test="request.protocol != null">
                 AND api_definition.protocol = #{request.protocol}
             </if>
+
+            <if test="request.notEqStatus != null">
+                and (api_definition.status is null or api_definition.status != #{request.notEqStatus})
+            </if>
+
             <if test="request.id != null">
                 AND api_definition.id = #{request.id}
             </if>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 08188d2150..9756080b7b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -183,6 +183,11 @@
                 or api_scenario.num like CONCAT('%', #{request.name},'%')
                 or api_scenario.custom_num like CONCAT('%', #{request.name},'%'))
             </if>
+
+            <if test="request.notEqStatus != null">
+                and (api_scenario.status is null or api_scenario.status != #{request.notEqStatus})
+            </if>
+
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
             </if>
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 5d76be7f82..9298dde217 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
@@ -355,6 +355,10 @@
             <if test="request.statusIsNot != null">
                 and (test_case.status is null or test_case.status != #{request.statusIsNot})
             </if>
+
+            <if test="request.notEqStatus != null">
+                and (test_case.status is null or test_case.status != #{request.notEqStatus})
+            </if>
             <if test="request.name != null">
                 and (test_case.name like CONCAT('%', #{request.name},'%')
                 or test_case.num like CONCAT('%', #{request.name},'%')
diff --git a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
index 1b958489c1..3d6562ec28 100644
--- a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
@@ -14,6 +14,11 @@ public class BaseQueryRequest {
 
     private String name;
 
+    /**
+     * 状态不等于 notEqStatus
+     */
+    private String notEqStatus;
+
     private String workspaceId;
 
     private List<String> ids;
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ec08189a4f..a58811e4dc 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ec08189a4f2c3aebf0688f4b9798af2993002d25
+Subproject commit a58811e4dc08813267cdece3e0c24ab1136475fd
diff --git a/frontend/src/business/components/common/chart/MsChart.vue b/frontend/src/business/components/common/chart/MsChart.vue
index 627a1ec7fa..fdf05f5c33 100644
--- a/frontend/src/business/components/common/chart/MsChart.vue
+++ b/frontend/src/business/components/common/chart/MsChart.vue
@@ -1,6 +1,6 @@
 <template>
   <chart
-    :style="{'height': height + 'px'}"
+    :style="{'height': chartHeight, 'width': width}"
     class="ms-chart"
     :init-options="defaultInitOptions"
     :option="options"
@@ -19,25 +19,52 @@ export default {
   props: {
     options: Object,
     theme: [String, Object],
-    initOptions: Object,
+    initOptions: {
+      type: Object,
+      default() {
+        return {
+          renderer: 'canvas'
+        }
+      }
+    },
     group: String,
     autoresize: Boolean,
     watchShallow: Boolean,
     manualUpdate: Boolean,
     height: {
-      type: Number,
+      type: [Number, String],
       default() {
         return 400
       }
-    }
+    },
+    width: [Number, String],
   },
   data() {
     return {
       defaultInitOptions: this.initOptions
     };
   },
+  computed: {
+    chartHeight() {
+      if (this.height instanceof String) {
+        return this.height;
+      } else {
+        return this.height + 'px';
+      }
+    },
+    chartWidth() {
+      if (!this.width) {
+        return this.width;
+      }
+      if (this.width instanceof String) {
+        return this.width;
+      } else {
+        return this.width + 'px';
+      }
+    }
+  },
   mounted() {
-    this.defaultInitOptions = this.defaultInitOptions || {};
+    // this.defaultInitOptions = this.defaultInitOptions || {};
     // 默认渲染svg
     // BUG: 渲染svg之后 图上的legend 太多会不显示
     // if (!this.defaultInitOptions.renderer) {
@@ -49,8 +76,8 @@ export default {
       this.$emit('onClick', params.data);
     },
     exportCharts(fileName, type) {
-      if (document.getElementById('chartsShow')) {
-        let chartsCanvas = document.getElementById('chartsShow').querySelectorAll('canvas')[0];
+      if (document.getElementsByClassName('ms-chart')) {
+        let chartsCanvas = document.getElementsByClassName('ms-chart')[0].querySelectorAll('canvas')[0];
         let mime = 'image/png';
         if (chartsCanvas) {
           // toDataURL()是canvas对象的一种方法，用于将canvas对象转换为base64位编码
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 727eafbf67..85a4b092ca 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -146,14 +146,14 @@
           </template>
         </ms-table-column >
 
-         <ms-table-column
-           prop="status"
-           :filters="statusFilters"
-           :field="item"
-           :fields-width="fieldsWidth"
-           min-width="100px"
-           :label="$t('api_test.definition.api_case_status')">
-        </ms-table-column>
+<!--         <ms-table-column-->
+<!--           prop="status"-->
+<!--           :filters="statusFilters"-->
+<!--           :field="item"-->
+<!--           :fields-width="fieldsWidth"-->
+<!--           min-width="100px"-->
+<!--           :label="$t('api_test.definition.api_case_status')">-->
+<!--        </ms-table-column>-->
 
         <ms-table-column v-for="field in testCaseTemplate.customFields" :key="field.id"
                          :filters="field.name === '用例等级' ? priorityFilters : null"
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 41c1f55d34..3beb86a57a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 41c1f55d34da48de279d8e9e4675d2a735822c3a
+Subproject commit 3beb86a57a5816e94d3b93ed7b9b7f465832a70f
diff --git a/frontend/src/common/js/chart.js b/frontend/src/common/js/chart.js
index 0b012c5af5..bae1b1041f 100644
--- a/frontend/src/common/js/chart.js
+++ b/frontend/src/common/js/chart.js
@@ -8,7 +8,8 @@ import 'echarts/lib/component/title'
 import 'echarts/lib/component/toolbox';
 import 'echarts/lib/component/dataZoom';
 import 'echarts/lib/component/legend';
-import 'zrender/lib/svg/svg'
+import 'zrender/lib/svg/svg' // initOption 支持使用svg
+import 'zrender/lib/canvas/canvas'  // initOption 支持使用canvas
 import 'echarts/lib/component/grid'
 
 export default {
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 1108e250d1..6318680acf 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -186,7 +186,7 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'createUser', key: '7', label: 'commons.create_user'},
     {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: 'status', key: 'a', label: 'api_test.definition.api_case_status'},
     {id: 'projectName', key: 'c', label: 'commons.project'},
     {id: 'caseStatus', key: 'd', label: 'commons.status'},
   ],