From cc4914093288678c3f3df476fe5f5f5f5de7a4d7 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Tue, 16 Jul 2024 19:59:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tables/Tables/TableScrollBoard/config.vue | 47 ++++++------
 .../Tables/Tables/TableScrollBoard/index.vue  | 73 ++++++++++++++-----
 2 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/config.vue b/src/packages/components/Tables/Tables/TableScrollBoard/config.vue
index 3feb367b..bb1d1275 100644
--- a/src/packages/components/Tables/Tables/TableScrollBoard/config.vue
+++ b/src/packages/components/Tables/Tables/TableScrollBoard/config.vue
@@ -143,28 +143,31 @@ const alignOption = [
 // const headerConfigMap: Ref<{ [k: string]: any }> = ref(props.optionData.headerConfigMap)
 // const headerConfig: Ref<any[]> = ref(props.optionData.headerConfig)
 
-const { headerConfigMap, headerConfig } = toRefs(props.optionData) as ToRefs<{ headerConfigMap: { [k: string] : MapType }, headerConfig: MapType[] }>
+const headerConfigMap = computed(() => props.optionData.headerConfigMap)
+const headerConfig = computed(() => props.optionData.headerConfig)
 
-watch(() => props.optionData.dataset, (v) => {
-  v.dimensions.forEach((k: string) => {
-    // 初始化
-    if(!Object.prototype.hasOwnProperty.call(headerConfigMap.value, k)) {
-      headerConfigMap.value[k] = {
-        show: true,
-        key: k,
-        header: k,
-        align: AlignEnum.LEFT,
-        columnWidth: 100
-      }
-    }
-    headerConfig.value = v.dimensions.map((k: string) => {
-      return headerConfigMap.value[k]
-    })
-    headerConfig.value.unshift(headerConfigMap.value['index'])
-  })
-}, {
-  immediate: true,
-  deep: true
-})
+// const { headerConfigMap, headerConfig } = toRefs(props.optionData) as ToRefs<{ headerConfigMap: { [k: string] : MapType }, headerConfig: MapType[] }>
+//
+// watch(() => props.optionData.dataset, (v) => {
+//   v.dimensions.forEach((k: string) => {
+//     // 初始化
+//     if(!Object.prototype.hasOwnProperty.call(headerConfigMap.value, k)) {
+//       headerConfigMap.value[k] = {
+//         show: true,
+//         key: k,
+//         header: k,
+//         align: AlignEnum.LEFT,
+//         columnWidth: 100
+//       }
+//     }
+//     headerConfig.value = v.dimensions.map((k: string) => {
+//       return headerConfigMap.value[k]
+//     })
+//     headerConfig.value.unshift(headerConfigMap.value['index'])
+//   })
+// }, {
+//   immediate: true,
+//   deep: true
+// })
 
 </script>
diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue
index d8be6100..7ef8e963 100644
--- a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue
+++ b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue
@@ -49,13 +49,12 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, onUnmounted, reactive, toRefs, watch, onMounted } from 'vue'
+import { PropType, onUnmounted, reactive, toRefs, watch, onMounted, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import {useChartCommonData, useChartDataFetch} from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-import merge from 'lodash/merge'
-import cloneDeep from 'lodash/cloneDeep'
-import { MapType } from './config'
+import { merge, cloneDeep, debounce } from 'lodash'
+import { MapType, AlignEnum } from './config'
 import { useOriginStore } from "@/store/modules/originStore/originStore";
 
 const props = defineProps({
@@ -267,19 +266,37 @@ const calcRowsData = () => {
     let keys = headerConfig.filter((_: MapType) => _.show).map((_: MapType) => _.key)
     let statusIndex = keys.findIndex((_: string) => _ === 'status')
     if(statusIndex > -1) {
-      dataset.forEach((item: {ceils: string[]}) => {
-        if(statusIndex <= item.ceils.length) {
-          let v = item.ceils[statusIndex]
-          let obj = statusOption.find((_: any) => _.value === v.toString()) || {label: ''}
-          console.log(obj)
-          if(obj.remark) {
-            item.ceils[statusIndex] = `<span style="background: ${colorToRgba(obj.remark)};color: ${obj.remark};border: 1px solid ${obj.remark};border-radius: 4px;padding: 2px 8px;font-size: 12px;">${obj.label}</span>`
-          }
-          else item.ceils[statusIndex] = obj.label
+      dataset = dataset.map((item: any, i: number) => {
+        let v:any = item.ceils[statusIndex]
+        let obj = statusOption.find((_: any) => _.value === v.toString()) || {label: ''}
+        let newValue = ''
+        if(obj.remark) {
+          newValue = `<span style="background: ${colorToRgba(obj.remark)};color: ${obj.remark};border: 1px solid ${obj.remark};border-radius: 4px;padding: 2px 8px;font-size: 12px;">${obj.label}</span>`
         }
+        else newValue = obj.label
+        return { ...item, ceils: [...item.ceils.slice(0, statusIndex), newValue, ...item.ceils.slice(statusIndex + 1)]}
       })
     }
   }
+
+  // if(props.chartConfig.commonData.currentSource === 'pointTable') {
+  //   let statusOption = originStore.getOriginStore.user.systemConstant.node_status || []
+  //   let keys = headerConfig.filter((_: MapType) => _.show).map((_: MapType) => _.key)
+  //   let statusIndex = keys.findIndex((_: string) => _ === 'status')
+  //   if(statusIndex > -1) {
+  //     dataset.forEach((item: {ceils: string[]}) => {
+  //       if(statusIndex <= item.ceils.length) {
+  //         let v = item.ceils[statusIndex]
+  //         let obj = statusOption.find((_: any) => _.value === v.toString()) || {label: ''}
+  //         console.log(obj.remark)
+  //         if(obj.remark) {
+  //           item.ceils[statusIndex] = `<span style="background: ${colorToRgba(obj.remark)};color: ${obj.remark};border: 1px solid ${obj.remark};border-radius: 4px;padding: 2px 8px;font-size: 12px;">${obj.label}</span>`
+  //         }
+  //         else item.ceils[statusIndex] = obj.label
+  //       }
+  //     })
+  //   }
+  // }
   status.rowsData = dataset
   status.rows = dataset
 }
@@ -367,7 +384,7 @@ const stopAnimation = () => {
   clearTimeout(status.animationHandler)
 }
 
-const onRestart = async () => {
+const onRestart = debounce(async() => {
   try {
     if (!status.mergedConfig) return
     stopAnimation()
@@ -375,7 +392,7 @@ const onRestart = async () => {
   } catch (error) {
     console.log(error)
   }
-}
+}, 200)
 
 watch(
   () => w.value,
@@ -406,8 +423,30 @@ watch(
 //   onRestart()
 // })
 
-useChartCommonData(props.chartConfig, useChartEditStore, (resData: {}) => {
-  props.chartConfig.option.dataset = resData
+const fn = (v: any) => {
+  v.dimensions.forEach((k: string, index: number) => {
+    // 初始化
+    if(!Object.prototype.hasOwnProperty.call(props.chartConfig.option.headerConfigMap, k)) {
+      props.chartConfig.option.headerConfigMap[k] = {
+        show: true,
+        key: k,
+        header: k,
+        align: AlignEnum.LEFT,
+        columnWidth: 100
+      }
+    }
+    props.chartConfig.option.headerConfig = v.dimensions.map((k: string) => {
+      return props.chartConfig.option.headerConfigMap[k]
+    })
+    props.chartConfig.option.headerConfig.unshift(props.chartConfig.option.headerConfigMap['index'])
+  })
+}
+
+let resData = {}
+useChartCommonData(props.chartConfig, useChartEditStore, (res: any) => {
+  resData = res
+  fn(res)
+  props.chartConfig.option.dataset = res
   onRestart()
 })