Merge remote-tracking branch 'origin/master'

frontend/src/business/components/api/automation/scenario/EditApiScenario.vue

@@ -981,8 +981,4 @@
     font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
     font-size: 13px;
   }
-
-  /deep/ .fab-item-title {
-    background-color: white !important;
-  }
 </style>

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -242,8 +242,12 @@
         this.showCasePage = true;
       },
       exportAPI() {
+        if (!this.isApiListEnable) {
+          this.$warning('用例列表暂不支持导出，请切换成接口列表');
+          return;
+        }
         let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
-        if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.length > 0) {
+        if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
           let arr = Array.from(this.$refs.apiList[0].selectRows);
           obj.data = arr;
           downloadFile("导出API.json", JSON.stringify(obj));

frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue

@@ -48,6 +48,7 @@
         </el-table-column>
 
         <el-table-column
+          sortable="custom"
           prop="path"
           :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182
+Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433