diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index e86d9a5601..0ed3d739cd 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -391,9 +391,12 @@ public class ApiDefinitionService {
                 if (apiTestCase.getName().length() > 255) {
                     apiTestCase.setName(apiTestCase.getName().substring(0, 255));
                 }
-                if (!isInsert) {
+               /* if (!isInsert) {
                     apiTestCase.setName(apiTestCase.getName() + "_" + apiTestCase.getId().substring(0, 5));
-                }
+                }*/
+                ApiTestCaseExample example = new ApiTestCaseExample();
+                example.createCriteria().andApiDefinitionIdEqualTo(apiDefinition.getId());
+                apiTestCaseMapper.deleteByExample(example);
                 apiTestCaseMapper.insert(apiTestCase);
             }
         } catch (Exception e) {
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 1d88e26b71..33a1ad6dd4 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -109,9 +109,7 @@
         </template>
         <el-table-column fixed="right" :label="$t('commons.operating')" width="190px" v-if="!referenced">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="{row}">
             <div v-if="trashEnable">
@@ -193,10 +191,12 @@
     getSelectDataCounts,
     setUnSelectIds, toggleAllSelection
   } from "@/common/js/tableUtils";
+  import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
   export default {
     name: "MsApiScenarioList",
     components: {
+      HeaderLabelOperate,
       HeaderCustom,
       BatchMove,
       EnvironmentSelect,
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index b70ca19242..274fa56e84 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -98,9 +98,7 @@
         <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130"
                          align="center">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleTestCase(scope.row)"
@@ -164,10 +162,12 @@ import {_filter, _handleSelect, _handleSelectAll, _sort, getLabel,} from "@/comm
 import {API_CASE_LIST, API_LIST, API_SCENARIO_LIST, TEST_CASE_LIST} from "@/common/js/constants";
 import {Api_Case_List, Api_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "ApiCaseSimpleList",
   components: {
+    HeaderLabelOperate,
     ApiListContainerWithDoc,
     HeaderCustom,
     MsTableHeaderSelectPopover,
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 9de7672e5a..99e700dd5f 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -160,13 +160,13 @@
             :key="index"/>
         </template>
 
-        <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="180"
+        <el-table-column fixed="right" v-if="!isReadOnly" min-width="180"
                          align="center">
+
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
+
           <template v-slot:default="scope">
             <ms-table-operator-button class="run-button" :is-tester-permission="true"
                                       :tip="$t('api_test.automation.execute')"
@@ -243,11 +243,13 @@ import {
 import {_filter, _sort} from "@/common/js/tableUtils";
 import {Api_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 
 export default {
   name: "ApiList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     CaseBatchMove,
     ApiStatus,
diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index 043234d129..2b4cf51471 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -49,6 +49,8 @@ export default {
         props: JSON.stringify(this.fieldSelected)
       }
       this.$post("/system/save/header", param, response => {
+        console.log(this.optionalFields)
+        console.log(this.fieldSelected)
         this.$success(this.$t("commons.save_success"));
         this.dialogTableVisible = false
         this.initTableData()
diff --git a/frontend/src/business/components/common/head/HeaderLabelOperate.vue b/frontend/src/business/components/common/head/HeaderLabelOperate.vue
new file mode 100644
index 0000000000..66c9f275fd
--- /dev/null
+++ b/frontend/src/business/components/common/head/HeaderLabelOperate.vue
@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <template>
+            <span>{{ $t('commons.operating') }}
+             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
+            </span>
+    </template>
+  </div>
+
+</template>
+
+<script>
+export default {
+  name: "HeaderLabelOperate",
+  methods: {
+    customHeader() {
+      this.$emit('exec')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index e5f891f255..e701c39169 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -163,9 +163,7 @@
         </template>
         <el-table-column fixed="right" min-width="150">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
@@ -231,10 +229,12 @@ import BatchMove from "./BatchMove";
 import {Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import i18n from "@/i18n/i18n";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "TestCaseList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     BatchMove,
     MsTableHeaderSelectPopover,
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 6bd88ecb32..d0905a2a10 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -139,9 +139,7 @@
         min-width="150"
         :label="$t('commons.operating')">
         <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+          <header-label-operate @exec="customHeader"/>
         </template>
         <template v-slot:default="scope">
           <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
@@ -205,11 +203,13 @@ import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
 import {TEST_CASE_LIST, TEST_PLAN_LIST} from "@/common/js/constants";
 import {Test_Plan_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 
 export default {
   name: "TestPlanList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     MsDeleteConfirm,
     TestCaseReportView,
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 685d3f6aaf..98ffc7eb4c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -106,9 +106,7 @@
         </template>
         <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" align="center">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator-button class="run-button" :is-tester-permission="true" :tip="$t('api_test.run')"
@@ -162,11 +160,13 @@ import {TEST_CASE_LIST, TEST_PLAN_API_CASE, WORKSPACE_ID} from "@/common/js/cons
 import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import {Test_Plan_Api_Case, Track_Test_Case} from "@/business/components/common/model/JsonData";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 
 export default {
   name: "TestPlanApiCaseList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     TestPlanApiCaseResult,
     MsRun,
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index d5e51c5d58..b803dc8bc0 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -67,9 +67,7 @@
         </template>
         <el-table-column :label="$t('commons.operating')" width="200px" v-if="!referenced">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="{row}">
             <ms-table-operator-button class="run-button" :is-tester-permission="true" :tip="$t('api_test.run')"
@@ -111,10 +109,12 @@ import MsTableOperatorButton from "../../../../../common/components/MsTableOpera
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import {TEST_CASE_LIST, TEST_PLAN_SCENARIO_CASE} from "@/common/js/constants";
 import {Test_Plan_Scenario_Case, Track_Test_Case} from "@/business/components/common/model/JsonData";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "MsTestPlanApiScenarioList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     MsTableOperatorButton,
     TestPlanScenarioListHeader,
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index ad55a6bc81..31a32b357a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -228,9 +228,7 @@
           min-width="100"
           :label="$t('commons.operating')">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit"
@@ -292,11 +290,13 @@ import MsTag from "@/business/components/common/components/MsTag";
 import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import {Test_Plan_Function_Test_Case} from "@/business/components/common/model/JsonData";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 
 export default {
   name: "FunctionalTestCaseList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     FunctionalTestCaseEdit,
     MsTableOperatorButton,
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index 680c326738..f379e025e6 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -102,9 +102,7 @@
         </template>
         <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" align="center">
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator-button class="run-button" :is-tester-permission="true" :tip="$t('api_test.run')"
@@ -138,10 +136,12 @@ import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import {TEST_CASE_LIST, TEST_PLAN_LOAD_CASE} from "@/common/js/constants";
 import {Test_Plan_Load_Case, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import {getCurrentUser} from "@/common/js/utils";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "TestPlanLoadCaseList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     LoadCaseReport,
     TestPlanLoadCaseListHeader,
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 03e242c2f8..574994c017 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -84,9 +84,7 @@
         min-width="100"
         :label="$t('commons.operating')">
         <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+          <header-label-operate @exec="customHeader"/>
         </template>
         <template v-slot:default="scope">
           <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
@@ -123,10 +121,12 @@ import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableIte
 import {Test_Case_Review} from "@/business/components/common/model/JsonData";
 import {TEST_CASE_LIST, TEST_CASE_REVIEW_LIST} from "@/common/js/constants";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "TestCaseReviewList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     MsDeleteConfirm,
     MsTableOperator,
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 77350bb0d6..57146429a0 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -153,9 +153,7 @@
           :label="$t('commons.operating')"
         >
           <template slot="header">
-            <span>{{ $t('commons.operating') }}
-             <i class='el-icon-setting' style="color:#7834c1; margin-left:10px" @click="customHeader"> </i>
-            </span>
+            <header-label-operate @exec="customHeader"/>
           </template>
           <template v-slot:default="scope">
             <ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit"
@@ -215,10 +213,12 @@ import ReviewStatus from "@/business/components/track/case/components/ReviewStat
 import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import {Test_Case_Review_Case_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
+import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 
 export default {
   name: "TestReviewTestCaseList",
   components: {
+    HeaderLabelOperate,
     HeaderCustom,
     MsTableOperatorButton, MsTableOperator, MethodTableItem, TypeTableItem,
     StatusTableItem, PriorityTableItem, StatusEdit,