diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index a7b80de8b2..25190fb6c8 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -419,24 +419,18 @@ public class ChartViewService { } datasourceRequest.setQuery(sql); data = datasourceProvider.getData(datasourceRequest); - - Map mapChart = pluginViewResult(pluginViewParam, view, data, isDrill); - Map mapTableNormal = ChartDataBuild.transTableNormal(xAxis, yAxis, view, data, extStack, desensitizationList); - return data; // 如果是插件到此结束 } //如果不是插件视图 走原生逻辑 if (table.getMode() == 0) {// 直连 - // Datasource ds = datasourceService.get(table.getDataSourceId()); if (ObjectUtils.isEmpty(ds)) { throw new RuntimeException(Translator.get("i18n_datasource_delete")); } if (StringUtils.isNotEmpty(ds.getStatus()) && ds.getStatus().equalsIgnoreCase("Error")) { throw new Exception(Translator.get("i18n_invalid_ds")); } - // DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); datasourceRequest.setDatasource(ds); DataTableInfoDTO dataTableInfoDTO = gson.fromJson(table.getInfo(), DataTableInfoDTO.class); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); diff --git a/frontend/src/views/system/plugin/PluginCom.vue b/frontend/src/views/system/plugin/PluginCom.vue index 3ffcdf3d9f..fddd1c2463 100644 --- a/frontend/src/views/system/plugin/PluginCom.vue +++ b/frontend/src/views/system/plugin/PluginCom.vue @@ -56,6 +56,17 @@ export default { this.showAsync = false } }, + watch: { + 'componentName': function () { + this.refId = uuid.v1 + if (this.componentName) { + this.showAsync = true + this.url = this.baseUrl + this.componentName + } else { + this.showAsync = false + } + } + }, methods: { // hasLicense executeAxios(options) {