From 67d5f208488ea00e669ba1438004f1d706de041a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 6 Apr 2022 18:58:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=92=E4=BB=B6=E5=8D=B8=E8=BD=BD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 3 +++ .../main/java/io/dataease/service/sys/PluginService.java | 6 +++--- frontend/src/api/system/plugin.js | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) 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 eb5fdd4caf..841b106ab0 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -524,6 +524,9 @@ public class ChartViewService { fieldMap.put("extBubble",extBubble); PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view); String sql = pluginViewSql(pluginViewParam, view); + if (StringUtils.isBlank(sql)) { + return emptyChartViewDTO(view); + } datasourceRequest.setQuery(sql); data = datasourceProvider.getData(datasourceRequest); diff --git a/backend/src/main/java/io/dataease/service/sys/PluginService.java b/backend/src/main/java/io/dataease/service/sys/PluginService.java index cce8a8b175..d490cf99db 100644 --- a/backend/src/main/java/io/dataease/service/sys/PluginService.java +++ b/backend/src/main/java/io/dataease/service/sys/PluginService.java @@ -255,14 +255,14 @@ public class PluginService { } public boolean versionMatch(String pluginVersion) { - List versionLists = Arrays.stream(version.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList()); - List requireVersionLists = Arrays.stream(pluginVersion.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList()); + List versionLists = Arrays.stream(version.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList()); + List requireVersionLists = Arrays.stream(pluginVersion.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList()); int maxSize = Math.max(versionLists.size(), requireVersionLists.size()); for (int i = 0; i < maxSize; i++) { Integer currentV = versionLists.size() == i ? 0 : versionLists.get(i); Integer requireV = requireVersionLists.size() == i ? 0 : requireVersionLists.get(i); if (requireV > currentV) return false; } - return false; + return true; } } diff --git a/frontend/src/api/system/plugin.js b/frontend/src/api/system/plugin.js index e02a5ccda4..9beddfc0fe 100644 --- a/frontend/src/api/system/plugin.js +++ b/frontend/src/api/system/plugin.js @@ -14,7 +14,7 @@ export function pluginLists(page, size, data) { export function uninstall(pluginId) { return request({ - url: pathMap.queryPath + pluginId, + url: pathMap.uninstallPath + pluginId, method: 'post', loading: true })