From ea9a2cef59a9637795950c98af6d16b6013c173c Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 25 Sep 2020 17:16:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:switch=E9=A2=9C=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsScheduleEdit.vue       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 526a04dc30..3a353d207f 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -63,10 +63,10 @@
                 >
                   <template v-slot:default="{row}">
                     <el-switch
-                      v-model="row.enable"
-                      active-value="true"
-                      inactive-value="false"
-                      inactive-color="#ff4949"
+                            v-model="row.enable"
+                            active-value="true"
+                            inactive-value="false"
+                            inactive-color="#DCDFE6"
                     />
                   </template>
                 </el-table-column>

From dac8ef1e48d6080fa27b0fdf4d373ef7b0d6d12e Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 25 Sep 2020 17:17:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=89=20Ctrl+S?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes 481
---
 .../components/api/head/ApiHeaderMenus.vue     |  4 ++++
 .../components/api/test/ApiTestConfig.vue      | 18 ++++++++++++++++--
 .../head/PerformanceHeaderMenus.vue            |  4 ++++
 .../components/track/head/TrackHeaderMenus.vue |  4 ++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 9748c38f50..1bc88dc6b9 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/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();
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index d0284773cb..87215775a1 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/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>
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index 4590a5638a..5d56c24562 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/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();
diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 341bb490bd..fe47829171 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/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();