Merge remote-tracking branch 'origin/master'

frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue

@@ -210,7 +210,7 @@ export default {
       });
     },
     editTestReview(param) {
-      this.$post('/test/case/review/' + this.operationType, param, () => {
+      this.result = this.$post('/test/case/review/' + this.operationType, param, () => {
         this.$success(this.$t('commons.save_success'));
         this.dialogFormVisible = false;
         this.$emit("refresh");

frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue

@@ -166,7 +166,7 @@
                               type="textarea"
                               :autosize="{ minRows: 2, maxRows: 4}"
                               :rows="2"
-                              :disabled="isReadOnly"
+                              :disabled="true"
                               v-model="scope.row.actualResult"
                               :placeholder="$t('commons.input_content')"
                               clearable/>
@@ -175,7 +175,7 @@
                         <el-table-column :label="$t('test_track.plan_view.step_result')" min-width="12%">
                           <template v-slot:default="scope">
                             <el-select
-                              :disabled="isReadOnly"
+                              :disabled="true"
                               v-model="scope.row.executeResult"
                               @change="stepResultChange()"
                               size="mini">

frontend/src/i18n/en-US.js

@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: 'Email format is incorrect',
     delete_confirm: 'Are you sure you want to delete this User?',
     apikey_delete_confirm: 'Are you sure you want to delete this API Key?',
-    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)',
+    input_id_placeholder: 'Please enter ID (Chinese characters are not supported)',
     source: 'Source'
   },
   role: {

frontend/src/i18n/zh-CN.js

@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: '邮箱格式不正确',
     delete_confirm: '这个用户确定要删除吗?',
     apikey_delete_confirm: '这个 API Key 确定要删除吗?',
-    input_id_placeholder: '请输入ID (只支持数字、英文字母)',
+    input_id_placeholder: '请输入ID (不支持中文)',
     source: '用户来源'
   },
   role: {

frontend/src/i18n/zh-TW.js

@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: '郵箱格式不正確',
     delete_confirm: '這個用戶確定要刪除嗎?',
     apikey_delete_confirm: '這個 API Key 確定要刪除嗎?',
-    input_id_placeholder: '請輸入ID (只支持數字、英文字母)',
+    input_id_placeholder: '請輸入ID (不支持中文字符)',
     source: '用戶來源'
   },
   role: {