From f909eae8c00941265666e407e0ce68f69ca0ab02 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 17 Apr 2024 12:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/components/configExtra.vue | 6 +++---
 ui/dv/AiDvRender.vue                                   | 2 +-
 ui/packages/tools/AiEchartV2.vue                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/bigscreen/designer/components/configExtra.vue b/packages/bigscreen/designer/components/configExtra.vue
index 96678206..3395a3d0 100644
--- a/packages/bigscreen/designer/components/configExtra.vue
+++ b/packages/bigscreen/designer/components/configExtra.vue
@@ -70,6 +70,9 @@ export default {
         </el-option>
       </el-select>
     </config-item>
+    <config-item label="图表模板">
+      <chart-picker v-model="config.type" :tpls="layers" @input="v=>config.echartOps=$echartTpls[v]"/>
+    </config-item>
     <template v-if="/(AiDvMap|linkageMap)/.test(config.type)">
       <config-item label="地图数据(geoJSON)">
         <el-input v-model="config.geoJson" size="mini" clearable placeholder="请输入geoJson的URL地址"/>
@@ -89,9 +92,6 @@ export default {
       </group-item>
     </template>
     <template v-if="/Chart/.test(config.type)">
-      <config-item label="图表模板">
-        <chart-picker v-model="config.config" @input="v=>config.echartOps=$echartTpls[v]"/>
-      </config-item>
       <config-item label="图表配置项" top-label>
         <json-editor v-model="config.echartOps"/>
       </config-item>
diff --git a/ui/dv/AiDvRender.vue b/ui/dv/AiDvRender.vue
index 935468ca..00f6cb71 100644
--- a/ui/dv/AiDvRender.vue
+++ b/ui/dv/AiDvRender.vue
@@ -26,7 +26,7 @@
                     :key="`chart-${index}`"
                     :theme="theme"
                     :data="values"
-                    :tpl="data.config"
+                    :tpl="currentType"
                     :ops="data.echartOps"/>
       <AiDvTable
           v-else-if="currentType === 'AiDvTable'"
diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue
index a13519c3..2d3419c3 100644
--- a/ui/packages/tools/AiEchartV2.vue
+++ b/ui/packages/tools/AiEchartV2.vue
@@ -129,7 +129,7 @@ export default {
     theme() {
       this.refresh()
     },
-    tpl(v) {
+    type(v) {
       v && this.refresh()
     }
   },