Merge remote-tracking branch 'origin/master'

frontend/src/business/components/api/head/ApiHeaderMenus.vue

@@ -90,6 +90,10 @@ export default {
   methods: {
     registerEvents() {
       ApiEvent.$on(LIST_CHANGE, () => {
+        // todo 这里偶尔会有 refs 为空的情况
+        if (!this.$refs.projectRecent) {
+          return;
+        }
         this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -67,7 +67,7 @@
 
 <script>
 import MsApiScenarioConfig from "./components/ApiScenarioConfig";
-import {Test, Scenario} from "./model/ScenarioModel"
+import {Scenario, Test} from "./model/ScenarioModel"
 import MsApiReportStatus from "../report/ApiReportStatus";
 import MsApiReportDialog from "./ApiReportDialog";
 import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
@@ -368,11 +368,25 @@ export default {
         this.debugReportId = response.data;
         this.resetBodyFile();
       });
-    }
+    },
+    handleEvent(event) {
+      if (event.keyCode === 83 && event.ctrlKey) {
+        console.log('拦截到 ctrl + s');//ctrl+s
+        this.saveTest();
+        event.preventDefault();
+        event.returnValue = false;
+        return false;
+      }
+    },
   },
 
   created() {
     this.init();
+    //
+    document.addEventListener('keydown', this.handleEvent)
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handleEvent);
   }
 }
 </script>

frontend/src/business/components/common/components/MsScheduleEdit.vue

@@ -63,10 +63,10 @@
                 >
                   <template v-slot:default="{row}">
                     <el-switch
-                      v-model="row.enable"
+                            v-model="row.enable"
-                      active-value="true"
+                            active-value="true"
-                      inactive-value="false"
+                            inactive-value="false"
-                      inactive-color="#ff4949"
+                            inactive-color="#DCDFE6"
                     />
                   </template>
                 </el-table-column>

frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue

@@ -98,6 +98,10 @@ export default {
   methods: {
     registerEvents() {
       PerformanceEvent.$on(LIST_CHANGE, () => {
+        // todo 这里偶尔会有 refs 为空的情况
+        if (!this.$refs.projectRecent) {
+          return;
+        }
         this.$refs.projectRecent.recent();
         this.$refs.testRecent.recent();
         this.$refs.reportRecent.recent();

frontend/src/business/components/track/head/TrackHeaderMenus.vue

@@ -150,6 +150,10 @@ export default {
     },
     registerEvents() {
       TrackEvent.$on(LIST_CHANGE, () => {
+        // todo 这里偶尔会有 refs 为空的情况
+        if (!this.$refs.projectRecent) {
+          return;
+        }
         this.$refs.projectRecent.recent();
         this.$refs.planRecent.recent();
         this.$refs.caseRecent.recent();