diff --git a/src/assets/css/components/views/setting/entitySettingForm.scss b/src/assets/css/components/views/setting/entitySettingForm.scss
index 86e14906..095e1ea3 100644
--- a/src/assets/css/components/views/setting/entitySettingForm.scss
+++ b/src/assets/css/components/views/setting/entitySettingForm.scss
@@ -218,9 +218,19 @@ $border-color-light: var(--el-border-color-light);
           padding: 15px 12px;
           margin-bottom: 10px;
 
-          .setting-type__text {
+          .setting-type__header {
             font-size: 14px;
             margin-bottom: 10px;
+            display: flex;
+            justify-content: space-between;
+
+            i {
+              height: 24px;
+              line-height: 24px;
+              color: var(--el-text-color-regular);
+              font-size: 10px;
+              cursor: pointer;
+            }
           }
         }
 
diff --git a/src/views/setting/entitySetting/EntitySettingForm.vue b/src/views/setting/entitySetting/EntitySettingForm.vue
index e0ebb017..5ca7d532 100644
--- a/src/views/setting/entitySetting/EntitySettingForm.vue
+++ b/src/views/setting/entitySetting/EntitySettingForm.vue
@@ -73,7 +73,10 @@
               </el-form>
 
               <div class="form-setting-type" v-if="showMappingType">
-                <div class="setting-type__text">{{ $t('setting.selectMappingType') }}</div>
+                <div class="setting-type__header">
+                  <div>{{ $t('setting.selectMappingType') }}</div>
+                  <i class="cn-icon cn-icon-close" @click="showMappingType=false"></i>
+                </div>
                 <el-select v-model="mappingItemType" placeholder="" @change="changeMappingType">
                   <el-option
                       v-for="obj in typeList"
@@ -85,7 +88,7 @@
               </div>
 
               <div class="block__footer">
-                <!--新增按钮-->
+                <!--新增mapping类型按钮-->
                 <el-button class="addFieldBtn" @click="addSchemaMappingItem">
                   <i class="cn-icon cn-icon-add add-field-btn"></i>
                   {{ $t('overall.add') }}
@@ -439,7 +442,7 @@ export default {
     deleteMappingItem (index, ind) {
       const currentIndex = this.editObj.schemaMappingData.data[index].index
       const obj = this.editObj.relationData.data.find(d => d.from_entity_index === currentIndex || d.to_entity_index === currentIndex)
-      if (obj) {
+      if (obj && this.editObj.schemaMappingData.data[index].list.length === 1) {
         const name = this.editObj.schemaMappingData.data[index].name
         ElMessageBox.alert(`${name}  ${this.$t('setting.deleteMappingTip')}`, this.$t('overall.tip'), {
           confirmButtonText: 'OK',