From f7ad241390b0fa0a90cf6f31f0288b960122437c Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 16 Jan 2024 10:24:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=BB=84=E4=BB=B6=E5=9C=A8=E6=9D=A5=E5=9B=9E=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/Tables/index.vue | 60 +++++++++----------
 .../RightSetting/ElDragSelect.vue             |  3 -
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Tables/index.vue b/data-room-ui/packages/BasicComponents/Tables/index.vue
index d670ba0e..b7799121 100644
--- a/data-room-ui/packages/BasicComponents/Tables/index.vue
+++ b/data-room-ui/packages/BasicComponents/Tables/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    style="width: 100%;height: 100%"
-    class="bs-design-wrap "
+    style="width: 100%; height: 100%"
+    class="bs-design-wrap"
   >
     <!-- <span style="color: aliceblue;font-size: 40px;">
       {{ columnData }}
@@ -21,7 +21,7 @@
       @row-click="rowClick"
     >
       <el-table-column
-        v-for="(col,index) in columnData"
+        v-for="(col, index) in config.option.columnData"
         :key="index"
         show-overflow-tooltip
         :prop="col.alias"
@@ -32,7 +32,6 @@
   </div>
 </template>
 <script>
-import { EventBus } from 'data-room-ui/js/utils/eventBus'
 import commonMixins from 'data-room-ui/js/mixins/commonMixins'
 import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
 import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
@@ -76,7 +75,8 @@ export default {
           .getElementById(this.config.code)
           .querySelector('tr').style.backgroundColor =
           this.customTheme !== 'custom'
-            ? this.config.customize.headerBackgroundColor || headerBackgroundColor[this.customTheme]
+            ? this.config.customize.headerBackgroundColor ||
+              headerBackgroundColor[this.customTheme]
             : this.headerCellStyleObj.backgroundColor
       }
       const style = {
@@ -84,7 +84,8 @@ export default {
         borderBottom: 'solid 2px #007aff',
         backgroundColor:
           this.customTheme !== 'custom'
-            ? this.config.customize.headerBackgroundColor || headerBackgroundColor[this.customTheme]
+            ? this.config.customize.headerBackgroundColor ||
+              headerBackgroundColor[this.customTheme]
             : this.headerCellStyleObj.backgroundColor,
         color:
           this.customTheme === 'light'
@@ -100,25 +101,11 @@ export default {
       console.dir(val)
     }
   },
-  created () { },
+  created () {},
   mounted () {
     this.chartInit()
-    // this.config.option?.columnData 对象的key 根据 list 对应的key 来排序
-    EventBus.$on('dragSelectChange', (val) => {
-      if (val.length > 0) {
-        const sortedColumnData = {}
-        const columnData = cloneDeep(this.config.option?.columnData)
-        val.forEach((item, index) => {
-          sortedColumnData[item] = columnData[item]
-        })
-        this.columnData = sortedColumnData
-        this.updateKey = new Date().getTime()
-      }
-    })
-  },
-  beforeDestroy () {
-    EventBus.$off('dragSelectChange')
   },
+  beforeDestroy () { },
   methods: {
     cellStyle ({ row, column, rowIndex, columnIndex }) {
       const bodyBackgroundColor = {
@@ -134,10 +121,15 @@ export default {
       // 如果设置了奇偶行的背景颜色，则以奇偶行的背景颜色为主
       if (rowIndex % 2 && this.config.customize.evenRowBackgroundColor) {
         style.backgroundColor = this.config.customize.evenRowBackgroundColor
-      } else if (!(rowIndex % 2) && this.config.customize.oddRowBackgroundColor) {
+      } else if (
+        !(rowIndex % 2) &&
+        this.config.customize.oddRowBackgroundColor
+      ) {
         style.backgroundColor = this.config.customize.oddRowBackgroundColor
       } else {
-        style.backgroundColor = this.config.customize.bodyBackgroundColor || bodyBackgroundColor[this.customTheme]
+        style.backgroundColor =
+          this.config.customize.bodyBackgroundColor ||
+          bodyBackgroundColor[this.customTheme]
       }
       return style
     },
@@ -168,19 +160,25 @@ export default {
       return config
     },
     dataFormatting (config, data) {
-      config.option.tableData = data?.data && data.data.length > 0 ? data.data : []
+      config.option.tableData =
+        data?.data && data.data.length > 0 ? data.data : []
       const filteredData = {}
       const columnData = data?.columnData || {}
       const dimensionFieldList = config.dataSource.dimensionFieldList || []
-      if (config.dataSource.dimensionFieldList && config.dataSource.dimensionFieldList.length > 0) {
+      if (
+        config.dataSource.dimensionFieldList &&
+        config.dataSource.dimensionFieldList.length > 0
+      ) {
         // 根据config.dataSource.dimensionFieldList 数据的顺序将表格列顺序调整，使其初始化的时候，顺序和组件配置面板中的一致
         const sortedColumnData = {}
         dimensionFieldList.forEach((item, index) => {
           sortedColumnData[item] = columnData[item]
         })
-        Object?.keys(sortedColumnData).forEach(key => {
+        Object?.keys(sortedColumnData).forEach((key) => {
           if (
-            config.dataSource.dimensionFieldList.includes(sortedColumnData[key]?.alias)
+            config.dataSource.dimensionFieldList.includes(
+              sortedColumnData[key]?.alias
+            )
           ) {
             filteredData[key] = sortedColumnData[key]
           }
@@ -204,7 +202,7 @@ export default {
         // 将样式字符串转成对象
         const styleStr = match[1].trim().replace(/\s*;\s*$/, '') // 去掉末尾的空格和分号
         // const styleObj = {};
-        styleStr.split(';').forEach(s => {
+        styleStr.split(';').forEach((s) => {
           const [key, value] = s.split(':')
           if (key && value) {
             // 判断是否为空字符串
@@ -226,7 +224,7 @@ export default {
       if (match) {
         // 将样式字符串转成对象
         const styleStr = match[1].trim().replace(/\s*;\s*$/, '') // 去掉末尾的空格和分号
-        styleStr.split(';').forEach(s => {
+        styleStr.split(';').forEach((s) => {
           const [key, value] = s.split(':')
           if (key && value) {
             // 判断是否为空字符串
@@ -343,7 +341,7 @@ export default {
 
 // 滚动条的滑块
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
-  background-color: #9093994D;
+  background-color: #9093994d;
   border-radius: 5px;
 
   &:hover {
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
index 0841146e..eb080a6e 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ElDragSelect.vue
@@ -54,15 +54,12 @@ export default {
           if ((newVal.length === oldVal.length) && (JSON.stringify(oldVal) !== JSON.stringify(newVal))) {
             // 告诉右侧的数据配置面板，选择器内的选项顺序发生变化，修改config的数据顺序
             this.$emit('valuePositionChange', newVal)
-            // 告诉表格组件，表格列顺序发生变化
-            EventBus.$emit('dragSelectChange', newVal)
           }
         }
       }
     }
   },
   created () {
-    EventBus.$emit('dragSelectChange', this.selectVal)
   },
   mounted () {
     this.setSort()