From 15a4c0070490e289627d9f31caff79aacae1543a Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 20 Jun 2023 15:47:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/DataSetting.vue              | 26 ++++++++++++-------
 .../src/CategroyEditForm.vue                  |  4 +--
 .../DataSetManagement/src/TypeTree.vue        | 16 ++++++------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index a2cb5ff0..9e9eb147 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -174,7 +174,7 @@
                   clearable
                   :multiple="setting.multiple"
                   :placeholder="`请选择${setting.label}`"
-                  @change="changeCustomProps(...arguments, setting.field)"
+                  @change="changeCustomProps(...arguments, index)"
                 >
                   <el-option
                     v-for="(field, fieldIndex) in dataSourceDataList"
@@ -618,12 +618,14 @@ export default {
     ...mapState({
       pageInfo: state => state.bigScreen.pageInfo,
       config: state => state.bigScreen.activeItemConfig
+      // 缓存数据集
+      // cacheDataSets: state => state.bigScreen.pageInfo.pageConfig.cacheDataSets
     }),
     dataSourceDataList () {
       return this.fieldsList?.map(item => ({
         ...item,
-        comment: item?.comment || item?.name,
-        name: item?.name
+        comment: item?.fieldDesc || item?.fieldName,
+        name: item?.fieldName
       }))
     },
     appCode: {
@@ -647,8 +649,8 @@ export default {
       return (
         list?.map(field => {
           return {
-            label: field.comment,
-            value: field.name
+            label: field.fieldDesc,
+            value: field.fieldName
           }
         }) || []
       )
@@ -685,7 +687,6 @@ export default {
     if (this.config.dataSource && this.config.dataSource.businessKey) {
       this.getDataSetDetailsById(this.config.dataSource.businessKey, 'initial')
     }
-    console.log(this.config)
   },
   methods: {
     // 切换前后端分页
@@ -746,8 +747,8 @@ export default {
           this.config.inParams =
             this.fieldsList?.map(field => {
               return {
-                name: field.comment, // 参数名
-                code: field.name // 参数值
+                name: field.fieldDesc, // 参数名
+                code: field.fieldName // 参数值
               }
             }) || []
         }
@@ -795,10 +796,15 @@ export default {
       this.config.customize.columnConfig = cloneDeep(this.headerList)
       this.$store.commit('bigScreen/changeActiveItemConfig', this.config)
     },
-    changeCustomProps (value, field) {
-      const index = this.config.setting.findIndex(param => param.field === field)
+    changeCustomProps (value, index) {
       this.$set(this.config.setting[index], 'value', value)
     }
+    // 改变缓存数据集key
+    // changeCacheBusinessKey (id) {
+    //   // 根据id在缓存中获取fields
+    //   this.fieldsList = this.cacheDataSets?.find(cache => cache.dataSetId === id)?.fields
+    //   this.params = this.cacheDataSets?.find(cache => cache.dataSetId === id)?.params
+    // }
   }
 }
 </script>
diff --git a/data-room-ui/packages/DataSetManagement/src/CategroyEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CategroyEditForm.vue
index 656bcbf0..b846e708 100644
--- a/data-room-ui/packages/DataSetManagement/src/CategroyEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CategroyEditForm.vue
@@ -139,7 +139,7 @@ export default {
               try {
                 this.$parent.init()
               } catch (error) {
-                this.$parent.initLazyOrgTree()
+                this.$parent.initLazyDatasetTypeTree()
               }
             })
           } else {
@@ -149,7 +149,7 @@ export default {
               try {
                 this.$parent.init()
               } catch (error) {
-                this.$parent.initLazyOrgTree()
+                this.$parent.initLazyDatasetTypeTree()
               }
             })
           }
diff --git a/data-room-ui/packages/DataSetManagement/src/TypeTree.vue b/data-room-ui/packages/DataSetManagement/src/TypeTree.vue
index 65fb3515..6f83656d 100644
--- a/data-room-ui/packages/DataSetManagement/src/TypeTree.vue
+++ b/data-room-ui/packages/DataSetManagement/src/TypeTree.vue
@@ -51,7 +51,7 @@
             </div>
             <ul
               v-show="!noData"
-              id="orgTree"
+              id="datasetTypeTree"
               class="ztree"
             />
             <div
@@ -160,7 +160,7 @@ import 'packages/assets/style/zTree/zTreeSelect.scss'
 import { getCategoryTree, categoryRemove } from 'packages/js/utils/datasetConfigService'
 import OrgEditForm from './CategroyEditForm.vue'
 export default {
-  name: 'OrgTreeIndex',
+  name: 'DatasetTypeTreeIndex',
   components: {
     OrgEditForm
   },
@@ -223,7 +223,7 @@ export default {
   },
   computed: { },
   mounted () {
-    this.initLazyOrgTree()
+    this.initLazyDatasetTypeTree()
   },
 
   methods: {
@@ -288,14 +288,14 @@ export default {
       }
     },
     // 初始化树节点
-    initLazyOrgTree () {
+    initLazyDatasetTypeTree () {
       this.loading = true
       getCategoryTree({ type: 'dataset', moduleCode: this.appCode }).then((res) => {
         this.categoryData = res.map((item) => {
           return { isParent: item.hasChildren, ...item }
         })
         this.categoryData.unshift({ name: '全部', id: '', parentId: '0' })
-        this.ztreeObj = $.fn.zTree.init($('#orgTree'), this.ztreeSetting, this.categoryData)
+        this.ztreeObj = $.fn.zTree.init($('#datasetTypeTree'), this.ztreeSetting, this.categoryData)
         this.$emit('reCategory')
       }).then((e) => {
         this.loading = false
@@ -347,14 +347,14 @@ export default {
     reSearch () {
       this.activeName = 'group'
       if (this.queryForm.searchKey) {
-        const treeObj = $.fn.zTree.getZTreeObj('orgTree')
+        const treeObj = $.fn.zTree.getZTreeObj('datasetTypeTree')
         const nodes = treeObj.getNodesByParam('isHidden', true)
         treeObj.showNodes(nodes)
         const hiddenNodes = treeObj.getNodesByFilter(this.filterNode)
         treeObj.hideNodes(hiddenNodes)
         treeObj.expandAll(true)
       } else {
-        this.initLazyOrgTree()
+        this.initLazyDatasetTypeTree()
       }
     },
     // 节点点击事件
@@ -433,7 +433,7 @@ export default {
         categoryRemove(org.id).then((data) => {
           this.$message.success('操作成功')
           // this.ztreeObj.removeNode(org)
-          this.initLazyOrgTree()
+          this.initLazyDatasetTypeTree()
           // 刷新右侧表格
           this.$emit('refreshData', org)
         })