From 5c9c645016eaecf1448bb69617ea3a855786bfcb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 17 Sep 2020 21:27:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6ID=E5=90=AB=E4=B8=AD=E6=96=87=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 frontend/src/business/components/settings/system/User.vue | 1 +
 frontend/src/business/components/xpack                    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index d5b4969642..321c869938 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit d5b4969642fd8d10cc2f949d7377e0a0e5217a3a
+Subproject commit 321c869938357e8c2253e5bd86c963828664ae23
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 02ea001e4f..ee0aec578b 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -342,6 +342,7 @@
             {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
             {
               required: true,
+              pattern: '^[^\u4e00-\u9fa5]+$',
               message: this.$t('user.special_characters_are_not_supported'),
               trigger: 'blur'
             }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 0a375848d0..f2d5a342c8 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 0a375848d034d20eaf05caf11769e1c75c39235c
+Subproject commit f2d5a342c82e629f510550d5778d752bb73bf5e7

From 89e5c55add4c4085ae4036a0928c85e50d0f575d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 17 Sep 2020 21:41:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E6=8F=90=E7=BC=BA=E9=99=B7=E6=97=B6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/view/comonents/TestPlanTestCaseEdit.vue      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index 8731050c0c..3997725bc3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -490,14 +490,14 @@
         if (this.issuesSwitch) {
           let desc = this.addPLabel('[' + this.$t('test_track.plan_view.operate_step') + ']');
           let result = this.addPLabel('[' + this.$t('test_track.case.expected_results') + ']');
-          let executeResult = this.addPLabel('[' + this.$t('test_track.plan_view.actual_result') + ']');
+          let actualResult = this.addPLabel('[' + this.$t('test_track.plan_view.actual_result') + ']');
           this.testCase.steps.forEach(step => {
             let stepPrefix = this.$t('test_track.plan_view.step') + step.num + ':';
             desc += this.addPLabel(stepPrefix + (step.desc == undefined ? '' : step.desc));
             result += this.addPLabel(stepPrefix + (step.result == undefined ? '' : step.result));
-            executeResult += this.addPLabel(stepPrefix + (step.executeResult == undefined ? '' : step.executeResult));
+            actualResult += this.addPLabel(stepPrefix + (step.actualResult == undefined ? '' : step.actualResult));
           });
-          this.testCase.issues.content = desc + this.addPLabel('') + result + this.addPLabel('') + executeResult + this.addPLabel('');
+          this.testCase.issues.content = desc + this.addPLabel('') + result + this.addPLabel('') + actualResult + this.addPLabel('');
 
           this.$get("/test/case/project/" + this.testCase.caseId, res => {
             const project = res.data;