From fe1e27bc9e193c45b678d8bf79906b8cc4085ad0 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 16 Feb 2022 11:42:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8D=E7=A7=B0=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/report/ApiReportViewHeader.vue         | 2 +-
 .../common/components/report/MsRenameReportDialog.vue     | 5 +++++
 .../track/case/components/TestCaseEditOtherInfo.vue       | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
index 45821ea126..2982a56727 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col>
         <span v-if="!debug">
-          <el-input v-if="nameIsEdit" size="mini" @blur="handleSave(report.name)" style="width: 200px" v-model="report.name"/>
+          <el-input v-if="nameIsEdit" size="mini" @blur="handleSave(report.name)" style="width: 200px" v-model="report.name" maxlength="60" show-word-limit/>
           <span v-else>
             <router-link v-if="isSingleScenario" :to="{name: 'ApiAutomation', params: { dataSelectRange: 'edit:' + scenarioId }}">
               {{ report.name }}
diff --git a/frontend/src/business/components/common/components/report/MsRenameReportDialog.vue b/frontend/src/business/components/common/components/report/MsRenameReportDialog.vue
index 624a892d96..10245f0fe2 100644
--- a/frontend/src/business/components/common/components/report/MsRenameReportDialog.vue
+++ b/frontend/src/business/components/common/components/report/MsRenameReportDialog.vue
@@ -4,6 +4,7 @@
     :visible.sync="dialogVisible"
     width="40%"
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
     :before-close="close">
     <el-form>
       <el-form-item :label="$t('commons.name')">
@@ -33,6 +34,10 @@ export default {
       this.data = JSON.parse(JSON.stringify(data));
     },
     submit() {
+      if (!this.data.name) {
+        this.$error(this.$t("commons.name") + this.$t("commons.cannot_be_null"));
+        return;
+      }
       this.$emit('submit', this.data);
     },
     close() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index 5c664376aa..be57719f40 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -14,7 +14,7 @@
         <el-form-item :label="$t('test_track.related_requirements')" :label-width="labelWidth"
                       prop="demandId">
 
-          <el-cascader v-model="demandValue" :show-all-levels="false" :options="demandOptions" clearable filterable/>
+          <el-cascader v-model="demandValue" :show-all-levels="false" :options="demandOptions" clearable filterable :filter-method="filterDemand"/>
         </el-form-item>
       </el-col>
       <el-col :span="7">
@@ -310,6 +310,12 @@ export default {
         }
         pathArray.pop();
       });
+    },
+    filterDemand(node, keyword) {
+      if (keyword && node.text.toLowerCase().indexOf(keyword.toLowerCase()) !== -1) {
+        return true;
+      }
+      return false;
     }
   }
 };