center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 插件卸载逻辑

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-04-06 18:58:15 +08:00
parent 8922d86040
commit e9f779ad85
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -524,6 +524,9 @@ public class ChartViewService {
fieldMap.put("extBubble",extBubble); fieldMap.put("extBubble",extBubble);
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view); PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view);
String sql = pluginViewSql(pluginViewParam, view); String sql = pluginViewSql(pluginViewParam, view);
if (StringUtils.isBlank(sql)) {
return emptyChartViewDTO(view);
}
datasourceRequest.setQuery(sql); datasourceRequest.setQuery(sql);
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);

6
backend/src/main/java/io/dataease/service/sys/PluginService.java
View File

@ -255,14 +255,14 @@ public class PluginService {
} }
public boolean versionMatch(String pluginVersion) { public boolean versionMatch(String pluginVersion) {
List<Integer> versionLists = Arrays.stream(version.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList()); List<Integer> versionLists = Arrays.stream(version.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList());
List<Integer> requireVersionLists = Arrays.stream(pluginVersion.split(".")).map(CodingUtil::string2Integer).collect(Collectors.toList()); List<Integer> requireVersionLists = Arrays.stream(pluginVersion.split("\\.")).map(CodingUtil::string2Integer).collect(Collectors.toList());
int maxSize = Math.max(versionLists.size(), requireVersionLists.size()); int maxSize = Math.max(versionLists.size(), requireVersionLists.size());
for (int i = 0; i < maxSize; i++) { for (int i = 0; i < maxSize; i++) {
Integer currentV = versionLists.size() == i ? 0 : versionLists.get(i); Integer currentV = versionLists.size() == i ? 0 : versionLists.get(i);
Integer requireV = requireVersionLists.size() == i ? 0 : requireVersionLists.get(i); Integer requireV = requireVersionLists.size() == i ? 0 : requireVersionLists.get(i);
if (requireV > currentV) return false; if (requireV > currentV) return false;
} }
return false; return true;
} }
} }

2
frontend/src/api/system/plugin.js
View File

@ -14,7 +14,7 @@ export function pluginLists(page, size, data) {
export function uninstall(pluginId) { export function uninstall(pluginId) {
return request({ return request({
url: pathMap.queryPath + pluginId, url: pathMap.uninstallPath + pluginId,
method: 'post', method: 'post',
loading: true loading: true
}) })