From 868c49a8ee42b4503d60c4d306dc7e3000656b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?=
 <https://liuhonghong@git.meslab.cn>
Date: Sun, 17 Nov 2024 22:52:18 +0800
Subject: [PATCH] =?UTF-8?q?CN-1734=20fix:=20Entity=20setting=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/Header.vue              |   2 -
 .../table/setting/ProfilesTable.vue           |  13 +-
 .../setting/entitySetting/EntitySetting.vue   |  34 +----
 .../entitySetting/EntitySettingForm.vue       | 124 +++++++++++-------
 src/views/setting/sources/Sources.vue         |  18 +--
 5 files changed, 81 insertions(+), 110 deletions(-)

diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index f5366821..260df967 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -364,7 +364,6 @@ export default {
   },
   computed: {
     networkAnalyticsMenu () {
-      console.log('-------', this.$store.getters.menuList)
       return this.$store.getters.menuList.find(menu => menu.code === 'networkAnalytics')
     },
     locationIntelligenceMenu () {
@@ -782,7 +781,6 @@ export default {
     },
     // 仅处理除panel外的相关路径的导航
     async jumpOther (route, index) {
-      console.log('route', route, index)
       if (route === '/setting') {
         this.isShowSetting = true
         return true
diff --git a/src/components/table/setting/ProfilesTable.vue b/src/components/table/setting/ProfilesTable.vue
index 85d8d4d6..3f97131b 100644
--- a/src/components/table/setting/ProfilesTable.vue
+++ b/src/components/table/setting/ProfilesTable.vue
@@ -33,7 +33,7 @@
         <div class="col-resize-area"></div>
       </template>
       <template #default="scope" :column="item">
-        <template v-if="item.prop === 'createdTime' || item.prop === 'updateTime'">
+        <template v-if="item.prop === 'ctime' || item.prop === 'utime'">
           <template v-if="scope.row[item.prop]">
             {{ dateFormatByAppearance(scope.row[item.prop]) || '-' }}
           </template>
@@ -94,25 +94,18 @@ export default {
         },
         {
           label: this.$t('config.user.createTime'),
-          prop: 'createTime',
+          prop: 'ctime',
           show: true,
           minWidth: 200
         },
         {
           label: this.$t('overall.updateTime'),
-          prop: 'updateTime',
+          prop: 'utime',
           show: true
         }
       ]
     }
   },
-  computed: {
-    uploadParams () {
-      return {
-        indicatorType: 'IP'
-      }
-    }
-  },
   methods: {
     dateFormatByAppearance,
     // 禁止勾选buildIn为1的项，即禁止修改、删除admin的账号
diff --git a/src/views/setting/entitySetting/EntitySetting.vue b/src/views/setting/entitySetting/EntitySetting.vue
index 085c2b2f..1efe355a 100644
--- a/src/views/setting/entitySetting/EntitySetting.vue
+++ b/src/views/setting/entitySetting/EntitySetting.vue
@@ -64,8 +64,7 @@ import dataListMixin from '@/mixins/data-list'
 import Loading from '@/components/common/Loading'
 import cnDataList from '@/components/table/CnDataList'
 import ProfilesTable from '@/components/table/setting/ProfilesTable'
-import { profilesList } from '@/utils/static-data'
-import axios from '_axios@0.21.4@axios'
+import axios from 'axios'
 
 export default {
   name: 'EntitySetting',
@@ -136,11 +135,6 @@ export default {
       }
 
       if (!this.isInit) {
-        // this.tableData = profilesList
-        // this.pageObj.total = profilesList.length
-        // this.isNoData = !this.tableData || this.tableData.length === 0
-        // this.toggleLoading(false)
-        console.log('params', this.searchLabel)
         axios.get(listUrl, { params: this.searchLabel }).then(response => {
           if (response.status === 200) {
             this.$nextTick(() => {
@@ -185,31 +179,11 @@ export default {
           type: 'warning'
         }).then(() => {
           this.toggleLoading(true)
-          axios.delete(api.setting.profiles.profiles + '?id=' + ids).then(response => {
+          axios.delete(api.setting.profiles.profiles + '?ids=' + ids).then(response => {
             if (response.status === 200) {
               this.delFlag = true
-              this.$message({
-                duration: 2000,
-                type: 'success',
-                message: this.$t('tip.deleteSuccess')
-              })
-              let params = null
-              if (this.intent) {
-                params = { intent: this.intent }
-              }
-              if (this.category) {
-                params = {
-                  ...params,
-                  category: this.category
-                }
-              }
-              if (this.name) {
-                params = {
-                  ...params,
-                  name: this.name
-                }
-              }
-              this.getTableData(params)
+              this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') })
+              this.getTableData()
             } else {
               this.$message.error(response.data.message)
             }
diff --git a/src/views/setting/entitySetting/EntitySettingForm.vue b/src/views/setting/entitySetting/EntitySettingForm.vue
index 7312d3dd..44c917b6 100644
--- a/src/views/setting/entitySetting/EntitySettingForm.vue
+++ b/src/views/setting/entitySetting/EntitySettingForm.vue
@@ -20,13 +20,13 @@
             </template>
             <div class="form-collapse-content">
               <el-form ref="sourceForm" :model="editObj" label-position="top" :rules="sourceRules">
-                <el-form-item :label="$t('setting.source')" prop="source_id" class="form-setting__block margin-b-20">
-                  <el-select v-model="editObj.source_id" class="form-setting__select" placeholder=" ">
+                <el-form-item :label="$t('setting.source')" prop="sourceId" class="form-setting__block margin-b-20">
+                  <el-select v-model="editObj.sourceId" class="form-setting__select" placeholder=" ">
                     <el-option
                         v-for="item in sourceOption"
-                        :key="item.source_id"
-                        :label="item.label"
-                        :value="item.source_id"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
                     />
                   </el-select>
                 </el-form-item>
@@ -209,7 +209,7 @@ export default {
       activeNames: ['1'],
       intervalList: [],
       sourceRules: {
-        source_id: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }]
+        sourceId: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }]
       },
       mappingRules: {
         type: [{ required: true, message: this.$t('validate.required'), trigger: 'change' }],
@@ -270,7 +270,7 @@ export default {
 
     const editObj = ref({
       id: '',
-      source_id: '',
+      sourceId: '',
       entities: [],
       schemaMappingData: {
         data: [
@@ -303,12 +303,36 @@ export default {
   methods: {
     switchStatus,
     initSourceData () {
-      this.sourceOption = [
-        { source_id: '1', value: 'ip_metric1', label: 'IP metric1' },
-        { source_id: '2', value: 'ip_metric2', label: 'IP metric2' },
-        { source_id: '3', value: 'ip_metric3', label: 'IP metric3' },
-        { source_id: '4', value: 'ip_metric4', label: 'IP metric4' }
-      ]
+      axios.get(api.setting.source.source).then(response => {
+        if (response.status === 200) {
+          if (!response.data.data) {
+            throw new Error('No data found, id: ' + this.ruleId)
+          }
+          this.sourceOption = response.data.data.list
+          if (this.sourceOption && this.sourceOption.length > 0) {
+            this.sourceOption.forEach((item, index) => {
+              if (typeof item.fields === 'string') {
+                this.sourceOption[index].fieldsList = JSON.parse(item.fields)
+              }
+              if (typeof item.lookups === 'string') {
+                this.sourceOption[index].lookupsList = JSON.parse(item.lookups)
+              }
+            })
+          }
+        } else {
+          console.error(response.data)
+        }
+      }).catch(e => {
+        console.error(e)
+        this.$message.error(this.errorMsgHandler(e))
+        this.$router.push({
+          path: '/setting/entitySetting',
+          query: {
+            pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1,
+            t: +new Date()
+          }
+        })
+      })
     },
     /** 编辑时获取详情 */
     getDetailInfo () {
@@ -318,11 +342,22 @@ export default {
             throw new Error('No data found, id: ' + this.ruleId)
           }
           this.myLoading = false
-          this.editObj = {
-            ...response.data.data,
-            ruleId: this.ruleId
+          this.editObj = { ...this.editObj, ...response.data.data, ruleId: this.ruleId }
+
+          if (this.editObj.entities && typeof this.editObj.entities === 'string') {
+            const entities = JSON.parse(this.editObj.entities)
+            entities.forEach(item => {
+              const list = []
+              for (const [key, value] of Object.entries(item.mapping)) {
+                list.push({ field: key, source: value.toString() })
+              }
+              item.list = list
+            })
+            this.editObj.schemaMappingData.data = entities
+          }
+          if (this.editObj.relations && typeof this.editObj.relations === 'string') {
+            this.editObj.relationData.data = JSON.parse(this.editObj.relations)
           }
-          this.ruleObj = this.$_.cloneDeep(this.editObj.ruleConfigObj)
           this.activeNames = ['1', '2']
         } else {
           console.error(response.data)
@@ -425,7 +460,6 @@ export default {
       } else {
         this.isCloseMappingItem = this.editObj.schemaMappingData.data[0].list.length > 1
       }
-      console.log('shuzu', this.editObj.schemaMappingData.data)
     },
     /** 删除relation的子项 **/
     deleteRelationItem (index) {
@@ -442,21 +476,16 @@ export default {
       return name
     },
     visibleFromEntity (index) {
-      console.log('visible---from', this.editObj.relationData.data, index)
     },
     changeFromEntity (index) {
-      console.log('from---data', this.editObj.relationData.data)
       this.editObj.relationData.data[index].fromDisabled = true
     },
     changeToEntity (index) {
-      console.log('to---data', this.editObj.relationData.data)
       this.editObj.relationData.data[index].toDisabled = true
     },
     handleToEntityData (index) {
-      console.log('index', index)
       if (index && index >= 0) {
-        const obj = this.editObj.relationData.data[index]
-        console.log('obj', obj)
+        // const obj = this.editObj.relationData.data[index]
       }
       return this.editObj.schemaMappingData.data
     },
@@ -497,27 +526,20 @@ export default {
       const valid3 = await this.$refs.relationForm.validate((valid) => {
         return valid
       })
-      console.log('obj', this.editObj)
-      const formObj = this.$_.cloneDeep(this.editObj)
-      formObj.schemaMappingData.data.forEach((item) => {
-        const obj = {}
-        item.list.forEach(ite => {
-          obj[ite.field] = ite.source
-        })
-        item.mapping = this.$_.cloneDeep(obj)
-      })
-      console.log('formObj', formObj)
       if (valid1 && valid2 && valid3) {
         this.myLoading = true
-        if (!this.ruleId) {
-          const formObj = this.$_.cloneDeep(this.editObj)
-          formObj.schemaMappingData.data.forEach((item) => {
-            const obj = {}
-            item.list.forEach(ite => {
-              obj[ite.field] = ite.source
-            })
-            item.mapping = this.$_.cloneDeep(obj)
+        const formObj = this.$_.cloneDeep(this.editObj)
+        formObj.schemaMappingData.data.forEach((item) => {
+          const obj = {}
+          item.list.forEach(ite => {
+            obj[ite.field] = ite.source
           })
+          item.mapping = this.$_.cloneDeep(obj)
+        })
+        formObj.entities = JSON.stringify(formObj.schemaMappingData.data)
+        formObj.relations = JSON.stringify(formObj.relationData.data)
+
+        if (!this.ruleId) {
           // post调用是新增，put是编辑
           axios.post(api.setting.profiles.profiles, formObj).then(response => {
             if (response.status === 200) {
@@ -540,7 +562,7 @@ export default {
             this.myLoading = false
           })
         } else {
-          axios.put(api.setting.profiles.profiles, 'formObj').then(response => {
+          axios.put(api.setting.profiles.profiles, formObj).then(response => {
             if (response.status === 200) {
               this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
 
@@ -581,14 +603,14 @@ export default {
         queryInfo.name = this.settingObj.name
       }
 
-      if (this.settingObj.editFlag || this.ruleObj.editFlag) {
-        this.confirmMessage(queryInfo)
-      } else {
-        this.$router.push({
-          path: '/setting/entitySetting',
-          query: queryInfo
-        })
-      }
+      // if (this.settingObj.editFlag || this.ruleObj.editFlag) {
+      //   this.confirmMessage(queryInfo)
+      // } else {
+      // }
+      this.$router.push({
+        path: '/setting/entitySetting',
+        query: queryInfo
+      })
     },
     confirmMessage (queryInfo) {
       ElMessageBox.confirm(this.$t('tip.leavePage'), {
diff --git a/src/views/setting/sources/Sources.vue b/src/views/setting/sources/Sources.vue
index e6d07c11..41da4993 100644
--- a/src/views/setting/sources/Sources.vue
+++ b/src/views/setting/sources/Sources.vue
@@ -140,23 +140,7 @@ export default {
                 type: 'success',
                 message: this.$t('tip.deleteSuccess')
               })
-              let params = null
-              if (this.intent) {
-                params = { intent: this.intent }
-              }
-              if (this.category) {
-                params = {
-                  ...params,
-                  category: this.category
-                }
-              }
-              if (this.name) {
-                params = {
-                  ...params,
-                  name: this.name
-                }
-              }
-              this.getTableData(params)
+              this.getTableData()
             } else {
               this.$message.error(response.data.message)
             }