From 7c0be7e92db081683e93905e601022980d7e07dd Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 13 Jul 2023 12:03:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/asyncComponent/index.vue         | 9 ++++++++-
 frontend/src/views/chart/view/ChartEdit.vue              | 8 +++++---
 frontend/src/views/dataset/common/DatasetChartDetail.vue | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/asyncComponent/index.vue b/frontend/src/components/asyncComponent/index.vue
index caa85d89e0..d916de5a2c 100644
--- a/frontend/src/components/asyncComponent/index.vue
+++ b/frontend/src/components/asyncComponent/index.vue
@@ -3,6 +3,8 @@
     :is="mode"
     :ref="refId"
     :obj="obj"
+    :bus="bus"
+    :axios-request="request"
     v-bind="$attrs"
     v-on="$listeners"
   />
@@ -11,6 +13,9 @@
 <script>
 import { uuid } from 'vue-uuid'
 import { get } from '@/api/system/dynamic'
+import bus from '@/utils/bus'
+import request from '@/utils/request'
+
 export default {
   name: 'AsyncComponent',
   inheritAttrs: true,
@@ -29,7 +34,9 @@ export default {
     return {
       resData: '',
       mode: '',
-      refId: null
+      refId: null,
+      bus: bus,
+      request: request
     }
   },
   watch: {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e03e43134e..2be29cbf09 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -473,7 +473,8 @@
                   <plugin-com
                     v-if="view.isPlugin"
                     :component-name="view.type + '-data'"
-                    :obj="{view, param, chart, dimensionData, quotaData}"
+                    :obj="{view, param, chart, dimension, dimensionData, quota, quotaData}"
+                    :bus="bus"
                   />
                   <div v-else>
 
@@ -1796,7 +1797,7 @@ export default {
     DrillPath,
     PluginCom,
     MapMapping,
-    MarkMapDataEditor,
+    MarkMapDataEditor
   },
   props: {
     param: {
@@ -1816,6 +1817,7 @@ export default {
   },
   data() {
     return {
+      bus: bus,
       positionActiveNames: 'positionAdjust',
       loading: false,
       table: {},
@@ -2955,7 +2957,7 @@ export default {
 
     // 更换数据集
     changeChart() {
-      const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom!=='template' ? 'same' : 'change'
+      const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom !== 'template' ? 'same' : 'change'
       // 更换数据集后清空视图字段，并重新请求数据；否则没有操作
       if (optType === 'change') {
         this.view.dataFrom = 'dataset'
diff --git a/frontend/src/views/dataset/common/DatasetChartDetail.vue b/frontend/src/views/dataset/common/DatasetChartDetail.vue
index 1eae8a0fd2..c58d8da032 100644
--- a/frontend/src/views/dataset/common/DatasetChartDetail.vue
+++ b/frontend/src/views/dataset/common/DatasetChartDetail.vue
@@ -21,8 +21,8 @@
           <el-col class="info-item">
             <p class="info-title">{{ $t('chart.chart_type') }}</p>
             <svg-icon
-              v-if="detail.chart.type"
-              :icon-class="detail.chart.type"
+              :icon-class="detail.chart.isPlugin && detail.chart.type && detail.chart.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + detail.chart.type + '/svg') : detail.chart.type"
+              class="chart-icon"
             />
           </el-col>
           <el-col class="info-item">