From 9f7dc56519aae63f874f7a44005d9d9dd5fec9c9 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Wed, 23 Aug 2023 16:59:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/example/main.js                   | 2 ++
 data-room-ui/packages/BizComponent/Preview.vue | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/example/main.js b/data-room-ui/example/main.js
index a45f487a..e74c0a77 100644
--- a/data-room-ui/example/main.js
+++ b/data-room-ui/example/main.js
@@ -13,8 +13,10 @@ import * as $dataRoomAxios from 'data-room-ui/js/utils/http.js'
 import { registerConfig } from '@gcpaas/data-room-ui'
 import remoteComponents from '@/remoteComponents/exports.js'
 import customDatasetComponents from '@/customDatasetComponents/exports.js'
+import { Column } from '@antv/g2plot';
 // import customPlots from '@/customPlots/exports'
 Vue.use(ElementUI, { size: 'mini' })
+Vue.prototype.Column = Column
 registerConfig(
   {
     routers: {
diff --git a/data-room-ui/packages/BizComponent/Preview.vue b/data-room-ui/packages/BizComponent/Preview.vue
index 876e7236..5e09a01e 100644
--- a/data-room-ui/packages/BizComponent/Preview.vue
+++ b/data-room-ui/packages/BizComponent/Preview.vue
@@ -85,7 +85,7 @@ export default {
         const data = await getBizComponentInfo(this.$route.query?.code)
         this.vueContentInner = data.vueContent
         this.settingContentInner = data.settingContent
-        this.dataFormatting(this.config)
+       this.config = this.dataFormatting(this.config)
         this.remoteComponent = remoteVueLoader('data:text/plain,' + encodeURIComponent(this.vueContentInner))
         this.loading = false
       }
@@ -105,7 +105,7 @@ export default {
     // 尝试渲染远程文件或远程字符串
     getRemoteComponent () {
       this.loading = true
-      this.dataFormatting(this.config, { success: false })
+      this.config = this.dataFormatting(this.config, { success: false })
       this.remoteComponent = remoteVueLoader('data:text/plain,' + encodeURIComponent(this.vueContentInner))
       this.loading = false
     },
@@ -115,6 +115,7 @@ export default {
      */
     // 将config.setting的配置转化为option里的配置，这里之所以将转化的方法提出来，是因为在改变维度指标和样式的时候都需要转化
     transformSettingToOption (config, type) {
+
       let option = null
       config.setting.forEach(set => {
         if (set.optionField) {
@@ -154,7 +155,7 @@ export default {
         config.option.data = data
       } else {
         // 数据返回失败则赋前端的模拟数据
-        config.option.data = this.plotList?.find(plot => plot.name === config.name)?.option?.data
+        config.option.data = this.plotList?.find(plot => plot.name === config.name)?.option?.data || config.option.data
       }
       return config
     },