From a363074c16e4c09f26f991d8e6a1283668b27610 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 18 Sep 2020 14:56:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsScheduleConfig.vue    | 153 ++++++++++--------
 1 file changed, 86 insertions(+), 67 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue
index fe55e28700..e78c3f3a38 100644
--- a/frontend/src/business/components/common/components/MsScheduleConfig.vue
+++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue
@@ -6,7 +6,8 @@
           <span class="character">SCHEDULER</span>
         </span>
       <el-switch :disabled="!schedule.value || isReadOnly" v-model="schedule.enable" @change="scheduleChange"/>
-      <ms-schedule-edit :is-read-only="isReadOnly" :schedule="schedule" :test-id="testId" :save="save" :custom-validate="customValidate"
+      <ms-schedule-edit :is-read-only="isReadOnly" :schedule="schedule" :test-id="testId" :save="save"
+                        :custom-validate="customValidate"
                         ref="scheduleEdit"/>
 
     </div>
@@ -22,90 +23,108 @@
 </template>
 
 <script>
-import MsScheduleEdit from "./MsScheduleEdit";
-import CrontabResult from "../cron/CrontabResult";
+  import MsScheduleEdit from "./MsScheduleEdit";
+  import CrontabResult from "../cron/CrontabResult";
 
-function defaultCustomValidate() {
-  return {pass: true};
-}
+  function defaultCustomValidate() {
+    return {pass: true};
+  }
 
-export default {
-  name: "MsScheduleConfig",
-  components: {CrontabResult, MsScheduleEdit},
-  data() {
-    return {
-      recentList: [],
-    }
-  },
-  props: {
-    testId:String,
-    save: Function,
-    schedule: {},
-    checkOpen: {
-      type: Function,
-      default() {
-        return {
-          checkOpen() {
-            return true;
+  export default {
+    name: "MsScheduleConfig",
+    components: {CrontabResult, MsScheduleEdit},
+    data() {
+      return {
+        recentList: [],
+        refreshScheduler: null,
+      }
+    },
+    props: {
+      testId: String,
+      save: Function,
+      schedule: {},
+      checkOpen: {
+        type: Function,
+        default() {
+          return {
+            checkOpen() {
+              return true;
+            }
           }
         }
+      },
+      customValidate: {
+        type: Function,
+        default: defaultCustomValidate
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      }
+    },
+    methods: {
+      scheduleEdit() {
+        if (!this.checkOpen()) {
+          return;
+        }
+        this.$refs.scheduleEdit.open();
+      },
+      scheduleChange() {
+        this.$emit('scheduleChange');
+      },
+      flashResultList() {
+        this.$refs.crontabResult.expressionChange();
+      },
+      cancelRefresh() {
+        if (this.refreshScheduler) {
+          clearInterval(this.refreshScheduler);
+        }
       }
     },
-    customValidate: {
-      type: Function,
-      default: defaultCustomValidate
+    beforeDestroy() {
+      this.cancelRefresh();
     },
-    isReadOnly: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    scheduleEdit() {
-      if (!this.checkOpen()) {
-        return;
+    watch: {
+      schedule() {
+        if (this.schedule.enable) {
+          this.refreshScheduler = setInterval(this.flashResultList, 2000);
+        } else {
+          this.cancelRefresh();
+        }
       }
-      this.$refs.scheduleEdit.open();
-    },
-    scheduleChange() {
-      this.$emit('scheduleChange');
-    },
-    flashResultList() {
-      this.$refs.crontabResult.expressionChange();
     }
   }
-}
 </script>
 
 <style scoped>
 
-.schedule-config {
-  float: right;
-  width: 250px;
-  height: 15px;
-  line-height: 25px;
-}
+  .schedule-config {
+    float: right;
+    width: 250px;
+    height: 15px;
+    line-height: 25px;
+  }
 
-.el-icon-date {
-  font-size: 20px;
-  margin-left: 5px;
-}
+  .el-icon-date {
+    font-size: 20px;
+    margin-left: 5px;
+  }
 
-.character {
-  font-weight: bold;
-  margin: 0 5px;
-}
+  .character {
+    font-weight: bold;
+    margin: 0 5px;
+  }
 
-.disable-character {
-  color: #cccccc;
-}
+  .disable-character {
+    color: #cccccc;
+  }
 
-.el-switch {
-  margin: 0 5px;
-}
+  .el-switch {
+    margin: 0 5px;
+  }
 
-.cron-ico {
-  cursor: pointer;
-}
+  .cron-ico {
+    cursor: pointer;
+  }
 
 </style>

From 1786fb23ec6a3e396ebd6f9cd25978c68c813f14 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Sep 2020 15:12:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(XPack):=20=E5=90=88=E5=B9=B6=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E7=9A=84I18n=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/i18n/messages_en_US.properties | 3 ++-
 backend/src/main/resources/i18n/messages_zh_CN.properties | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index a9be69b2aa..145e7904ab 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -154,4 +154,5 @@ quota_duration_excess_organization=The stress test duration exceeds the organiza
 
 email_subject=Metersphere timing task result notification
 import_xmind_count_error=The number of use cases imported into the mind map cannot exceed 500
-import_xmind_not_found=Test case not found
\ No newline at end of file
+import_xmind_not_found=Test case not found
+license_valid_license_error=Authorization authentication failed
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 87ed767fb7..7836a2ba48 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -153,6 +153,7 @@ quota_duration_excess_workspace=压测时长超过工作空间限额
 quota_duration_excess_organization=压测时长超过组织限额
 email_subject=MeterSphere定时任务结果通知
 import_xmind_count_error=思维导图导入用例数量不能超过 500 条
+license_valid_license_error=授权认证失败
 import_xmind_not_found=未找到测试用例
 
 

From ae8bf4dc403df7f9fba2123d6643c316ffdd8e04 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Fri, 18 Sep 2020 15:12:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=80=BB=E8=BE=91=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=99=A8=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=97=A0=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/test/model/ScenarioModel.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index cb669f3477..f7a825b42a 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -856,7 +856,7 @@ export class Controller extends BaseConfig {
     super();
     this.type = type
     options.id = options.id || uuid();
-    options.enable = options.enable || true;
+    options.enable = options.enable === undefined ? true : options.enable;
   }
 }
 
@@ -894,7 +894,7 @@ export class Timer extends BaseConfig {
     super();
     this.type = type;
     options.id = options.id || uuid();
-    options.enable = options.enable || true;
+    options.enable = options.enable === undefined ? true : options.enable;
   }
 }