diff --git a/backend/pom.xml b/backend/pom.xml
index 24ac942aac..0dbfcb18e5 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -83,11 +83,11 @@
lombok
-
+
org.springframework.boot
diff --git a/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java b/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
index 5d233ec9fb..35d4e5a12f 100644
--- a/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
+++ b/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
@@ -16,7 +16,6 @@ import io.dataease.plugins.view.entity.*;
import io.dataease.plugins.view.service.ViewPluginBaseService;
import io.dataease.provider.ProviderFactory;
import io.dataease.provider.QueryProvider;
-import io.dataease.provider.datasource.DatasourceProvider;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.dataset.DataSetTableUnionService;
import org.apache.commons.lang3.ObjectUtils;
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index b066fc279e..c22fa3e143 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -585,7 +585,7 @@ export default {
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
- current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
+ current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
} else {
current && current.registerDynamicMap && current.registerDynamicMap(null)
}
@@ -615,7 +615,7 @@ export default {
this.currentAcreaNode = tempNode
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
- current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code })
+ current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code })
} else {
current && current.registerDynamicMap && current.registerDynamicMap(this.currentAcreaNode.code)
}
@@ -636,7 +636,7 @@ export default {
this.currentAcreaNode = nextNode
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
- nextNode && current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code })
+ nextNode && current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code })
} else {
nextNode && current && current.registerDynamicMap && current.registerDynamicMap(nextNode.code)
}
@@ -670,7 +670,7 @@ export default {
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
- current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: areaNode.code })
+ current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: areaNode.code })
} else {
current && current.registerDynamicMap && current.registerDynamicMap(areaNode.code)
}
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index ff6c9d52f5..b8351b03d4 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1394,11 +1394,13 @@ export default {
this.fieldFilter(val)
},
'chartType': function(newVal, oldVal) {
- this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal)
if ((newVal === 'map' || newVal === 'buddle-map') && newVal !== oldVal) {
this.initAreas()
}
this.$emit('typeChange', newVal)
+ },
+ 'view.type': function(newVal, oldVal) {
+ this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal)
}
},
created() {
@@ -2384,7 +2386,7 @@ export default {
this.currentAcreaNode = null
const current = this.$refs.dynamicChart
if (this.view.isPlugin) {
- current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
+ current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
} else {
current && current.registerDynamicMap && current.registerDynamicMap(null)
}
@@ -2417,7 +2419,7 @@ export default {
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(this.currentAcreaNode.code)
const current = this.$refs.dynamicChart
if (this.view.isPlugin) {
- current && current.callPluginInner({
+ current && current.callPluginInner && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: this.currentAcreaNode.code
})
@@ -2444,7 +2446,7 @@ export default {
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
const current = this.$refs.dynamicChart
if (this.view.isPlugin) {
- nextNode && current && current.callPluginInner({
+ nextNode && current && current.callPluginInner && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: nextNode.code
})