From a8dcee4f145f0f993c1b131916452dc1420c2684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?=
 <liuhonghong@geedgenetworks.com>
Date: Tue, 19 Nov 2024 14:26:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81entity=20setting=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=A0=E5=B0=84=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4=E8=AF=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=9B2=E3=80=81mapping=E5=92=8Crelation=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=88=A0=E9=99=A4mapping?=
 =?UTF-8?q?=E5=88=B0=E6=9C=80=E5=90=8E=E4=B8=80=E6=9D=A1=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/setting/entitySettingForm.scss  | 12 +++++++++++-
 .../setting/entitySetting/EntitySettingForm.vue      |  9 ++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

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',