From 74e30390cffbdc93d3f2a050ff8eb44242338bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Wed, 6 Jul 2022 20:14:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useChartDataFetch.hook.ts                      | 1 -
 src/utils/utils.ts                                       | 6 +++---
 .../components/ChartDataMatchingAndShow/index.vue        | 9 ++-------
 .../ChartData/components/ChartDataMonacoEditor/index.vue | 7 +++----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts
index a21787b5..f32be1b8 100644
--- a/src/hooks/useChartDataFetch.hook.ts
+++ b/src/hooks/useChartDataFetch.hook.ts
@@ -53,7 +53,6 @@ export const useChartDataFetch = (
               // eCharts 组件配合 vChart 库更新方式
               if (chartFrame === ChartFrameEnum.ECHARTS) {
                 if (vChartRef.value) {
-                  
                   vChartRef.value.setOption({ dataset: newFunctionHandle(res.data, filter) })
                 }
               }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index f6666b30..f7a161d0 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -5,7 +5,7 @@ import throttle from 'lodash/throttle'
 import Image_404 from '../assets/images/exception/image-404.png'
 import html2canvas from 'html2canvas'
 import { downloadByA } from './file'
-import { isString } from './type'
+import { toString } from './type'
 import cloneDeep from 'lodash/cloneDeep';
 
 /**
@@ -196,7 +196,7 @@ export const canvasCut = (html: HTMLElement | null, callback?: Function) => {
 export const newFunctionHandle = (
   data: any,
   funcStr?: string,
-  toString?: boolean,
+  isToString?: boolean,
   errorCallBack?: Function,
   successCallBack?: Function
 ) => {
@@ -204,7 +204,7 @@ export const newFunctionHandle = (
     if (!funcStr) return data
     const fn = new Function('data', funcStr)
     const fnRes = fn( cloneDeep(data))
-    const resHandle = toString && isString(fnRes) ? fnRes : JSON.stringify(fnRes) 
+    const resHandle = isToString ? toString(fnRes) : fnRes
     // 成功回调
     successCallBack && successCallBack(resHandle)
     return resHandle
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
index 71594ae4..39d31cef 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -72,7 +72,7 @@
           </div>
         </n-space>
         <n-card size="small">
-          <n-code :code="filterRes(getSource)" language="json"></n-code>
+          <n-code :code="filterRes(source)" language="json"></n-code>
         </n-card>
       </n-space>
     </n-timeline-item>
@@ -126,11 +126,6 @@ const isCharts = computed(() => {
   return targetData.value.chartConfig.package === PackagesCategoryEnum.CHARTS
 })
 
-// 获取数据
-const getSource = computed(() => {
-  return JSON.stringify(source.value)
-})
-
 // 处理映射列表状态结果
 const matchingHandle = (mapping: string) => {
   let res = DataResultEnum.SUCCESS
@@ -176,7 +171,7 @@ const filterRes = (data: any) => {
       const res = fn(cloneDeep(data))
       return toString(res)
     }
-    return data
+    return toString(cloneDeep(data))
   } catch (error) {
     return '过滤函数错误'
   }
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue
index c9c3e407..80fe5c97 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue
@@ -68,13 +68,13 @@
               <div class="editor-data-show">
                 <n-space>
                   <n-text depth="3">目标数据：</n-text>
-                  <n-code :code="toString(sourceData)" language="typescript" :word-wrap="true"></n-code>
+                  <n-code :code="toString(sourceData)" language="json" :word-wrap="true"></n-code>
                 </n-space>
               </div>
               <div class="editor-data-show">
                 <n-space>
                   <n-text depth="3">过滤器结果：</n-text>
-                  <n-code :code="filterRes" language="typescript" :word-wrap="true"></n-code>
+                  <n-code :code="filterRes" language="json" :word-wrap="true"></n-code>
                 </n-space>
               </div>
             </n-space>
@@ -140,7 +140,6 @@ const fetchTargetData = async () => {
     const res = await http(requestHttpType)(completePath || '', {})
     if (res.status === ResultEnum.SUCCESS) {
       sourceData.value = res.data
-      console.log(sourceData.value)
       return
     }
   } catch (error) {
@@ -154,7 +153,7 @@ const filterRes = computed(() => {
     const fn = new Function('data', filter.value)
     const res = fn(cloneDeep(sourceData.value))
     errorFlag.value = false
-    return JSON.stringify(res)
+    return toString(res)
   } catch (error) {
     errorFlag.value = true
     return '过滤函数错误'