fix: 全选回收站用例生成关系图报错

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>

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>

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},'%')

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;

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit ec08189a4f2c3aebf0688f4b9798af2993002d25
+Subproject commit a58811e4dc08813267cdece3e0c24ab1136475fd

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位编码

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"

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 41c1f55d34da48de279d8e9e4675d2a735822c3a
+Subproject commit 3beb86a57a5816e94d3b93ed7b9b7f465832a70f

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 {

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'},
   ],