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;
     }
   }
 };