fix: 1、创建source去掉lookups必填验证；2、entity setting的mapping添加tags字段

4 files changed, 22 insertions, 17 deletions

diff --git a/src/assets/css/components/components/layout/layout.scss b/src/assets/css/components/components/layout/layout.scss
index 6c1ef516..40870b27 100644
--- a/src/assets/css/components/components/layout/layout.scss
+++ b/src/assets/css/components/components/layout/layout.scss
@@ -88,7 +88,7 @@
       }
       .cn-menu__left {
         flex: 1;
-        padding: 12px 10px 10px 20px;
+        padding: 12px 0 10px 20px;
         max-width: 290px;
         border-right: 1px solid var(--el-border-color);
 
@@ -114,6 +114,10 @@
             padding-left: 10px;
           }
         }
+
+        .empty-menu {
+          border-top: 1px rgba(0,0,0,0) solid;
+        }
       }
       .cn-menu__middle {
         display: flex;
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index a6edf573..33dd7076 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -146,6 +146,7 @@
           <span>{{ $t(menu.i18n || menu.name) }}</span>
           <i class="cn-icon cn-icon-right" v-show="menu.code==='setting'"></i>
         </div>
+        <div class="empty-menu" @mouseleave="mouseleaveItemMenu(null)"></div>
       </div>
       <div class="cn-menu__middle" v-if="!isShowSetting">
         <div class="middle-menus middle-menus--network-analytics">
@@ -187,7 +188,7 @@
           </div>
         </div>
       </div>
-      <div class="cn-menu__middle" v-if="isShowSetting" @mouseenter="mouseleaveItemMenu('setting')" @mouseleave="mouseleaveRightMenu">
+      <div class="cn-menu__middle" v-if="isShowSetting" @mouseenter="mouseleaveItemMenu('setting')">
         <div class="middle-menus middle-menus--network-analytics">
           <div class="middle-menus__header">{{ $t('overall.setting') }}</div>
           <div class="middle-menus__body" v-if="settingMenu && settingMenu.children">
@@ -937,9 +938,6 @@ export default {
     },
     mouseleaveItemMenu (code) {
       this.isShowSetting = code === 'setting'
-    },
-    mouseleaveRightMenu () {
-      this.isShowSetting = false
     }
   }
 }
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 044908c0..20d7ac17 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -2921,19 +2921,22 @@ export const settingFields = {
     { displayName: 'IP.Admin Area', fieldName: 'ip_admin_area' },
     { displayName: 'IP.ASN', fieldName: 'ip_asn' },
     { displayName: 'IP.ISP', fieldName: 'ip_isp' },
-    { displayName: 'seen_time', fieldName: 'seen_time' }
+    { displayName: 'seen_time', fieldName: 'seen_time' },
+    { displayName: 'tags', fieldName: 'tags' }
   ],
   domain: [
     { displayName: 'Domain', fieldName: 'domain', disabled: true },
     { displayName: 'Domain.Category', fieldName: 'domain_category' },
     { displayName: 'Domain.Category Group', fieldName: 'domain_category_group' },
-    { displayName: 'seen_time', fieldName: 'seen_time' }
+    { displayName: 'seen_time', fieldName: 'seen_time' },
+    { displayName: 'tags', fieldName: 'tags' }
   ],
   app: [
     { displayName: 'Application', fieldName: 'app', disabled: true },
     { displayName: 'APP.Category', fieldName: 'app_category' },
     { displayName: 'APP.Subcategory', fieldName: 'app_subcategory' },
-    { displayName: 'seen_time', fieldName: 'seen_time' }
+    { displayName: 'seen_time', fieldName: 'seen_time' },
+    { displayName: 'tags', fieldName: 'tags' }
   ],
   subscriber: [
     { displayName: 'Subscriber ID', fieldName: 'subscriber_id', disabled: true },
@@ -2941,7 +2944,8 @@ export const settingFields = {
     { displayName: 'Subscriber.IMSI', fieldName: 'subscriber_imsi' },
     { displayName: 'Subscriber.IMEI', fieldName: 'subscriber_imei' },
     { displayName: 'Subscriber.APNs', fieldName: 'subscriber_apns' },
-    { displayName: 'seen_time', fieldName: 'seen_time' }
+    { displayName: 'seen_time', fieldName: 'seen_time' },
+    { displayName: 'tags', fieldName: 'tags' }
   ],
   cell: [
     { displayName: 'Cell ID', fieldName: 'cell_id', disabled: true },
@@ -2961,7 +2965,8 @@ export const settingFields = {
     { displayName: 'cell_longitude', fieldName: 'cell_longitude' },
     { displayName: 'cell_azimuth', fieldName: 'cell_azimuth' },
     { displayName: 'cell_fdd_spectrum', fieldName: 'cell_fdd_spectrum' },
-    { displayName: 'seen_time', fieldName: 'seen_time' }
+    { displayName: 'seen_time', fieldName: 'seen_time' },
+    { displayName: 'tags', fieldName: 'tags' }
   ]
 }
 
diff --git a/src/views/setting/sources/SourcesForm.vue b/src/views/setting/sources/SourcesForm.vue
index 0b50322f..de67a156 100644
--- a/src/views/setting/sources/SourcesForm.vue
+++ b/src/views/setting/sources/SourcesForm.vue
@@ -67,7 +67,7 @@
         </div>
       </el-form>
 
-      <div class="form__body__label"><span class="from-dot">*</span>{{ $t('setting.lookups') }}</div>
+      <div class="form__body__label">{{ $t('setting.lookups') }}</div>
       <el-form ref="lookupsForm" :model="sourceObj.lookupsData">
         <div class="form-fields__block">
           <div class="block__body">
@@ -336,17 +336,15 @@ export default {
       const valid2 = await this.$refs.fieldsForm.validate((valid) => {
         return valid
       })
-      const valid3 = await this.$refs.lookupsForm.validate((valid) => {
-        return valid
-      })
-      if (valid1 && valid2 && valid3) {
+      if (valid1 && valid2) {
         this.sourceObj.fields = JSON.stringify(this.sourceObj.fieldsData.data)
         this.sourceObj.lookups = JSON.stringify(this.sourceObj.lookupsData.data)
-        if (this.sourceObj.fieldsData.data.length === 0 && this.sourceObj.lookupsData.data.length === 0) {
+        if (this.sourceObj.fieldsData.data.length === 0 || this.sourceObj.lookupsData.data.length > 0) {
           ElMessageBox.alert(this.$t('detection.create.informationFilled'), this.$t('overall.tip'), {
             confirmButtonText: 'OK',
             callback: () => {}
           })
+          this.$refs.lookupsForm.validate(() => null)
           return true
         }
         delete this.sourceObj.enable
@@ -502,7 +500,7 @@ export default {
       lookups: [],
       // lookups列表数据
       lookupsData: {
-        data: [{ function: '', lookup_field: '', output_type: '', output_field: '' }]
+        data: []
       },
       description: ''
       // enable: 1