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

---
 .../track/request/testcase/QueryTestCaseRequest.java        | 4 ++++
 frontend/src/business/components/common/chart/MsChart.vue   | 6 +++---
 frontend/src/business/components/xpack                      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
index 0655ab22d5..2c4d0dfaa5 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java
@@ -40,6 +40,10 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private List<String> testCaseContainIds;
 
 
+    // 接口定义
+    private String protocol;
+    private String apiCaseCoverage;
+
     // 补充场景条件
     private String excludeId;
     private String moduleId;
diff --git a/frontend/src/business/components/common/chart/MsChart.vue b/frontend/src/business/components/common/chart/MsChart.vue
index fdf05f5c33..3a02f34a45 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': chartHeight, 'width': width}"
+    :style="{'height': chartHeight, 'width': chartWidth}"
     class="ms-chart"
     :init-options="defaultInitOptions"
     :option="options"
@@ -46,7 +46,7 @@ export default {
   },
   computed: {
     chartHeight() {
-      if (this.height instanceof String) {
+      if (this.height.indexOf('px') > -1 || this.height.indexOf('calc') > -1) {
         return this.height;
       } else {
         return this.height + 'px';
@@ -56,7 +56,7 @@ export default {
       if (!this.width) {
         return this.width;
       }
-      if (this.width instanceof String) {
+      if (this.width.indexOf('px') > -1 || this.width.indexOf('calc') > -1) {
         return this.width;
       } else {
         return this.width + 'px';
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2a4f0b9f53..732aba3931 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2a4f0b9f537a860b2ff9f660668eb1e36865cbc0
+Subproject commit 732aba3931ede033ab986b973bbab64a321370df